diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 6315d0f..d7d0a50 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -510,6 +510,7 @@ data:
       - ed
       - efi-srpm-macros
       - elfutils
+      - elfutils-debuginfod-client
       - elfutils-default-yama-scope
       - elfutils-devel
       - elfutils-libelf
@@ -554,6 +555,7 @@ data:
       - gcc
       - gcc-c++
       - gcc-gfortran
+      - gcc-plugin-annobin
       - libasan
       - libatomic
       - libgcc
@@ -567,11 +569,12 @@ data:
       - libstdc++-devel
       - libtsan
       - libubsan
-      - gcc-toolset-11-runtime
-      - gcc-toolset-11-binutils
-      - gcc-toolset-11-gcc
-      - gcc-toolset-11-gcc-c++
-      - gcc-toolset-11-libstdc++-devel
+      - gcc-toolset-12-runtime
+      - gcc-toolset-12-binutils
+      - gcc-toolset-12-binutils-gold
+      - gcc-toolset-12-gcc
+      - gcc-toolset-12-gcc-c++
+      - gcc-toolset-12-libstdc++-devel
       - gdb
       - gdb-gdbserver
       - gdb-headless
@@ -1306,10 +1309,10 @@ data:
     rpms:
       flatpak-rpm-macros:
         rationale: Set up build root for flatpak RPMS
-        ref: stream-el8-rhel-8.6.0
+        ref: stream-el8-rhel-8.7.0
       flatpak-runtime-config:
         rationale: Runtime configuration files
-        ref: stream-el8-rhel-8.6.0
+        ref: stream-el8-rhel-8.7.0
   xmd:
     flatpak:
       branch: el8