diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b17cbb0405f38ae06eeda12257478c415272b09b..70faa8a96ed086b64fdc00c2b6751bc0a3a03a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,9 @@ flatpak:
 
   script:
   - dnf install -y flatpak-builder
-  - flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
-  - flatpak install -y gnome-nightly org.gnome.Platform
-  - flatpak install -y gnome-nightly org.gnome.Sdk
+  - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  - flatpak install -y flathub org.gnome.Platform 40
+  - flatpak install -y flathub org.gnome.Sdk 40
   - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
   - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
   - flatpak build app ninja -C _build install
diff --git a/build-aux/uk.me.bcowan.Rugby.yml b/build-aux/uk.me.bcowan.Rugby.yml
index a24edb3e74808c0038aee095dc9cadc6155dcaf6..0e429c087e3d68ecca58c33d0fe64af0f29197cd 100644
--- a/build-aux/uk.me.bcowan.Rugby.yml
+++ b/build-aux/uk.me.bcowan.Rugby.yml
@@ -4,7 +4,7 @@
 
 app-id: uk.me.bcowan.Rugby
 runtime: org.gnome.Platform
-runtime-version: "master"
+runtime-version: "40"
 sdk: org.gnome.Sdk
 command: rugby