diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index debf9c1..b5506eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,30 +27,27 @@ python_tests:
     - cd backend
     - python -m pytest -v || echo "No tests yet"
 
-deploy_helm_charts:
-  stage: deploy
-  image:
-    name: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
-  parallel:
-    matrix:
-      # - ENV: "prod"
-      #   VALUES_FILE: "helm/values-prod.yaml"
-      #   CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
-      #   NAMESPACE: "bsf-services-namespace"
-        # ONLY: "main"
-      - ENV: "dev"
-        VALUES_FILE: "helm/orchard/values.yaml"
-        CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
-        NAMESPACE: "bsf-services-dev-namespace"
-        # ONLY: ["branches", "!main"]
-  script:
-    - kubectl config use-context $CONTEXT
-    - echo "Deploy - buildah push ${IMAGE_NAME}:latest"
-    - |
-      helm upgrade --install orchard-dev ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE
-
-stages:
-  - deploy
+# deploy_helm_charts:
+#   stage: deploy
+#   image:
+#     name: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
+#   parallel:
+#     matrix:
+#       # - ENV: "prod"
+#       #   VALUES_FILE: "helm/values-prod.yaml"
+#       #   CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+#       #   NAMESPACE: "bsf-services-namespace"
+#         # ONLY: "main"
+#       - ENV: "dev"
+#         VALUES_FILE: "helm/orchard/values.yaml"
+#         CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+#         NAMESPACE: "bsf-services-dev-namespace"
+#         # ONLY: ["branches", "!main"]
+#   script:
+#     - kubectl config use-context $CONTEXT
+#     - echo "Deploy - buildah push ${IMAGE_NAME}:latest"
+#     - |
+#       helm upgrade --install orchard-dev ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE
 
 .deploy_template: &deploy_template
   image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
@@ -64,10 +61,10 @@ stages:
   script:
     - echo "Deploying to $ENV environment in namespace $NAMESPACE using chart $VALUES_FILE with agent $AGENT"
     - helm upgrade --install orchard-$ENV ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE --set image.tag=$IMAGE
-  kubernetes:
-    agent: $AGENT
   environment:
     name: $ENV
+    kubernetes:
+      agent: $AGENT
 
 deploy:
   stage: deploy