diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50f8c135c..e20945852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -365,11 +365,15 @@ deploy_nightly:
     JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   script:
     - test -z "$DEBUG_KEYSTORE" && exit 0
-    - apt-get install -t bookworm-backports androguard fdroidserver
+    - apt-get install -t bookworm-backports androguard fdroidserver jq moreutils
     - sed -i
-        's,<string name="app_name">.*</string>,<string name="app_name">F-Nightly</string>,'
+        's,<string name="app_name_basic">.*</string>,<string name="app_name_basic">F-Nightly Basic</string>,'
+        app/src/main/res/values*/strings.xml
+    - sed -i
+        's,<string name="app_name_full">.*</string>,<string name="app_name_full">F-Nightly</string>,'
         app/src/main/res/values*/strings.xml
     # add this nightly repo as a enabled repo
+    - jq --slurpfile new_dict config/nightly-repo/repo.json "[(\$new_dict[0] | .address = \"${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo\")] + ." app/src/main/assets/default_repos.json | sponge app/src/main/assets/default_repos.json
     - sed -i -e '/<\/string-array>/d' -e '/<\/resources>/d' legacy/src/main/res/values/default_repos.xml
     - echo "<item>${CI_PROJECT_PATH}-nightly</item>" >> legacy/src/main/res/values/default_repos.xml
     - echo "<item>${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo</item>" >> legacy/src/main/res/values/default_repos.xml
@@ -378,7 +382,9 @@ deploy_nightly:
     - export versionCode=`printf '%d%05d' $DB $(date '+%s'| cut -b1-8)`
     - sed -i "s,^\(\s*versionCode\)  *[0-9].*,\1 $versionCode," app/build.gradle
     # build the APKs!
-    - ./gradlew assembleDebug
+    - rm -rf app/build/outputs/apk
+    - ./gradlew :app:assembleBasicRelease :legacy:assembleFullDebug
+    - mv app/build/outputs/apk/basic/release/app-basic-release-unsigned.apk app/build/outputs/apk/basic/release/app-debug.apk
 
     # taken from fdroiddata/.gitlab-ci.yml as a tmp workaround until this is released:
     # https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1666
diff --git a/config/nightly-repo/repo.json b/config/nightly-repo/repo.json
new file mode 100644
index 000000000..60d495201
--- /dev/null
+++ b/config/nightly-repo/repo.json
@@ -0,0 +1,7 @@
+{
+  "name": "F-Droid Next Nightlies",
+  "address": "https://gitlab.com/fdroid/fdroidclient-nightly/-/raw/master/fdroid/repo",
+  "description": "This repo is nightly builds of F-Droid, it should only be used for testing!",
+  "certificate": "308201e53082014ea0030201020204503d3768300d06092a864886f70d01010505003037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f6964204465627567301e170d3132303832383231323630305a170d3432303832313231323630305a3037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f696420446562756730819f300d06092a864886f70d010101050003818d0030818902818100b5ba553eacbc4de5b45af812d9695140dafbc0a8a9c13ac9a7e24b2665371ce5072e5dfef60f705d58fdb2d0e2190264e42d83a6fd80cfd54690e9e3c3735fa8dce684ee99ac879b1b11e1c8a9cbb9dc6b23064b025f9db7dc87d48ee4bc038affd80d854c0ed5d88d93d6e8127e62344727e23886b97f5d10e2265c9c9b5bd10203010001300d06092a864886f70d0101050500038181006dae218bdbff79801b1935448c663319843a7b2eb5f5c8837f010e58da25ba4d23bc6650b53c93f9c42b379299f4659b4cc3c505aa1a7c08c8a1a58fffe78d29df2cf69b27c34a0ab5f44cf7e323e34f8252d9f6e4d67171ce38bab64623910811dae6b12203385b32d962dbd51e8a6b0dcab3fa4d1f4020cee69a5f3c6ddf69",
+  "enabled": true
+}