diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index a216cb7..2db20b1 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,6 +1,8 @@
 document: modulemd
 version: 2
 data:
+  name: flatpak-runtime
+  stream: el8
   summary: Flatpak Runtime
   description: This module defines a runtimes for Flatpaks. The 'sdk' profile defines
     the corresponding SDKs that applications can be built against with flatpak-builder.
@@ -50,6 +52,7 @@ data:
       - coreutils
       - coreutils-common
       - cracklib
+      - cracklib-dicts
       - crypto-policies
       - crypto-policies-scripts
       - cryptsetup-libs
@@ -83,6 +86,8 @@ data:
       - filesystem
       - findutils
       - flac-libs
+      - flatpak-spawn
+      - flatpak-xdg-utils
       - fontconfig
       - fontpackages-filesystem
       - freetype
@@ -227,6 +232,7 @@ data:
       - libksba
       - libmetalink
       - libmodman
+      - libnl3
       - libnotify
       - libnsl2
       - libogg
@@ -281,6 +287,7 @@ data:
       - device-mapper-libs
       - lz4-libs
       - ModemManager-glib
+      - mesa-dri-drivers
       - mesa-filesystem
       - mesa-libEGL
       - mesa-libGL
@@ -341,6 +348,8 @@ data:
       - platform-python
       - python3-libs
       - python36
+      - libibverbs
+      - rdma-core
       - readline
       - redhat-release
       - rest
@@ -389,6 +398,7 @@ data:
       - zenity
       - zip
       - zlib
+      - libzstd
     sdk:
       rpms:
       - flatpak-runtime-config
@@ -454,6 +464,7 @@ data:
       - cpio
       - cracklib
       - cracklib-devel
+      - cracklib-dicts
       - crypto-policies
       - crypto-policies-scripts
       - cryptsetup-libs
@@ -518,6 +529,8 @@ data:
       - fipscheck-lib
       - flac-devel
       - flac-libs
+      - flatpak-spawn
+      - flatpak-xdg-utils
       - flex
       - fontconfig
       - fontconfig-devel
@@ -773,6 +786,7 @@ data:
       - libmetalink
       - libmodman
       - libmpc
+      - libnl3
       - libnotify
       - libnsl2
       - libogg
@@ -786,6 +800,7 @@ data:
       - libproxy
       - libproxy-devel
       - libpsl
+      - libpsl-devel
       - libpwquality
       - librsvg2
       - librsvg2-devel
@@ -862,6 +877,7 @@ data:
       - llvm
       - llvm-devel
       - llvm-libs
+      - llvm-static
       - llvm-test
       - lua-libs
       - device-mapper
@@ -872,6 +888,7 @@ data:
       - make
       - man-db
       - mercurial
+      - mesa-dri-drivers
       - mesa-filesystem
       - mesa-libEGL
       - mesa-libEGL-devel
@@ -1111,6 +1128,7 @@ data:
       - popt
       - popt-devel
       - procps-ng
+      - publicsuffix-list
       - publicsuffix-list-dafsa
       - pulseaudio-libs
       - pulseaudio-libs-devel
@@ -1145,6 +1163,8 @@ data:
       - python36
       - python36-devel
       - qt5-srpm-macros
+      - libibverbs
+      - rdma-core
       - readline
       - readline-devel
       - redhat-release
@@ -1247,6 +1267,7 @@ data:
       - zlib
       - zlib-devel
       - libzstd
+      - libzstd-devel
     buildroot:
       rpms:
       - flatpak-rpm-macros
@@ -1255,10 +1276,6 @@ data:
       rpms:
       - flatpak-rpm-macros
       - flatpak-runtime-config
-    # this is just here to make module enablement work for CI tests
-    default:
-      rpms:
-      - flatpak-runtime-config
   api:
     rpms:
     - flatpak-rpm-macros
@@ -1267,10 +1284,10 @@ data:
     rpms:
       flatpak-rpm-macros:
         rationale: Set up build root for flatpak RPMS
-        ref: stream-el8
+        ref: stream-el8-rhel-8.4.0
       flatpak-runtime-config:
         rationale: Runtime configuration files
-        ref: stream-el8
+        ref: stream-el8-rhel-8.4.0
   xmd:
     flatpak:
       branch: el8