diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index ae296a6b..534d2b09 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -157,25 +157,29 @@ spec:
 """
                   }
                 }
-                if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
-                  log.info("Pipeline","Build Agent sets to: ${env.buildAgentImage}")
-                  def sourceFetcher = new SourceFetcher(this)
-                  sourceFetcher.fetch(configurations)
+                steps {
+                  script {
+                    if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+                      log.info("Pipeline","Build Agent sets to: ${env.buildAgentImage}")
+                      def sourceFetcher = new SourceFetcher(this)
+                      sourceFetcher.fetch(configurations)
 
-                  def language = ServiceLanguage.parse(component.language)
+                      def language = ServiceLanguage.parse(component.language)
 
-                  def depManager = DependenciesManager.parse(component.dependenciesManager)
+                      def depManager = DependenciesManager.parse(component.dependenciesManager)
 
-                  def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
-                  dependenciesResolver.useManager(depManager)
-                  
-                  if (component.buildCacheEnabled) {
-                    dependenciesResolver.enableCachingSupport()
-                  } else {
-                    dependenciesResolver.disableCachingSupport()
+                      def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
+                      dependenciesResolver.useManager(depManager)
+                      
+                      if (component.buildCacheEnabled) {
+                        dependenciesResolver.enableCachingSupport()
+                      } else {
+                        dependenciesResolver.disableCachingSupport()
+                      }
+
+                      dependenciesResolver.resolve(component)
+                    }
                   }
-
-                  dependenciesResolver.resolve(component)
                 }
 
               }