diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 8e73f85c..b8cfd61a 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -49,26 +49,24 @@ def generateComponentStages(component, configurations) {
       ) {
         node("dep-resolver-${component.name}") {
           catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            script {
-              if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
-                log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
-                def sourceFetcher = new SourceFetcher(this)
-                sourceFetcher.fetch(configurations)
+            if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+              log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
+              def sourceFetcher = new SourceFetcher(this)
+              sourceFetcher.fetch(configurations)
 
-                def language = ServiceLanguage.parse(component.language)
-                def depManager = DependenciesManager.parse(component.dependenciesManager)
+              def language = ServiceLanguage.parse(component.language)
+              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()
-                }
-
-                dependenciesResolver.resolve(component)
+              def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
+              dependenciesResolver.useManager(depManager)
+              
+              if (component.buildCacheEnabled) {
+                  dependenciesResolver.enableCachingSupport()
+              } else {
+                  dependenciesResolver.disableCachingSupport()
               }
+
+              dependenciesResolver.resolve(component)
             }
           }
         }