diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index dc8807c..5ff9d58 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -104,9 +104,6 @@ data:
       Box2D:
         rationale: Runtime dependency
         ref: rhel-9-main
-      bitmap-fonts:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       boost:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -128,13 +125,6 @@ data:
       google-noto-fonts:
         rationale: Runtime dependency
         ref: rhel-9-main
-      gstreamer1-plugins-base:
-        rationale: Build-time dependency of gstreamer1-plugins-good
-        ref: rhel-9-main
-      gstreamer1-plugins-good:
-        rationale: Runtime dependency
-        ref: rhel-9-main
-        buildorder: 2
       ht-caladea-fonts:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -422,7 +412,7 @@ data:
         ref: rhel-9-main
       java-11-openjdk:
         rationale: Runtime dependency
-        ref: private-sbergman-rhel-9.1.0
+        ref: private-sbergman-rhel-9-main
       javapackages-tools:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -451,9 +441,6 @@ data:
       libexttextcat:
         rationale: Runtime dependency
         ref: rhel-9-main
-      libfontenc:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       libfonts:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -513,9 +500,6 @@ data:
       libserializer:
         rationale: Runtime dependency
         ref: rhel-9-main
-      libshout:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       libstaroffice:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -627,9 +611,6 @@ data:
       openoffice.org-dict-cs_CZ:
         rationale: Runtime dependency
         ref: rhel-9-main
-      pakchois:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       pentaho-libxml:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -638,7 +619,7 @@ data:
         ref: rhel-9-main
       poppler:
         rationale: Runtime dependency
-        ref: rhel-9.1.0
+        ref: rhel-9-main
       poppler-data:
         rationale: Runtime dependency
         ref: rhel-9-main
@@ -657,42 +638,27 @@ data:
       sac:
         rationale: Runtime dependency
         ref: rhel-9-main
-      taglib:
-        rationale: Runtime dependency
-        ref: rhel-9-main
-      ttmkfdir:
-        rationale: Runtime dependency
-        ref: rhel-9-main
-      twolame:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       tzdata:
         rationale: Runtime dependency
         ref: rhel-9-main
-      v4l-utils:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       voikko-fi:
         rationale: Runtime dependency
         ref: rhel-9-main
       xmlsec1:
         rationale: Runtime dependency
         ref: rhel-9-main
-      xorg-x11-font-utils:
-        rationale: Runtime dependency
-        ref: rhel-9-main
-      xorg-x11-fonts:
-        rationale: Runtime dependency
-        ref: rhel-9-main
-      yajl:
-        rationale: Runtime dependency
-        ref: rhel-9-main
       zaf:
         rationale: Runtime dependency
         ref: rhel-9-main
 filters:
   rpm:
-    - gstreamer1-plugins-base
     - hyphen
+    - javapackages-generators
+    - javapackages-local
+    - maven-local
+    - maven-local-openjdk11
+    - maven-local-openjdk17
+    - maven-local-openjdk8
+    - python3-javapackages
     - tzdata
 ...