diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index e4af796..897ade9 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -70,8 +70,7 @@ data:
         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.3.0
         buildorder: 1
       nbdkit:
         rationale: Primary module content
diff --git a/virt.yaml b/virt.yaml
deleted file mode 100644
index 2d3f51b..0000000
--- a/virt.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: virt
-  stream: rhel
-  summary: Virtualization module
-  description: >-
-    A virtualization module
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform: [el8.3.0]
-    requires:
-      platform: [el8]
-  profiles:
-    common:
-      rpms:
-      - libguestfs
-      - libvirt-client
-      - libvirt-daemon-config-network
-      - libvirt-daemon-kvm
-  filter:
-    rpms:
-    - ocaml-hivex
-    - ocaml-hivex-debuginfo
-    - ocaml-hivex-devel
-    - ocaml-libguestfs
-    - ocaml-libguestfs-debuginfo
-    - ocaml-libguestfs-devel
-    - ocaml-libnbd
-    - ocaml-libnbd-debuginfo
-    - ocaml-libnbd-devel
-    - qemu-kvm-tests
-    - qemu-kvm-tests-debuginfo
-  components:
-    rpms:
-      SLOF:
-        rationale: qemu-kvm dep
-        ref: 847f6e1c0e8d8dc0886bd3726ebe8bd825cafe98
-        buildorder: 1
-        arches: [ppc64le]
-      hivex:
-        rationale: libguestfs dep
-        ref: f2549c3fd9b592db59aada9a9b25f016fb1c997b
-        buildorder: 1
-      libguestfs:
-        rationale: Primary module content
-        ref: 46b2f6386e3f5880386d706f326a3282a33aad7d
-        buildorder: 4
-      libguestfs-winsupport:
-        rationale: Primary module content
-        ref: 44672074eda2e0c3328d681be4032d9ed2ea4ef6
-        buildorder: 5
-      libiscsi:
-        rationale: qemu-kvm dep
-        ref: 19ec42c97e6d0fa378a052ac35389580b039f3f5
-        buildorder: 1
-      libnbd:
-        rationale: Primary module content
-        ref: 90b936abf506e48201c780fee56cea4bb0cf2c67
-        buildorder: 1
-      libvirt:
-        rationale: Primary module content
-        ref: d76c62b84442afbe8baaae93c98eee922028ccda
-        buildorder: 3
-      libvirt-dbus:
-        rationale: libvirt-dbus is part of the virtualization module
-        ref: afe8b10024196301cf9e666fa25bb7cf2656ec15
-        buildorder: 4
-      libvirt-python:
-        rationale: Primary module content
-        ref: c0fa7d360f160f505f62c51aac7154d532da5e3c
-        buildorder: 4
-      nbdkit:
-        rationale: Primary module content
-        ref: efa7a14bf431fa1583f43ccb269dd92c4ab21e25
-        buildorder: 5
-      netcf:
-        rationale: libvirt dep
-        ref: 9f21f6b6da681a27ba82e96447b6a5b11f5065e4
-        buildorder: 1
-      perl-Sys-Virt:
-        rationale: Primary module content
-        ref: 8cde70d73b92286e49d1cc2662b8dcb5679db5ff
-        buildorder: 4
-      qemu-kvm:
-        rationale: Primary module content
-        ref: 22c213d007f569c2ebabcc7c9bfc505b7c198da7
-        buildorder: 2
-      seabios:
-        rationale: qemu-kvm dep
-        ref: 8073c50cd96ee50ed3f39f0dd9062330c746df6d
-        buildorder: 1
-        arches: [ppc64le, x86_64]
-      sgabios:
-        rationale: qemu-kvm dep
-        ref: d5261ee5020e58875524c349123f98b4bbd9325f
-        buildorder: 1
-        arches: [ppc64le, x86_64]
-      supermin:
-        rationale: libguestfs dep
-        ref: 4140b7a3689b3dac09c4136198a073f8131c1e89
-        buildorder: 2
-...
-