diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e746fcfd..ff1741986 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,14 +54,14 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Decrypt secrets
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/android/decrypt-secrets.ps1
         shell: pwsh
         env:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
 
       - name: Increment version
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/android/increment-version.ps1
         shell: pwsh
 
@@ -76,7 +76,7 @@ jobs:
         shell: pwsh
 
       - name: Sign for Play Store
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/android/sign-play.ps1
         shell: pwsh
         env:
@@ -84,14 +84,14 @@ jobs:
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
 
       - name: Upload Play Store .aab artifact
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
 
       - name: Upload Play Store .apk artifact
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: com.x8bit.bitwarden.apk
@@ -109,21 +109,21 @@ jobs:
         shell: pwsh
 
       - name: Sign for F-Droid
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/android/sign-fdroid.ps1
         shell: pwsh
         env:
           FDROID_KEYSTORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
 
       - name: Upload F-Droid .apk artifact
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
 
       - name: Deploy to Play Store
-        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/android/deploy-play.ps1
         shell: pwsh
 
@@ -234,7 +234,7 @@ jobs:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
 
       - name: Increment version
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/ios/increment-version.ps1
         shell: pwsh
 
@@ -254,7 +254,7 @@ jobs:
         run: nuget restore
 
       - name: Archive Build for App Store
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/ios/build.ps1 -configuration AppStore -platform iPhone -archive
         shell: pwsh
 
@@ -264,19 +264,19 @@ jobs:
         shell: pwsh
 
       - name: Export .ipa for App Store
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/ios/export-ipa.ps1 -method app-store
         shell: pwsh
 
       - name: Upload App Store .ipa artifact
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: Bitwarden.ipa
           path: ./bitwarden-export/Bitwarden.ipa
 
       - name: Deploy to App Store
-        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         run: ./.github/scripts/ios/deploy-app-store.ps1
         shell: pwsh
         env: