diff --git a/libretro/gitlab-ci.yml b/libretro/gitlab-ci.yml
index 58885ff6e..690e563af 100644
--- a/libretro/gitlab-ci.yml
+++ b/libretro/gitlab-ci.yml
@@ -7,10 +7,15 @@
 # Core definitions
 .core-defs:
   variables:
-    JNI_PATH: libretro
     MAKEFILE_PATH: libretro
     CORENAME: sameboy
     BOOTROMS_DIR: ../BootROMs/prebuilt
+    
+.core-defs-android:
+  extends: .core-defs
+  variables:
+    JNI_PATH: libretro
+    BOOTROMS_DIR: ../../BootROMs/prebuilt
 
 # Inclusion templates, required for the build to work
 include:
@@ -123,25 +128,25 @@ libretro-build-osx-arm64:
 android-armeabi-v7a:
   extends:
     - .libretro-android-jni-armeabi-v7a
-    - .core-defs
+    - .core-defs-android
 
 # Android ARMv8a
 android-arm64-v8a:
   extends:
     - .libretro-android-jni-arm64-v8a
-    - .core-defs
+    - .core-defs-android
 
 # Android 64-bit x86
 android-x86_64:
   extends:
     - .libretro-android-jni-x86_64
-    - .core-defs
+    - .core-defs-android
 
 # Android 32-bit x86
 android-x86:
   extends:
     - .libretro-android-jni-x86
-    - .core-defs
+    - .core-defs-android
 
 # iOS
 libretro-build-ios-arm64: