diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index c8b57674..e0d0cefc 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -440,7 +440,11 @@ def generateComponentStages(component, configurations) {
       }
     }
   ])
-  return stages
+  return {
+    stages.each { stage ->
+      stage.call()
+    }
+  }
 }
 
 def call(Closure closure) {
@@ -547,9 +551,10 @@ spec:
         }
         steps {
           script {
-            configurations.components.each { component ->
-              parallel generateComponentStages(component, configurations)
+            def componentStages = configurations.components.collectEntries { component ->
+              ["Generated Stage :: ${component}": generateComponentStages(component, configurations)]
             }
+            parallel componentStages
           }
         }
       }