diff --git a/Makefile b/Makefile
index fb0ad1f4e..b7af45b6d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@ SHELL:=/bin/bash -O globstar
 
 setup:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
 	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
+# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
+	flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
+	flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
 	npm install
 	make build
 
diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json
index a0ac40428..2e859ab01 100644
--- a/build-aux/re.sonny.Workbench.Devel.json
+++ b/build-aux/re.sonny.Workbench.Devel.json
@@ -1,7 +1,7 @@
 {
   "id": "re.sonny.Workbench.Devel",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "46",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
diff --git a/demos b/demos
index 71fcb64a3..fba0a8919 160000
--- a/demos
+++ b/demos
@@ -1 +1 @@
-Subproject commit 71fcb64a3ab88ba85a93df904b112325a73052f7
+Subproject commit fba0a8919281a9ac8016a7e668d50e14b10e300f