diff --git a/.github/workflows/android-build-pr.yml b/.github/disabled_workflows/android-build-pr.yml
similarity index 100%
rename from .github/workflows/android-build-pr.yml
rename to .github/disabled_workflows/android-build-pr.yml
diff --git a/.github/workflows/android-build.yml b/.github/disabled_workflows/android-build.yml
similarity index 100%
rename from .github/workflows/android-build.yml
rename to .github/disabled_workflows/android-build.yml
diff --git a/.github/workflows/build-contributor-pr.yml b/.github/disabled_workflows/build-contributor-pr.yml
similarity index 100%
rename from .github/workflows/build-contributor-pr.yml
rename to .github/disabled_workflows/build-contributor-pr.yml
diff --git a/.github/workflows/glean-probe-scraper.yml b/.github/disabled_workflows/glean-probe-scraper.yml
similarity index 100%
rename from .github/workflows/glean-probe-scraper.yml
rename to .github/disabled_workflows/glean-probe-scraper.yml
diff --git a/.github/workflows/issue-linker.yml b/.github/disabled_workflows/issue-linker.yml
similarity index 100%
rename from .github/workflows/issue-linker.yml
rename to .github/disabled_workflows/issue-linker.yml
diff --git a/.github/workflows/milestone.yml b/.github/disabled_workflows/milestone.yml
similarity index 100%
rename from .github/workflows/milestone.yml
rename to .github/disabled_workflows/milestone.yml
diff --git a/.github/workflows/qa-needed.yml b/.github/disabled_workflows/qa-needed.yml
similarity index 100%
rename from .github/workflows/qa-needed.yml
rename to .github/disabled_workflows/qa-needed.yml
diff --git a/.github/workflows/reopen-for-qa-needed.yml b/.github/disabled_workflows/reopen-for-qa-needed.yml
similarity index 100%
rename from .github/workflows/reopen-for-qa-needed.yml
rename to .github/disabled_workflows/reopen-for-qa-needed.yml
diff --git a/.github/workflows/release-automation.yml b/.github/workflows/iceraven-build.yml
similarity index 83%
rename from .github/workflows/release-automation.yml
rename to .github/workflows/iceraven-build.yml
index c47f78a79..3ed86f19a 100644
--- a/.github/workflows/release-automation.yml
+++ b/.github/workflows/iceraven-build.yml
@@ -1,14 +1,15 @@
 name: Release Automation
 on:
   push:
+    branches:
+      - fork
     tags:
       - '*'
   create:
 jobs:
   release-automation:
-    name: Create Release
+    name: Build App
     runs-on: ubuntu-latest
-    if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -22,6 +23,8 @@ jobs:
         run: ./automation/iceraven/install-sdk.sh
       - name: Inspect memory
         run: free -m
+      - name: Create version name
+        run: echo "VERSION_NAME=$(git describe --tags HEAD)" >> $GITHUB_ENV
       - name: Build forkRelease variant of app
         uses: eskatos/gradle-command-action@v1
         env:
@@ -32,8 +35,10 @@ jobs:
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
-          arguments: app:assembleForkRelease -PversionName=${{ github.event.ref }}
+          arguments: app:assembleForkRelease -PversionName=${{ env.VERSION_NAME }}
+      
       - name: Create signed APKs
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: abhijitvalluri/sign-apks@v0.8
         with:
           releaseDirectory: app/build/outputs/apk/forkRelease/
@@ -41,7 +46,9 @@ jobs:
           alias: ${{ secrets.DEBUG_ALIAS }}
           keyStorePassword: ${{ secrets.DEBUG_KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.DEBUG_KEY_PASSWORD }}
+      
       - name: Create changelog
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         run: |
           PREVIOUS_RELEASE_TAG=$(git tag --list iceraven-* --sort=-creatordate | tail -n+2 | head -n 1)
 
@@ -65,6 +72,7 @@ jobs:
           echo " " >>temp_changelog.md
 
       - name: Create Release
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         id: create_release
         uses: actions/create-release@v1
         env:
@@ -77,6 +85,7 @@ jobs:
           body_path: temp_changelog.md
 
       - name: Upload arm64 apk
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -88,6 +97,7 @@ jobs:
 
 
       - name: Upload armeabi apk
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -99,6 +109,7 @@ jobs:
 
 
       - name: Upload x86 apk
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -110,6 +121,7 @@ jobs:
 
 
       - name: Upload x86_64 apk
+        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}