diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 5f3c1af..7cae70a 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -106,7 +106,7 @@ data:
     rpms:
       apache-commons-logging:
         rationale: Runtime dependency
-        ref: stream-flatpak-rhel-8.5.0
+        ref: stream-flatpak-rhel-8.6.0
       bitmap-fonts:
         rationale: Runtime dependency
         ref: rhel-8.4.0
@@ -422,7 +422,7 @@ data:
         ref: rhel-8.4.0
       java-1.8.0-openjdk:
         rationale: Runtime dependency
-        ref: rhel-8.5.0
+        ref: 1e03f848e7112a534ffa54dfffd764cc8ad50516
       javapackages-tools:
         rationale: Runtime dependency
         ref: rhel-8.0.0
@@ -508,7 +508,7 @@ data:
         ref: rhel-8.4.0
       libreoffice:
         rationale: Application package
-        ref: rhel-8.4.0
+        ref: rhel-8.6.0
         buildorder: 10
       libreoffice-voikko:
         rationale: Runtime dependency
@@ -656,7 +656,7 @@ data:
         ref: rhel-8.4.0
       poppler:
         rationale: Runtime dependency
-        ref: rhel-8.5.0
+        ref: rhel-8.6.0
       poppler-data:
         rationale: Runtime dependency
         ref: rhel-8.4.0
@@ -686,8 +686,6 @@ data:
         ref: rhel-8.4.0
       tzdata:
         rationale: Runtime dependency
-        # 8.5.0 zero-day https://errata.devel.redhat.com/advisory/83233
-        # was built from the rhel-8.6.0 branch for some reason
         ref: rhel-8.6.0
       v4l-utils:
         rationale: Runtime dependency