diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0280091..4065bc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,10 +179,9 @@ linux:package:
       mv ../*.{deb,buildinfo,changes} artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:debian_build\r\e[0K"
       echo -e "\e[0Ksection_start:`date +%s`:flatpaks\e[0KBuilding Flatpak"
-      flatpak-builder --repo=build/ flatpak flatpak_x64_manifest.yml --force-clean --allow-missing-runtimes
-      flatpak build-bundle build/ GridTracker-${VER}-x86_64.flatpak org.gridtracker.GridTracker --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+      flatpak-builder flatpak flatpak_x64_manifest.yml --force-clean --repo=flatpakrepo --allow-missing-runtimes
+      flatpak build-bundle flatpakrepo GridTracker-${VER}-x86_64.flatpak org.gridtracker.GridTracker --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
       mv *.flatpak artifacts/
-      mv build/*.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
       echo "we made LINUX packages!"
       ls -laR artifacts
@@ -307,10 +306,8 @@ arm:package:
       mv GridTracker-${VER}-linux-arm64 dist/
       cp dist/GridTracker-${VER}-linux-arm64/package.nw/gridview.png dist/GridTracker-${VER}-linux-arm64/gridview.png
       echo "Building flatpak source..."
-      flatpak-builder --repo=build/ flatpak flatpak_arm64_manifest.yml --force-clean --allow-missing-runtimes
-      flatpak build-bundle build/ GridTracker-${VER}-arm64.flatpak org.gridtracker.GridTracker --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-      mv *.flatpak artifacts/
-      mv build/*.flatpak artifacts/
+      flatpak-builder flatpak flatpak_arm64_manifest.yml --force-clean --repo=flatpakrepo --allow-missing-runtimes
+      flatpak build-bundle flatpakrepo GridTracker-${VER}-arm64.flatpak org.gridtracker.GridTracker --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
       mv *.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
       echo "we made ARM packages!"