diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fb59a3061..61ffe0eac 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -55,7 +55,7 @@ jobs:
         apt-get install --reinstall cpp-7 gcc-7-base libgcc-7-dev libcc1-0 gcc-7
         git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
         git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
-        bash -x ./subsurface/packaging/android/qmake-build.sh
+        OUTPUT_DIR=$GITHUB_WORKSPACE bash -x ./subsurface/packaging/android/qmake-build.sh
 
     - name: create version number
       id: version_number
diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh
index 26ff53395..196cdfcd0 100755
--- a/packaging/android/qmake-build.sh
+++ b/packaging/android/qmake-build.sh
@@ -404,4 +404,7 @@ fi
 
 # now build the Subsurface aab
 make apk
-mv $(find . -name Subsurface-mobile.apk) "$GITHUB_WORKSPACE"/Subsurface-mobile-"$CANONICALVERSION".apk
+
+if [ -n "${OUTPUT_DIR+X}" ] ; then
+	mv $(find . -name Subsurface-mobile.apk) "$OUTPUT_DIR"/Subsurface-mobile-"$CANONICALVERSION".apk
+fi