diff --git a/.github/workflows/gen_alpine3.12.yml b/.github/workflows/gen_alpine3.12.yml
index f27a77b74..b4f1c128d 100644
--- a/.github/workflows/gen_alpine3.12.yml
+++ b/.github/workflows/gen_alpine3.12.yml
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.12_continuous.yml b/.github/workflows/gen_alpine3.12_continuous.yml
index 3fe9a9306..e3dfa99d1 100644
--- a/.github/workflows/gen_alpine3.12_continuous.yml
+++ b/.github/workflows/gen_alpine3.12_continuous.yml
@@ -82,7 +82,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages -ls ; mv ~/packages/**/*.apk ."
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/gen_alpine3.12_tag.yml b/.github/workflows/gen_alpine3.12_tag.yml
index a58d194e2..15332410e 100644
--- a/.github/workflows/gen_alpine3.12_tag.yml
+++ b/.github/workflows/gen_alpine3.12_tag.yml
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.13.yml b/.github/workflows/gen_alpine3.13.yml
index 487a384f8..6ec7b1ee9 100644
--- a/.github/workflows/gen_alpine3.13.yml
+++ b/.github/workflows/gen_alpine3.13.yml
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.13_continuous.yml b/.github/workflows/gen_alpine3.13_continuous.yml
index 24530f796..314ed1099 100644
--- a/.github/workflows/gen_alpine3.13_continuous.yml
+++ b/.github/workflows/gen_alpine3.13_continuous.yml
@@ -82,7 +82,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages -ls ; mv ~/packages/**/*.apk ."
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/gen_alpine3.13_tag.yml b/.github/workflows/gen_alpine3.13_tag.yml
index d13113f08..da0bc5417 100644
--- a/.github/workflows/gen_alpine3.13_tag.yml
+++ b/.github/workflows/gen_alpine3.13_tag.yml
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.14.yml b/.github/workflows/gen_alpine3.14.yml
index 407d27be6..e151ad63d 100644
--- a/.github/workflows/gen_alpine3.14.yml
+++ b/.github/workflows/gen_alpine3.14.yml
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.14_continuous.yml b/.github/workflows/gen_alpine3.14_continuous.yml
index 5bc2eee23..58c12d988 100644
--- a/.github/workflows/gen_alpine3.14_continuous.yml
+++ b/.github/workflows/gen_alpine3.14_continuous.yml
@@ -82,7 +82,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages -ls ; mv ~/packages/**/*.apk ."
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/gen_alpine3.14_tag.yml b/.github/workflows/gen_alpine3.14_tag.yml
index f1b3e18ec..d9d812dd3 100644
--- a/.github/workflows/gen_alpine3.14_tag.yml
+++ b/.github/workflows/gen_alpine3.14_tag.yml
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.15.yml b/.github/workflows/gen_alpine3.15.yml
index 93fb36de4..1ac7b98eb 100644
--- a/.github/workflows/gen_alpine3.15.yml
+++ b/.github/workflows/gen_alpine3.15.yml
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/.github/workflows/gen_alpine3.15_continuous.yml b/.github/workflows/gen_alpine3.15_continuous.yml
index 7b8ff320d..6dad01913 100644
--- a/.github/workflows/gen_alpine3.15_continuous.yml
+++ b/.github/workflows/gen_alpine3.15_continuous.yml
@@ -82,7 +82,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages -ls ; mv ~/packages/**/*.apk ."
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/gen_alpine3.15_tag.yml b/.github/workflows/gen_alpine3.15_tag.yml
index 768bf10ad..d14c39789 100644
--- a/.github/workflows/gen_alpine3.15_tag.yml
+++ b/.github/workflows/gen_alpine3.15_tag.yml
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/**/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."
diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
index 07eaa0c9d..e58ebf3f2 100755
--- a/ci/generate-workflows.py
+++ b/ci/generate-workflows.py
@@ -381,7 +381,7 @@ cargo build --all --release""",
             steps.append(
                 RunStep(
                     "Move APKs",
-                    f"find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk .",
+                    f"find ~/packages/ -ls ; mv ~/packages/**/*.apk .",
                 )
             )
             steps.append(
@@ -438,7 +438,7 @@ cargo build --all --release""",
             steps.append(
                 RunStep(
                     "Move APKs",
-                    f"find ~/packages -ls ; mv ~/packages/x86_64/*.apk .",
+                    f"find ~/packages -ls ; mv ~/packages/**/*.apk .",
                 )
             )