diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 5c3fd871..7418d91b 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -55,20 +55,23 @@ def call(body) {
         steps {
           script {
             def buildAgentImage = configurations.buildAgentImage
-            if (buildAgentImage != null && !buildAgentImage.isEmpty()) {
+            if (buildAgentImage == null || buildAgentImage.isEmpty()) {
               echo "Not set buildAgentImage, using default build agent image"
 
               def language = env.serviceLang
               switch(language) {
                 case PYTHON:
                   buildAgentImage = "python:3.10-slim-buster"
+                  break
                 case NODE:
                   buildAgentImage = "node:lts-alpine"
+                  break
                 default:
                   error("Unknown service language")
               }
 
-              configurations.buildAgentImage = buildAgentImage
+              echo "Using ${buildAgentImage} as build agent image"
+              env.buildAgentImage = buildAgentImage
             }
           }
         }
@@ -83,11 +86,11 @@ apiVersion: v1
 kind: Pod
 metadata:
   labels:
-    freeleaps-devops-system/stage: dependencies-resolving
+    freeleaps-devops-system/milestone: dependencies-resolving
 spec:
   containers:
   - name: dep-resolver
-    image: ${configurations.buildAgentImage}
+    image: ${env.buildAgentImage}
     command:
     - cat
     tty: true