diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4282d5b..53f6785 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,9 +149,7 @@ linux:package:
       echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf
       echo 'allow-loopback-pinentry' >> ~/.gnupg/gpg-agent.conf
       apt-get install flatpak flatpak-builder -y
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-      flatpak install org.freedesktop.Sdk//22.08 -y
-      flatpak install org.freedesktop.Platform//22.08 -y
+      flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
   script:
     - |
@@ -179,7 +177,7 @@ 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 flatpak flatpak_x64_manifest.yml --force-clean --repo=flatpakrepo
+      flatpak-builder flatpak flatpak_x64_manifest.yml --force-clean --repo=fedoraproject --allow-missing-runtimes
       flatpak build-bundle flatpakrepo GridTracker-${VER}-x86_64.flatpak org.gridtracker.GridTracker
       mv *.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
@@ -260,9 +258,7 @@ arm:package:
       echo 'allow-loopback-pinentry' >> ~/.gnupg/gpg-agent.conf
       apt-get build-dep .
       apt-get install flatpak flatpak-builder -y
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-      flatpak install org.freedesktop.Sdk//22.08 -y
-      flatpak install org.freedesktop.Platform//22.08 -y
+      flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
   script:
     - |
@@ -306,7 +302,7 @@ 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 flatpak flatpak_arm64_manifest.yml --force-clean --repo=flatpakrepo
+      flatpak-builder flatpak flatpak_arm64_manifest.yml --force-clean --repo=fedoraproject --allow-missing-runtimes
       echo "Exporting single-file flatpak..."
       flatpak build-bundle flatpakrepo GridTracker-${VER}-arm64.flatpak org.gridtracker.GridTracker
       mv *.flatpak artifacts/
diff --git a/flatpak_arm64_manifest.yml b/flatpak_arm64_manifest.yml
index 33f6843..c966119 100644
--- a/flatpak_arm64_manifest.yml
+++ b/flatpak_arm64_manifest.yml
@@ -1,7 +1,7 @@
 ---
 app-id: org.gridtracker.GridTracker
-runtime: Platform
-sdk: Sdk
+runtime: org.fedoraproject.Platform
+sdk: org.fedoraproject.Sdk
 rename-desktop-file: gridtracker.desktop
 rename-icon: gridview
 copy-icon: true
diff --git a/flatpak_x64_manifest.yml b/flatpak_x64_manifest.yml
index 33f6843..c966119 100644
--- a/flatpak_x64_manifest.yml
+++ b/flatpak_x64_manifest.yml
@@ -1,7 +1,7 @@
 ---
 app-id: org.gridtracker.GridTracker
-runtime: Platform
-sdk: Sdk
+runtime: org.fedoraproject.Platform
+sdk: org.fedoraproject.Sdk
 rename-desktop-file: gridtracker.desktop
 rename-icon: gridview
 copy-icon: true