diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
index 20b28a4..cd8f770 100644
--- a/.github/workflows/cr.yml
+++ b/.github/workflows/cr.yml
@@ -34,15 +34,31 @@ jobs:
           # add a few packages to support additional languages and so on.
           - name: freedesktop
             tag: 22.08
-            packages: org.freedesktop.Platform/x86_64/22.08 org.freedesktop.Sdk/x86_64/22.08 org.freedesktop.Platform/aarch64/22.08 org.freedesktop.Sdk/aarch64/22.08
+            flathub: >
+              org.freedesktop.Platform/x86_64/22.08
+              org.freedesktop.Sdk/x86_64/22.08
+              org.freedesktop.Platform/aarch64/22.08
+              org.freedesktop.Sdk/aarch64/22.08
 
           - name: freedesktop
             tag: 23.08
-            packages: org.freedesktop.Platform/x86_64/23.08 org.freedesktop.Sdk/x86_64/23.08 org.freedesktop.Platform/aarch64/23.08 org.freedesktop.Sdk/aarch64/23.08
+            flathub: >
+              org.freedesktop.Platform/x86_64/23.08
+              org.freedesktop.Sdk/x86_64/23.08
+              org.freedesktop.Platform/aarch64/23.08
+              org.freedesktop.Sdk/aarch64/23.08
 
           - name: rust
             tag: 23.08
-            packages: org.freedesktop.Platform/x86_64/23.08 org.freedesktop.Sdk/x86_64/23.08 org.freedesktop.Platform/aarch64/23.08 org.freedesktop.Sdk/aarch64/23.08 org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08 org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08 org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08 org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08
+            flathub: >
+              org.freedesktop.Platform/x86_64/23.08
+              org.freedesktop.Sdk/x86_64/23.08
+              org.freedesktop.Platform/aarch64/23.08
+              org.freedesktop.Sdk/aarch64/23.08
+              org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08
+              org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08
 
           # elementaryOS
           #
@@ -50,7 +66,10 @@ jobs:
           # doesn't use these, but feel free to open a PR if out-of-date.
           - name: elementary
             tag: juno-22.08
-            packages: io.elementary.BaseApp//juno-22.08 org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
+            flathub: >
+              io.elementary.BaseApp//juno-22.08
+              org.freedesktop.Platform//22.08
+              org.freedesktop.Sdk//22.08
 
           # GNOME
           #
@@ -58,23 +77,70 @@ jobs:
           # things for e.g. Rust bindings.
           - name: gnome
             tag: 45
-            packages: org.gnome.Platform/x86_64/45 org.gnome.Sdk/x86_64/45 org.gnome.Platform/aarch64/45 org.gnome.Sdk/aarch64/45
+            flathub: >
+              org.gnome.Platform/x86_64/45
+              org.gnome.Sdk/x86_64/45
+              org.gnome.Platform/aarch64/45
+              org.gnome.Sdk/aarch64/45
 
           - name: gnome
             tag: 46
-            packages: org.gnome.Platform/x86_64/46 org.gnome.Sdk/x86_64/46 org.gnome.Platform/aarch64/46 org.gnome.Sdk/aarch64/46
+            flathub: >
+              org.gnome.Platform/x86_64/46
+              org.gnome.Sdk/x86_64/46
+              org.gnome.Platform/aarch64/46
+              org.gnome.Sdk/aarch64/46
 
           - name: gnome
             tag: master
-            packages: org.gnome.Platform/x86_64/master org.gnome.Sdk/x86_64/master org.gnome.Platform/aarch64/master org.gnome.Sdk/aarch64/master
+            gnome_nightly: >
+              org.gnome.Platform/x86_64/master
+              org.gnome.Sdk/x86_64/master
+              org.gnome.Platform/aarch64/master
+              org.gnome.Sdk/aarch64/master
 
           - name: gnome-rust
             tag: 45
-            packages: org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08 org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08 org.gnome.Platform/x86_64/45 org.gnome.Sdk/x86_64/45 org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08 org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08 org.gnome.Platform/aarch64/45 org.gnome.Sdk/aarch64/45
+            flathub: >
+              org.gnome.Platform/x86_64/45
+              org.gnome.Sdk/x86_64/45
+              org.gnome.Platform/aarch64/45
+              org.gnome.Sdk/aarch64/45
+              org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08
+              org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08
 
           - name: gnome-rust
             tag: 46
