diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 89f4b117..e462e8e6 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -10,6 +10,7 @@ import com.freeleaps.devops.ChangedComponentsDetector
 def generateComponentStages(component) {
     return [
       stage("${component.name} :: Build Agent Setup") {
+        steps {
             script {
                 if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
                     def buildAgentImage = component.buildAgentImage
@@ -32,6 +33,7 @@ def generateComponentStages(component) {
                     env.buildAgentImage = buildAgentImage
                 }
             }
+        }
     },
 
     stage("${component.name} :: Dependencies Resolving") {
@@ -55,6 +57,7 @@ spec:
 """
             }
         }
+        steps {
             script {
                 if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
                     log.info("Pipeline", "Build Agent sets to: ${env.buildAgentImage}")
@@ -76,6 +79,7 @@ spec:
                     dependenciesResolver.resolve(component)
                 }
             }
+        }
     }
   ]
 }
@@ -185,7 +189,10 @@ spec:
         steps {
           script {
             configurations.components.each { component ->
-              generateComponentStages(component)
+              def generatedStages = generateComponentStages(component)
+              generatedStages.each { stage ->
+                stage(stage)
+              }
             }
           }
         }