diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 387c89e352..7560dd3b92 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -253,7 +253,7 @@ jobs:
 
 
   build-kotsadm:
-    runs-on: ubuntu-20.04
+    runs-on: [ self-hosted, linux, ARM64 ]
     needs: [ can-run-ci, generate-tag ]
     permissions:
       id-token: write # required to be able to assume the GCP SA identity to pull private Chainguard packages.
diff --git a/deploy/melange.yaml.tmpl b/deploy/melange.yaml.tmpl
index dbf26fbafe..a40f056fc8 100644
--- a/deploy/melange.yaml.tmpl
+++ b/deploy/melange.yaml.tmpl
@@ -17,8 +17,8 @@ environment:
       - ca-certificates-bundle
       - busybox
       - git
-      - go-1.21
-      - nodejs-19
+      - go
+      - nodejs
       - yarn
   environment:
     GOMODCACHE: '/var/cache/melange'