diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index b0b659b8..ab572c17 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -13,8 +13,6 @@ def call(Closure closure) {
   closure.delegate = configurations
   closure()
 
-  def sourceFetcher = new SourceFetcher(this)
-
   pipeline {
     agent any
     options {
@@ -58,6 +56,7 @@ spec:
         steps {
           script {
             log.info("Pipeline","Commit message linting is enabled")
+            def sourceFetcher = new SourceFetcher(this)
             sourceFetcher.fetch(configurations)
 
             def linter = new CommitMessageLinter(this)
@@ -164,13 +163,14 @@ spec:
                   }
                 }
                 if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+                  def sourceFetcher = new SourceFetcher(this)
                   sourceFetcher.fetch(configurations)
 
                   def language = ServiceLanguage.parse(component.language)
 
                   def depManager = DependenciesManager.parse(component.dependenciesManager)
 
-                  def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
+                  def dependenciesResolver = new DependenciesResolver(this, language, "${workspace}/" + component.root + "/")
                   dependenciesResolver.useManager(depManager)
                   
                   if (component.buildCacheEnabled) {