diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 04dd5e2f..182e6147 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,6 +13,13 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
+      - name: Verify release branch
+        run: |
+          if [[ "${{ github.ref }}" != refs/heads/v1beta3 ]]; then
+            echo "::error::Releases can only be created from the v1beta3 branch"
+            echo "Current ref: ${{ github.ref }}"
+            exit 1
+          fi
       - name: Checkout
         uses: actions/checkout@v5
         with:
diff --git a/deploy/.goreleaser.yaml b/deploy/.goreleaser.yaml
index dae1bd90..a8612533 100644
--- a/deploy/.goreleaser.yaml
+++ b/deploy/.goreleaser.yaml
@@ -104,7 +104,6 @@ dockers_v2:
       - linux/amd64
       - linux/arm64
       - linux/arm/v7
-      - linux/riscv64
 
   - id: preflight
     dockerfile: ./deploy/Dockerfile.troubleshoot
@@ -120,7 +119,6 @@ dockers_v2:
       - linux/amd64
       - linux/arm64
       - linux/arm/v7
-      - linux/riscv64
 
 universal_binaries:
   - id: preflight-universal
diff --git a/deploy/Dockerfile.troubleshoot b/deploy/Dockerfile.troubleshoot
index 7b763824..87182c41 100644
--- a/deploy/Dockerfile.troubleshoot
+++ b/deploy/Dockerfile.troubleshoot
@@ -7,7 +7,6 @@ RUN apt-get -qq update \
 
 COPY support-bundle /troubleshoot/support-bundle
 COPY preflight /troubleshoot/preflight
-COPY collect /troubleshoot/collect
 
 ENV PATH="/troubleshoot:${PATH}"