diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1273bb2b..daa11d07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,6 +220,8 @@ pages:
     - mv docs public
     - mv repo public || true
     - mv build/web/ public/nightly
+    # ensure the nightly deployment knows its location
+    - sed -i "s/href=\"\/web\/\"/href=\"\/nightly\/\"/g" public/nightly/index.html
     - rm -rf build
     - ./scripts/download-web-stable.sh
     - mv stable public/web
diff --git a/scripts/create_fdroid_repos.sh b/scripts/create_fdroid_repos.sh
index 74847a8f..cdadc074 100755
--- a/scripts/create_fdroid_repos.sh
+++ b/scripts/create_fdroid_repos.sh
@@ -7,10 +7,10 @@ mkdir repo
 
 git fetch
 
-cd fdroid
-
 # building nightly repo
 
+cd fdroid
+
 cp config.nightly.py config.py
 
 PIPELINES="$(curl https://gitlab.com/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines\?ref=main\&status=success\&order_by=updated_at | jq '.[].id' | head -n3)"
@@ -31,13 +31,12 @@ done
 
 fdroid update --rename-apks
 mkdir /fdroid && fdroid deploy
-rm -rf /fdroid
-cd .. && mkdir public && mv -v /fdroid repo/nightly
-
+rm -rf /fdroid/archive
+cd .. && mv -v /fdroid repo/nightly
 
 # building stable + RC repo
 
-mkdir /fdroid
+rm -rf /fdroid
 
 cd fdroid
 rm -f repo/*.apk