diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0d286227a5..579183c881 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -35,6 +35,7 @@ jobs:
 
   arm:
     name: Build / Cabal - aarch64 GHC 9.4.8
+    if: vars.SSH_ARM_ENABLED
     runs-on: ubuntu-latest
     outputs:
       remotepath: ${{ steps.Remote-Dir.outputs.remotepath }}
@@ -103,7 +104,9 @@ jobs:
 
   prepare:
     name: Release / Prepare
-    if: startsWith(github.ref, 'refs/tags/v')
+    if: |
+      startsWith(github.ref, 'refs/tags/v') &&
+      (success() || needs.arm.result == 'skipped')
     runs-on: ubuntu-latest
     needs:
       - docs