diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 8cbf9cce..0773c7e0 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -105,6 +105,11 @@ spec:
       }
 
       stage("Components Build (Dynamic Generated Stages)") {
+        when {
+          expression {
+            return env.executeMode == "fully" || env.changedComponents.size() > 0
+          }
+        }
         steps {
           script {
             configurations.components.each { component ->