diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 2db20b1..672d6f5 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -119,6 +119,7 @@ data:
       - glibc
       - glibc-all-langpacks
       - glibc-common
+      - glibc-gconv-extra
       - glibc-minimal-langpack
       - libnsl
       - nscd
@@ -430,6 +431,7 @@ data:
       - libbabeltrace
       - basesystem
       - bash
+      - bash-devel
       - bc
       - binutils
       - binutils-devel
@@ -452,6 +454,7 @@ data:
       - clang-analyzer
       - clang-devel
       - clang-libs
+      - clang-resource-filesystem
       - clang-tools-extra
       - git-clang-format
       - cmake
@@ -501,6 +504,7 @@ data:
       - libcom_err
       - libcom_err-devel
       - libss
+      - libss-devel
       - ed
       - efi-srpm-macros
       - elfutils
@@ -542,6 +546,7 @@ data:
       - gawk
       - gc
       - libgcab1
+      - libgcab1-devel
       - cpp
       - gcc
       - gcc-c++
@@ -589,6 +594,7 @@ data:
       - glibc-all-langpacks
       - glibc-common
       - glibc-devel
+      - glibc-gconv-extra
       - glibc-headers
       - glibc-minimal-langpack
       - libnsl
@@ -666,6 +672,7 @@ data:
       - jasper-libs
       - jbigkit-libs
       - jq
+      - jq-devel
       - json-c
       - json-glib
       - json-glib-devel
@@ -899,7 +906,6 @@ data:
       - mesa-libgbm
       - mesa-libgbm-devel
       - mesa-libglapi
-      - mesa-vulkan-devel
       - mesa-vulkan-drivers
       - meson
       - mlocate
@@ -1284,10 +1290,10 @@ data:
     rpms:
       flatpak-rpm-macros:
         rationale: Set up build root for flatpak RPMS
-        ref: stream-el8-rhel-8.4.0
+        ref: stream-el8-rhel-8.6.0
       flatpak-runtime-config:
         rationale: Runtime configuration files
-        ref: stream-el8-rhel-8.4.0
+        ref: stream-el8-rhel-8.6.0
   xmd:
     flatpak:
       branch: el8