diff --git a/infra/k8s/argo/ci-pipeline-template.yaml b/infra/k8s/argo/ci-pipeline-template.yaml
index 023b15209..83f92221f 100644
--- a/infra/k8s/argo/ci-pipeline-template.yaml
+++ b/infra/k8s/argo/ci-pipeline-template.yaml
@@ -568,7 +568,7 @@ spec:
       nodeSelector:
         k8s.scaleway.com/pool-name: platform
       container:
-        image: bitnami/kubectl:1.31
+        image: gitlab-registry.foxhunt.svc.cluster.local:5000/root/foxhunt/foxhunt-runtime:latest
         command: ["/bin/sh", "-c"]
         resources:
           requests:
@@ -580,6 +580,11 @@ spec:
         args:
           - |
             set -e
+            echo "=== Installing kubectl ==="
+            curl -sLo /usr/local/bin/kubectl "https://dl.k8s.io/release/v1.31.4/bin/linux/amd64/kubectl"
+            chmod +x /usr/local/bin/kubectl
+            kubectl version --client
+
             echo "=== Rolling restart of service deployments ==="
             SERVICES="api trading-service ml-training-service backtesting-service trading-agent-service broker-gateway data-acquisition-service"
             for svc in $SERVICES; do
diff --git a/infra/k8s/argo/events/ci-pipeline-sensor.yaml b/infra/k8s/argo/events/ci-pipeline-sensor.yaml
index f7f86cbfb..797296a8a 100644
--- a/infra/k8s/argo/events/ci-pipeline-sensor.yaml
+++ b/infra/k8s/argo/events/ci-pipeline-sensor.yaml
@@ -34,6 +34,10 @@ spec:
                 namespace: foxhunt
               spec:
                 serviceAccountName: argo-workflow
+                podGC:
+                  strategy: OnPodCompletion
+                ttlStrategy:
+                  secondsAfterCompletion: 3600
                 workflowTemplateRef:
                   name: ci-pipeline
                 arguments: