diff --git a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
index 90971f7a..59e9b921 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
@@ -12,6 +12,7 @@ class DependenciesResolver {
   DependenciesResolver(steps, language, workspace) {
     this.steps = steps
     this.language = language
+    this.workspace = workspace
   }
 
   def enableCachingSupport() {
diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index ab572c17..653fa38a 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -170,7 +170,7 @@ spec:
 
                   def depManager = DependenciesManager.parse(component.dependenciesManager)
 
-                  def dependenciesResolver = new DependenciesResolver(this, language, "${workspace}/" + component.root + "/")
+                  def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
                   dependenciesResolver.useManager(depManager)
                   
                   if (component.buildCacheEnabled) {