diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 3fe5df23..e0c79f4f 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -113,26 +113,30 @@ spec:
           script {
             configurations.components.each { component ->
               stage("${component.name} :: Build Agent Setup") {
-                if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
-                  def buildAgentImage = component.buildAgentImage
-                  if (buildAgentImage == null || buildAgentImage.isEmpty()) {
-                    log.warn("Pipeline","Not set buildAgentImage for ${component.name}, using default build agent image")
+                steps {
+                  script {
+                    if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+                      def buildAgentImage = component.buildAgentImage
+                      if (buildAgentImage == null || buildAgentImage.isEmpty()) {
+                        log.warn("Pipeline","Not set buildAgentImage for ${component.name}, using default build agent image")
 
-                    def language = ServiceLanguage.parse(configurations.serviceLang)
-                    switch(language) {
-                      case ServiceLanguage.PYTHON:
-                        buildAgentImage = "python:3.10-slim-buster"
-                        break
-                      case ServiceLanguage.JS:
-                        buildAgentImage = "node:lts-alpine"
-                        break
-                      default:
-                        error("Unknown service language")
+                        def language = ServiceLanguage.parse(configurations.serviceLang)
+                        switch(language) {
+                          case ServiceLanguage.PYTHON:
+                            buildAgentImage = "python:3.10-slim-buster"
+                            break
+                          case ServiceLanguage.JS:
+                            buildAgentImage = "node:lts-alpine"
+                            break
+                          default:
+                            error("Unknown service language")
+                        }
+
+                      }
+                      log.info("Pipeline","Using ${buildAgentImage} as build agent image for ${component.name}")
+                      env.buildAgentImage = buildAgentImage
                     }
-
                   }
-                  log.info("Pipeline","Using ${buildAgentImage} as build agent image for ${component.name}")
-                  env.buildAgentImage = buildAgentImage
                 }
               }