diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7337a7d..0037778 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,7 @@ python_tests:
 
 # Deploy to stage (main branch)
 deploy_stage:
+  image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
   stage: deploy
   variables:
     ENV: stage
@@ -82,13 +83,14 @@ deploy_stage:
 
 # Deploy feature branch to dev namespace
 deploy_feature:
+  image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
   stage: deploy
   variables:
     FEATURE_ID: feat-$CI_COMMIT_SHORT_SHA
     ENV: feat-$CI_COMMIT_SHORT_SHA
     NAMESPACE: orch-dev-namespace
     VALUES_FILE: "helm/orchard/values-dev.yaml"
-    AGENT: orchard-dev
+    AGENT: orchard
     IMAGE: $CI_COMMIT_SHA
     FEATURE_HOST: orchard-$CI_COMMIT_SHORT_SHA.common.global.bsf.tools
     MINIO_HOST: minio-$CI_COMMIT_SHORT_SHA.common.global.bsf.tools
@@ -127,7 +129,7 @@ cleanup_feature:
   variables:
     FEATURE_ID: feat-$CI_COMMIT_SHORT_SHA
     NAMESPACE: orch-dev-namespace
-    AGENT: orchard-dev
+    AGENT: orchard
   image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
   script:
     - echo "Cleaning up feature deployment orchard-$FEATURE_ID"