diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0037778..6bf636b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ deploy_stage:
     ENV: stage
     NAMESPACE: orch-stage-namespace
     VALUES_FILE: "helm/orchard/values-stage.yaml"
-    AGENT: orchard-stage
+    AGENT: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard-stage
     IMAGE: $CI_COMMIT_SHA
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
@@ -90,7 +90,7 @@ deploy_feature:
     ENV: feat-$CI_COMMIT_SHORT_SHA
     NAMESPACE: orch-dev-namespace
     VALUES_FILE: "helm/orchard/values-dev.yaml"
-    AGENT: orchard
+    AGENT: esv/bsf/bsf-integration/orchard/orchard-mvp: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
@@ -129,7 +129,7 @@ cleanup_feature:
   variables:
     FEATURE_ID: feat-$CI_COMMIT_SHORT_SHA
     NAMESPACE: orch-dev-namespace
-    AGENT: orchard
+    AGENT: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard
   image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
   script:
     - echo "Cleaning up feature deployment orchard-$FEATURE_ID"