diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index f969c4a1dbb5d5a8125ffb482b610e2961ee59d6..e759b76261bfdea5bb552dcf0b8b05b34463b368 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -102,3 +102,15 @@ data:
         rationale: libguestfs dep
         ref: oc8-stream-rhel8
         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
index 8625850b57a3dcfa05b8a0e40dcae2d9cbcdf2f9..77ff670437eaa9872dbb2bf5ce6ab50de0eb48b9 100644
--- a/virt.yaml
+++ b/virt.yaml
@@ -2,37 +2,38 @@
 document: modulemd
 version: 2
 data:
-  stream: rhel
+  name: virt
+  stream: rhel8
   summary: Virtualization module
   description: A virtualization module
   license:
     module:
-      - MIT
+    - MIT
   dependencies:
-    - buildrequires:
-        platform: [oc8]
-      requires:
-        platform: [oc8]
+  - buildrequires:
+      platform: [oc8]
+    requires:
+      platform: [oc8]
   profiles:
     common:
       rpms:
-        - libguestfs
-        - libvirt-client
-        - libvirt-daemon-config-network
-        - libvirt-daemon-kvm
+      - 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
+    - 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:
@@ -46,11 +47,11 @@ data:
         buildorder: 1
       libguestfs:
         rationale: Primary module content
-        ref: 8d383fa2b554ea622acaee494e7dd93826e6fb81
+        ref: 6238718b1b9a274d198793577b888e010d1b8558
         buildorder: 4
       libguestfs-winsupport:
         rationale: Primary module content
-        ref: 6e035090ea995f32a3dd3cb25f37f4ee22d31a02
+        ref: 16d6f7e27f9dee41c3fb3e39cbb3d2af14d7bf13
         buildorder: 5
       libiscsi:
         rationale: qemu-kvm dep
@@ -58,7 +59,7 @@ data:
         buildorder: 1
       libvirt:
         rationale: Primary module content
-        ref: cb680adc5bb2dc4ed5cb1f445c4080528d0e927f
+        ref: 734f29d2cea8c06dfec76ad4520d68a5cb9b126a
         buildorder: 3
       libvirt-dbus:
         rationale: libvirt-dbus is part of the virtualization module
@@ -66,15 +67,15 @@ data:
         buildorder: 4
       libvirt-python:
         rationale: Primary module content
-        ref: 8a4395d8cbd986755ffb41c8c5061e92096d6ed9
+        ref: cc141305e394e756b3cbcfefadbf71281c82974f
         buildorder: 4
       libnbd:
         rationale: Primary module content
-        ref: 26f57480bca21abd93ecf35f9eb0e52b9468d52b
+        ref: acebf7e2d704b9296df7165e7071b94505bfb0d5
         buildorder: 1
       nbdkit:
         rationale: Primary module content
-        ref: 5af4be62c79c54f9d4a67e0e5ae7d87fe6e7749b
+        ref: 159ffa5fd9227adf1097612f813cfb69410ad4d0
         buildorder: 5
       netcf:
         rationale: libvirt dep
@@ -82,15 +83,15 @@ data:
         buildorder: 1
       perl-Sys-Virt:
         rationale: Primary module content
-        ref: c9f0078cca494f3316e40520d038414e7de032c0
+        ref: 690fae148075170dd9f700e67c1e8146baae1cf5
         buildorder: 4
       qemu-kvm:
         rationale: Primary module content
-        ref: 5964c8a7eebca7f54849170159af0a2d748593a8
+        ref: 0c2ca550ba49a6d1bfc06ca94b2d5ec13b36d5c8
         buildorder: 2
       seabios:
         rationale: qemu-kvm dep
-        ref: 1c8f0d660212dcb1b6148cf147a8c3ee3913b863
+        ref: 097bec6ebab8a990bc374946d2f551883a703d1e
         buildorder: 1
         arches: [ppc64le, x86_64]
       sgabios:
@@ -100,5 +101,18 @@ data:
         arches: [ppc64le, x86_64]
       supermin:
         rationale: libguestfs dep
-        ref: fb2f9cd674b2758366c86b60c2b3330a7c7a4fda
+        ref: 317613bca1a774be3090673565255ea54e861eb9
         buildorder: 2
+      libtpms:
+        rationale: Primary module content
+        ref: 15688bc1503c204c17bf7c0b9a2db8c83cd6329a
+        buildorder: 1
+      swtpm:
+        rationale: Primary module content
+        ref: cadf68e83b941c32abe36951519553b7ed49027e
+        buildorder: 2
+      virt-v2v:
+        rationale: Primary module content
+        ref: 641eb743c206eb15dcfea55284d8c7ae6a6280d2
+        buildorder: 6
+...