diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml
index d8be25a..af64278 100644
--- a/.github/workflows/android_release.yml
+++ b/.github/workflows/android_release.yml
@@ -15,7 +15,6 @@ defaults:
 env:
   SOURCE_DIR:   ${{ github.workspace }}
   QT_VERSION:   5.15.2
-  ARTIFACT:     QGroundControl.aab
 
 jobs:
   build:
@@ -101,24 +100,8 @@ jobs:
               echo "Daily build" &&
               export STABLE_OR_DAILY=DailyBuild;
             fi
-            qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=installer CONFIG+=${STABLE_OR_DAILY} ANDROID_ABIS="armeabi-v7a arm64-v8a"
+            qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} ANDROID_ABIS="armeabi-v7a arm64-v8a"
             make -j2 aab
 
       - name: ccache post-run
         run:  ccache -s
-
-      - name: Save artifact
-        uses: actions/upload-artifact@master
-        with:
-          if:   github.event_name == 'push'
-          name: ${{ env.ARTIFACT }}
-          path: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
-
-      # Currently disabled since credentials are not working correctly
-      - name: Upload to S3 Bucket
-        if:                 ${{ false }}
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${ARTIFACT} s3://groundcontrol/master --region us-west-2 --acl public-read
diff --git a/.github/workflows/linux_release.yml b/.github/workflows/linux_release.yml
index ec55679..b684485 100644
--- a/.github/workflows/linux_release.yml
+++ b/.github/workflows/linux_release.yml
@@ -93,7 +93,7 @@ jobs:
 
       # Currently disabled since credentials are not working correctly
       - name: Upload to S3 Bucket
-        if:                 ${{ false }}
+        if:   false && github.event_name == 'push'
         working-directory:  ${{ runner.temp }}/shadow_build_dir/package
         run: |
               aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml
index cc8a42b..9e94958 100644
--- a/.github/workflows/macos_release.yml
+++ b/.github/workflows/macos_release.yml
@@ -88,7 +88,7 @@ jobs:
 
       # Currently disabled since credentials are not working correctly
       - name: Upload to S3 Bucket
-        if:                 ${{ false }}
+        if:   false && github.event_name == 'push'
         working-directory:  ${{ runner.temp }}/shadow_build_dir/package
         run: |
               aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
index 97a20fd..f82b9e0 100644
--- a/.github/workflows/windows_release.yml
+++ b/.github/workflows/windows_release.yml
@@ -94,7 +94,7 @@ jobs:
 
       # Currently disabled since credentials are not working correctly
       - name: Upload to S3 Bucket
-        if:                 ${{ false }}
+        if:   false && github.event_name == 'push'
         working-directory:  ${{ runner.temp }}\shadow_build_dir\staging
         run: |
               aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}