diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee50a48e7..908caa131 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -500,7 +500,7 @@ jobs:
         run: sleep 240
 
   release-flatpak:
-    if: ${{ github.event.inputs.create_release == 'true' }}
+    if: ${{ github.event.inputs.create_release == 'true' && github.event.inputs.update_branch == 'alpha' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 0b8e52ade..90cf7378a 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -91,7 +91,7 @@ jobs:
         run: pnpm install
 
       - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ github.event.inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download firefox source and dependencies
         run: pnpm surfer download
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 41e42fa69..9d7f4fe9d 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ github.event.inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download firefox source and dependancies
         run: pnpm surfer download
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 4d0f7fef8..1f06d5d2c 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -58,7 +58,7 @@ jobs:
           pnpm i
 
       - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ github.event.inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download
         run: pnpm surfer download
@@ -222,28 +222,28 @@ jobs:
           path: engine/obj-x86_64-pc-windows-msvc/
           
       - name: Upload zip file if twilight branch
-        if: ${{ github.event.inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
           name: zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
           path: ./zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
 
       - name: Upload installer if twilight branch
-        if: ${{ github.event.inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
           name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
           path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
 
       - name: Upload mar if twilight branch
-        if: ${{ github.event.inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
           name: windows${{ matrix.generic == true && '-generic' || '' }}.mar
           path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar
         
       - name: Upload update manifests if twilight branch
-        if: ${{ github.event.inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
           name: windows_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}