-            packages: org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08 org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08 org.gnome.Platform/x86_64/46 org.gnome.Sdk/x86_64/46 org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08 org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08 org.gnome.Platform/aarch64/46 org.gnome.Sdk/aarch64/46
+            flathub: >
+              org.gnome.Platform/x86_64/46
+              org.gnome.Sdk/x86_64/46
+              org.gnome.Platform/aarch64/46
+              org.gnome.Sdk/aarch64/46
+              org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08
+              org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08
+
+          - name: gnome-typescript
+            tag: 46
+            flathub: >
+              org.gnome.Platform/x86_64/46
+              org.gnome.Sdk/x86_64/46
+              org.gnome.Platform/aarch64/46
+              org.gnome.Sdk/aarch64/46
+              org.freedesktop.Sdk.Extension.node18/x86_64/23.08
+              org.freedesktop.Sdk.Extension.typescript/x86_64/23.08
+
+          - name: gnome-vala
+            tag: 46
+            flathub: >
+              org.gnome.Platform/x86_64/46
+              org.gnome.Sdk/x86_64/46
+              org.gnome.Platform/aarch64/46
+              org.gnome.Sdk/aarch64/46
+              org.freedesktop.Sdk.Extension.vala/x86_64/23.08
 
           # Workbench
           #
@@ -82,7 +148,19 @@ jobs:
           # language extensions.
           - name: workbench
             tag: master
-            packages: org.freedesktop.Sdk.Extension.llvm16/x86_64/23.08 org.freedesktop.Sdk.Extension.node18/x86_64/23.08 org.freedesktop.Sdk.Extension.typescript/x86_64/23.08 org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08 org.freedesktop.Sdk.Extension.vala/x86_64/23.08 org.gnome.Platform/x86_64/master org.gnome.Sdk/x86_64/master org.freedesktop.Sdk.Extension.llvm16/aarch64/23.08 org.freedesktop.Sdk.Extension.node18/aarch64/23.08 org.freedesktop.Sdk.Extension.typescript/aarch64/23.08 org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08 org.freedesktop.Sdk.Extension.vala/aarch64/23.08 org.gnome.Platform/aarch64/master org.gnome.Sdk/aarch64/master
+            flathub: >
+              org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08
+              org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
+              org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08
+              org.freedesktop.Sdk.Extension.node18/x86_64/23.08
+              org.freedesktop.Sdk.Extension.typescript/x86_64/23.08
+              org.freedesktop.Sdk.Extension.vala/x86_64/23.08
+            gnome_nightly: >
+              org.gnome.Platform/x86_64/master
+              org.gnome.Sdk/x86_64/master
+              org.gnome.Platform/aarch64/master
+              org.gnome.Sdk/aarch64/master
 
           # KDE
           #
@@ -90,7 +168,11 @@ jobs:
           # these, but feel free to open a PR if out-of-date.
           - name: kde
             tag: 5.15-23.08
-            packages: org.kde.Platform/x86_64/5.15-23.08 org.kde.Sdk/x86_64/5.15-23.08 org.kde.Platform/aarch64/5.15-23.08 org.kde.Sdk/aarch64/5.15-23.08
+            flathub: >
+              org.kde.Platform/x86_64/5.15-23.08
+              org.kde.Sdk/x86_64/5.15-23.08
+              org.kde.Platform/aarch64/5.15-23.08
+              org.kde.Sdk/aarch64/5.15-23.08
       fail-fast: false
 
     steps:
@@ -133,10 +215,31 @@ jobs:
           cat >> ${{ matrix.runtime.name }}.Dockerfile << EOF
           # syntax = docker/dockerfile:experimental
           FROM localhost:5000/flatter-base:latest
+          EOF
+
+          if [ -n "${{ matrix.runtime.gnome_nightly }}" ]; then
+          cat >> ${{ matrix.runtime.name }}.Dockerfile << EOF
+          RUN --security=insecure flatpak install -y --noninteractive \
+                                          gnome-nightly \
+                                          ${{ matrix.runtime.gnome_nightly }}
+          EOF
+          fi
+
+          if [ -n "${{ matrix.runtime.flathub_beta }}" ]; then
+          cat >> ${{ matrix.runtime.name }}.Dockerfile << EOF
+          RUN --security=insecure flatpak install -y --noninteractive \
+                                          flathub-beta \
+                                          ${{ matrix.runtime.flathub_beta }}
+          EOF
+          fi
 
+          if [ -n "${{ matrix.runtime.flathub }}" ]; then
+          cat >> ${{ matrix.runtime.name }}.Dockerfile << EOF
           RUN --security=insecure flatpak install -y --noninteractive \
-                                                  ${{ matrix.runtime.packages }}
+                                          flathub \
+                                          ${{ matrix.runtime.flathub }}
           EOF
+          fi
 
       - name: Build
         uses: docker/build-push-action@v6