diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b52e117df9..a3c5b7dd17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,65 +85,65 @@ build-retroarch-android-normal:
   stage: build
   artifacts:
     paths:
-    - ./
-    exclude:
-    - .git/**/*
+    - retroarch-precompiled/
     expire_in: 1 day
   script:
-    - "cd pkg/android/phoenix"
-    - "./gradlew assembleNormalRelease"
+    - "cd pkg/android/phoenix && ./gradlew assembleNormalRelease && cd -"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
 
 build-retroarch-android-aarch64:
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
   stage: build
   artifacts:
     paths:
-    - ./
-    exclude:
-    - .git/**/*
+    - retroarch-precompiled/
     expire_in: 1 day
   script:
-    - "cd pkg/android/phoenix"
-    - "./gradlew assembleAarch64Release"
+    - "cd pkg/android/phoenix && ./gradlew assembleAarch64Release && cd -"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
 
 build-retroarch-android-ra32:
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
   stage: build
   artifacts:
     paths:
-    - ./
-    exclude:
-    - .git/**/*
+    - retroarch-precompiled/
     expire_in: 1 day
   script:
-    - "cd pkg/android/phoenix"
-    - "./gradlew assembleRa32Release"
+    - "cd pkg/android/phoenix && ./gradlew assembleRa32Release && cd -"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
 
 build-retroarch-android-playstore-normal:
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
   stage: build
   artifacts:
     paths:
-    - ./
-    exclude:
-    - .git/**/*
+    - retroarch-precompiled/
     expire_in: 1 day
   script:
-    - "cd pkg/android/phoenix"
-    - "./gradlew bundlePlayStoreNormalRelease"
+    - "cd pkg/android/phoenix && ./gradlew bundlePlayStoreNormalRelease && cd -"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
 
-build-retroarch-android-playstore-aarch64:
+build-retroarch-android-playstore-plus:
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
   stage: build
   artifacts:
     paths:
-    - ./
-    exclude:
-    - .git/**/*
+    - retroarch-precompiled/
     expire_in: 1 day
   script:
-    - "cd pkg/android/phoenix"
-    - "./gradlew bundlePlayStoreAarch64Release"
+    - "cd pkg/android/phoenix && ./gradlew bundlePlayStorePlusRelease && cd -"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
 
 build-static-retroarch-libnx-aarch64:
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
diff --git a/pkg/android/phoenix/build.gradle b/pkg/android/phoenix/build.gradle
index 2cfa4e9902..6063e0d945 100644
--- a/pkg/android/phoenix/build.gradle
+++ b/pkg/android/phoenix/build.gradle
@@ -76,17 +76,14 @@ android {
 
       dimension "variant"
     }
-    playStoreAarch64 {
-      minSdkVersion 21
+    playStorePlus {
+      minSdkVersion 26
 
       applicationIdSuffix '.aarch64'
-      resValue "string", "app_name", "RetroArch (AArch64)"
+      resValue "string", "app_name", "RetroArch Plus"
       buildConfigField "boolean", "PLAY_STORE_BUILD", "true"
 
       dimension "variant"
-      ndk {
-        abiFilters 'arm64-v8a', 'x86_64'
-      }
     }
   }
 
diff --git a/pkg/android/phoenix/module_list.txt b/pkg/android/phoenix/module_list_normal.txt
similarity index 100%
rename from pkg/android/phoenix/module_list.txt
rename to pkg/android/phoenix/module_list_normal.txt
diff --git a/pkg/android/phoenix/module_list_plus.txt b/pkg/android/phoenix/module_list_plus.txt
new file mode 100644
index 0000000000..d5dcc747b1
--- /dev/null
+++ b/pkg/android/phoenix/module_list_plus.txt
@@ -0,0 +1,127 @@
+2048
+81
+atari800
+bk
+bluemsx
+bsnes
+bsnes2014_balanced
+bsnes_hd_beta
+bsnes_mercury_balanced
+cannonball
+cap32
+chailove
+craft
+crocods
+daphne
+desmume
+desmume2015
+dinothawr
+dolphin
+dosbox_pure
+dosbox_svn
+duckstation
+ecwolf
+fbalpha2012
+fbneo
+fceumm
+flycast
+fmsx
+freechaf
+freeintv
+frodo
+fuse
+gambatte
+gearboy
+gearsystem
+genesis_plus_gx
+gme
+gpsp
+gw
+handy
+hatari
+lutro
+mame
+mame2000
+mame2003
+mame2003_midway
+mame2003_plus
+mame2010
+mednafen_gba
+mednafen_lynx
+mednafen_ngp
+mednafen_pce_fast
+mednafen_pcfx
+mednafen_psx_hw
+mednafen_saturn
+mednafen_supergrafx
+mednafen_vb
+mednafen_wswan
+melonds
+mesen
+mesen-s
+meteor
+mgba
+mrboom
+mu
+mupen64plus_next_gles2
+mupen64plus_next_gles3
+nekop2
+neocd
+nestopia
+np2kai
+nxengine
+o2em
+oberon
+openlara
+opera
+parallel_n64
+pcsx_rearmed
+picodrive
+play
+pocketcdg
+pokemini
+ppsspp
+prboom
+prosystem
+puae
+px68k
+quasi88
+quicknes
+race
+reminiscence
+retro8
+sameboy
+scummvm
+smsplus
+snes9x
+snes9x2002
+snes9x2005
+snes9x2005_plus
+snes9x2010
+squirreljme
+stella
+stella2014
+tgbdual
+theodore
+thepowdertoy
+tic80
+tyrquake
+uzem
+vbam
+vba_next
+vecx
+vemulator
+vice_x128
+vice_x64
+vice_xcbm2
+vice_xcbm5x0
+vice_xpet
+vice_xplus4
+vice_xscpu64
+vice_xvic
+virtualjaguar
+vitaquake2
+x1
+xrick
+yabasanshiro
+yabause
diff --git a/pkg/android/phoenix/module_template/build.gradle b/pkg/android/phoenix/module_template/build.gradle
index 2856c7dd4b..bc29cdc628 100644
--- a/pkg/android/phoenix/module_template/build.gradle
+++ b/pkg/android/phoenix/module_template/build.gradle
@@ -28,11 +28,9 @@ android {
     playStoreNormal {
       dimension "variant"
     }
-    playStoreAarch64 {
+    playStorePlus {
+      minSdkVersion 26
       dimension "variant"
-      ndk {
-        abiFilters 'arm64-v8a', 'x86_64'
-      }
     }
   }