diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 97ea27c2..bfca10a0 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -561,12 +561,9 @@ spec:
         }
         steps {
           script {
-            def componentStages = configurations.components.collectEntries { component ->
-              ["Generated Stage :: ${component.name}": generateComponentStages(component, configurations)]
-            }
-            for (stage in componentStages) {
-              log.info("Pipeline", "Executing ${stage.key}...")
-              stage.value()
+            configurations.components.each { component ->
+              log.info("Pipeline", "Executing generated stages for ${component.name}...")
+              generateComponentStages(component, configurations)()
             }
           }
         }