diff --git a/defaults/main.yml b/defaults/main.yml
index 692e2b7e74e9490f8703c4269121a6f357cfe098..057079b54034b03accfb1759b0d00e6694e356f5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
 # defaults file for paas-ci
 paas_ci_orchestrator_url: https://paas.cloud.infn.it/orchestrator
-paas_ci_workdir: "{{ lookup('env','PWD') }}"        
+paas_ci_workdir: "{{ lookup('env','WORKSPACE') }}"        
         
diff --git a/tasks/main.yml b/tasks/main.yml
index 641f4e61bcf3b7852eadda359e7f369190662112..bafecb14608903d427a2a8e336f1e8ebb26f05b3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,6 +4,9 @@
   uri:
     url: "{{ paas_ci_orchestrator_url }}"
 
+- debug:
+    var: paas_ci_workdir
+
 - block:
   - name: Get template
     get_url: