diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index b8cfd61a..11ba9556 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -48,25 +48,29 @@ def generateComponentStages(component, configurations) {
         ]
       ) {
         node("dep-resolver-${component.name}") {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            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)
+          steps {
+            script {
+              catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                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()
+                  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)
             }
           }
         }