diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index e4af796..a6a1136 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -37,69 +37,68 @@ data:
     rpms:
       SLOF:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
         arches: [ppc64le]
       hivex:
         rationale: libguestfs dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
       libguestfs:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 4
       libguestfs-winsupport:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 5
       libiscsi:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
       libvirt:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 3
       libvirt-dbus:
         rationale: libvirt-dbus is part of the virtualization module
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 4
       libvirt-python:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 4
       libnbd:
         rationale: Primary module content
-        # XXX Temporary until it gets the RHEL-8 branch
-        ref: stream-8.2-LP-rhel-8.2.1-advanced-virt
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
       nbdkit:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 5
       netcf:
         rationale: libvirt dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
       perl-Sys-Virt:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 4
       qemu-kvm:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 2
       seabios:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
         arches: [ppc64le, x86_64]
       sgabios:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 1
         arches: [ppc64le, x86_64]
       supermin:
         rationale: libguestfs dep
-        ref: stream-rhel-rhel-8.3.0
+        ref: stream-rhel-rhel-8.4.0
         buildorder: 2