diff --git a/first-class-pipeline/tests/Jenkinsfile b/first-class-pipeline/tests/Jenkinsfile
index 0521776e..4048091b 100644
--- a/first-class-pipeline/tests/Jenkinsfile
+++ b/first-class-pipeline/tests/Jenkinsfile
@@ -15,7 +15,7 @@ executeFreeleapsPipeline {
       language: 'javascript',
       dependenciesManager: 'npm',
       npmPackageJsonFile: 'package.json',
-      buildAgentImage: 'node:lts-alpine',
+      buildAgentImage: 'node:lts',
       buildCacheEnabled: true,
       buildCommand: 'npm run build',
       lintEnabled: true,
diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 2b521ade..8e73f85c 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -48,25 +48,27 @@ def generateComponentStages(component, configurations) {
         ]
       ) {
         node("dep-resolver-${component.name}") {
-          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)
+          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)
 
-              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)
             }
           }
         }