diff --git a/.github/actions/build-push-image-with-apko/action.yml b/.github/actions/build-push-image-with-apko/action.yml
index 98ecb0b4bc..7b47625c58 100644
--- a/.github/actions/build-push-image-with-apko/action.yml
+++ b/.github/actions/build-push-image-with-apko/action.yml
@@ -44,7 +44,7 @@ runs:
       if: ${{ inputs.overwrite == 'true' || steps.check-image-exists.outputs.image-exists == 'false' }}
       with:
         config: ${{ inputs.apko-config }}
-        archs: x86_64
+        archs: x86_64,arm64
         tag: ${{ inputs.image-name }}
         vcs-url: true
         generic-user: ${{ inputs.registry-username }}
diff --git a/.github/actions/build-push-kotsadm-image/action.yml b/.github/actions/build-push-kotsadm-image/action.yml
index bec83c14dc..ad8af17e60 100644
--- a/.github/actions/build-push-kotsadm-image/action.yml
+++ b/.github/actions/build-push-kotsadm-image/action.yml
@@ -66,14 +66,14 @@ runs:
     - uses: chainguard-dev/actions/melange-build@main
       with:
         config: deploy/melange.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         sign-with-temporary-key: true
         cache-dir: ${{ steps.cache-dir.outputs.cache_dir }}
 
     - uses: chainguard-images/actions/apko-publish@main
       with:
         config: deploy/apko.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         tag: ${{ inputs.image-name }}
         vcs-url: true
         generic-user: ${{ inputs.registry-username }}
diff --git a/.github/actions/build-push-kotsadm-migrations-image/action.yml b/.github/actions/build-push-kotsadm-migrations-image/action.yml
index 858ac584db..52bb9fb86f 100644
--- a/.github/actions/build-push-kotsadm-migrations-image/action.yml
+++ b/.github/actions/build-push-kotsadm-migrations-image/action.yml
@@ -48,14 +48,14 @@ runs:
     - uses: chainguard-dev/actions/melange-build@main
       with:
         config: migrations/deploy/melange.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         sign-with-temporary-key: true
         cache-dir: ${{ steps.cache-dir.outputs.cache_dir }}
 
     - uses: chainguard-images/actions/apko-publish@main
       with:
         config: migrations/deploy/apko.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         tag: ${{ inputs.image-name }}
         vcs-url: true
         generic-user: ${{ inputs.registry-username }}
diff --git a/.github/actions/build-push-kurl-proxy-image/action.yml b/.github/actions/build-push-kurl-proxy-image/action.yml
index abc258e893..70871e0507 100644
--- a/.github/actions/build-push-kurl-proxy-image/action.yml
+++ b/.github/actions/build-push-kurl-proxy-image/action.yml
@@ -36,14 +36,14 @@ runs:
     - uses: chainguard-dev/actions/melange-build@main
       with:
         config: kurl_proxy/deploy/melange.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         sign-with-temporary-key: true
         cache-dir: ${{ steps.cache-dir.outputs.cache_dir }}
 
     - uses: chainguard-images/actions/apko-publish@main
       with:
         config: kurl_proxy/deploy/apko.yaml
-        archs: x86_64
+        archs: x86_64,arm64
         tag: ${{ inputs.image-name }}
         vcs-url: true
         generic-user: ${{ inputs.registry-username }}
diff --git a/.github/workflows/alpha.yaml b/.github/workflows/alpha.yaml
index b7dac73108..82c5f13bcc 100644
--- a/.github/workflows/alpha.yaml
+++ b/.github/workflows/alpha.yaml
@@ -39,6 +39,7 @@ jobs:
       id-token: write # required to be able to assume the GCP SA identity to pull private Chainguard packages.
     steps:
       - uses: actions/checkout@v4
+      # TODO: need to build web as the image depends on the static assets
       - uses: ./.github/actions/build-push-kotsadm-image
         with:
           chainguard-gcp-wif-pool: ${{ secrets.CHAINGUARD_GCP_WIF_POOL }}
diff --git a/web/Makefile b/web/Makefile
index 972f788292..73a3ac97bc 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -11,7 +11,7 @@ endif
 
 .PHONY: deps
 deps:
-	yarn --silent --frozen-lockfile
+	yarn --silent --frozen-lockfile --network-timeout 600000
 
 .PHONY: publish-pact
 publish-pact: