diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 4f0d5c49..58690ddb 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -7,7 +7,12 @@ on:
 
 jobs:
   e2e-tests:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+          - ubuntu-24.04-arm
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: jumpstarter-dev/jumpstarter-e2e@main
         with:
diff --git a/deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/secrets-job.yaml b/deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/secrets-job.yaml
index a860ee58..4e018af5 100644
--- a/deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/secrets-job.yaml
+++ b/deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/secrets-job.yaml
@@ -15,15 +15,15 @@ spec:
       serviceAccountName: controller-manager
       containers:
         - name: jumpstarter-secrets
-          image: quay.io/openshift/origin-cli
+          image: quay.io/jumpstarter-dev/jumpstarter-utils:latest
           command:
             - /bin/sh
             - -c
             - |
               set -e
               {{- range $name := tuple "jumpstarter-router-secret" "jumpstarter-controller-secret" }}
-              if ! oc get secret {{ $name }} -n {{ $namespace }} >/dev/null 2>&1; then
-                oc create secret generic {{ $name }} -n={{ $namespace }} \
+              if ! kubectl get secret {{ $name }} -n {{ $namespace }} >/dev/null 2>&1; then
+                kubectl create secret generic {{ $name }} -n={{ $namespace }} \
                   --from-literal=key="$(openssl rand -hex 32)"
               fi
               {{- end }}