diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 78e834c..9afe1be 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -37,68 +37,81 @@ data:
     rpms:
       SLOF:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
         arches: [ppc64le]
       hivex:
         rationale: libguestfs dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
       libguestfs:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 4
       libguestfs-winsupport:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 5
       libiscsi:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
       libvirt:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 3
       libvirt-dbus:
         rationale: libvirt-dbus is part of the virtualization module
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 4
       libvirt-python:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 4
       libnbd:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
       nbdkit:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 5
       netcf:
         rationale: libvirt dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
       perl-Sys-Virt:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 4
       qemu-kvm:
         rationale: Primary module content
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 2
       seabios:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
         arches: [ppc64le, x86_64]
       sgabios:
         rationale: qemu-kvm dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 1
         arches: [ppc64le, x86_64]
       supermin:
         rationale: libguestfs dep
-        ref: stream-rhel-rhel-8.5.0
+        ref: stream-rhel-rhel-8.6.0
         buildorder: 2
+      libtpms:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.6.0
+        buildorder: 1
+      swtpm:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.6.0
+        buildorder: 2
+      virt-v2v:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.6.0
+        buildorder: 6
+
diff --git a/virt.yaml b/virt.yaml
deleted file mode 100644
index 97c1d85..0000000
--- a/virt.yaml
+++ /dev/null
@@ -1,109 +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.5.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
-  buildopts:
-    rpms:
-      macros: |
-        %_smp_ncpus_max 16
-  components:
-    rpms:
-      SLOF:
-        rationale: qemu-kvm dep
-        ref: 847f6e1c0e8d8dc0886bd3726ebe8bd825cafe98
-        buildorder: 1
-        arches: [ppc64le]
-      hivex:
-        rationale: libguestfs dep
-        ref: 7483d843b1220e49cf456a77a05569d2475c2a1f
-        buildorder: 1
-      libguestfs:
-        rationale: Primary module content
-        ref: 12670ec3f4b7d1ac38ff05211f76b203f3a106e7
-        buildorder: 4
-      libguestfs-winsupport:
-        rationale: Primary module content
-        ref: 44672074eda2e0c3328d681be4032d9ed2ea4ef6
-        buildorder: 5
-      libiscsi:
-        rationale: qemu-kvm dep
-        ref: d01aaaa741472ce4e30cabe97a0aa710ca0ea6ed
-        buildorder: 1
-      libvirt:
-        rationale: Primary module content
-        ref: b35f2bed957f177a3a204a002491de18cae2f7f1
-        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
-      libnbd:
-        rationale: Primary module content
-        ref: 1084a39e85cac9b4eb432531942316c77be8975b
-        buildorder: 1
-      nbdkit:
-        rationale: Primary module content
-        ref: 60545cd41a1b832c6f8cb3e7aa6acb17ff698603
-        buildorder: 5
-      netcf:
-        rationale: libvirt dep
-        ref: 6872ba63231ae8f0293258bdc51a26d991a1ba94
-        buildorder: 1
-      perl-Sys-Virt:
-        rationale: Primary module content
-        ref: 8cde70d73b92286e49d1cc2662b8dcb5679db5ff
-        buildorder: 4
-      qemu-kvm:
-        rationale: Primary module content
-        ref: f7c9e97e37cc55efb122a87b4bb67c94c4964950
-        buildorder: 2
-      seabios:
-        rationale: qemu-kvm dep
-        ref: d8cdc362874b9e1f12fe4ef68d254224448c9b41
-        buildorder: 1
-        arches: [ppc64le, x86_64]
-      sgabios:
-        rationale: qemu-kvm dep
-        ref: 62568a54f56c6a78e4ccf9c408976c5abc68209e
-        buildorder: 1
-        arches: [ppc64le, x86_64]
-      supermin:
-        rationale: libguestfs dep
-        ref: 4140b7a3689b3dac09c4136198a073f8131c1e89
-        buildorder: 2