diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 8ee688b..7957803 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -10,7 +10,7 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-            platform: [el8.0.0]
+            platform: [el8]
           requires:
             platform: [el8]
     profiles:
@@ -28,9 +28,8 @@ data:
             - ocaml-libguestfs
             - ocaml-libguestfs-debuginfo
             - ocaml-libguestfs-devel
-            - libssh2-devel
-            - libssh2-docs
             - qemu-kvm-tests
+            - qemu-kvm-tests-debuginfo
 
     # SRPMs that are rebuilt and distributed as part of this module
     components:
@@ -38,80 +37,76 @@ data:
         # qemu and qemu specific deps
         qemu-kvm:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 2
         libiscsi:
             rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 1
         seabios:
             rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             arches: [x86_64, ppc64le]
             buildorder: 1
         sgabios:
             rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             arches: [x86_64, ppc64le]
             buildorder: 1
         SLOF:
             rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             arches: [ppc64le]
             buildorder: 1
-        libssh2:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.0.0
-            buildorder: 1
 
 
         # libvirt and libvirt specific deps
         libvirt:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 3
         libvirt-python:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build after libvirt
             buildorder: 4
         libvirt-dbus:
             rationale: libvirt-dbus is part of the virtualization module
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build after libvirt
             buildorder: 4
         perl-Sys-Virt:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build after libvirt
             buildorder: 4
         netcf:
             rationale: libvirt dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 1
 
 
         # libguestfs, virt-v2v and dependencies
         hivex:
             rationale: libguestfs dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build before libguestfs.
             buildorder: 1
         supermin:
             rationale: libguestfs dep
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build before libguestfs.
             buildorder: 2
         libguestfs:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 4
         libguestfs-winsupport:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             buildorder: 5
         nbdkit:
             rationale: Primary module content
-            ref: stream-rhel-rhel-8.0.0
+            ref: stream-rhel-rhel-8.1.0
             # Build after libguestfs.
             buildorder: 5
diff --git a/virt.yaml b/virt.yaml
deleted file mode 100644
index 3abe667..0000000
--- a/virt.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-document: modulemd
-version: 2
-data:
-    summary: Virtualization module
-    stream: rhel
-    description: >-
-        A virtualization module
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-            platform: [el8.0.0]
-          requires:
-            platform: [el8]
-    profiles:
-      common:
-        rpms:
-          - libvirt-daemon-kvm
-          - libguestfs
-          - libvirt-client
-          - libvirt-daemon-config-network
-    filter:
-        rpms:
-            - ocaml-hivex
-            - ocaml-hivex-debuginfo
-            - ocaml-hivex-devel
-            - ocaml-libguestfs
-            - ocaml-libguestfs-debuginfo
-            - ocaml-libguestfs-devel
-            - libssh2-devel
-            - libssh2-docs
-            - qemu-kvm-tests
-
-    # SRPMs that are rebuilt and distributed as part of this module
-    components:
-      rpms:
-        # qemu and qemu specific deps
-        qemu-kvm:
-            rationale: Primary module content
-            ref: 69f3e1173f76a1d1de231514f5fa90830225c552
-            buildorder: 2
-        libiscsi:
-            rationale: qemu-kvm dep
-            ref: 55e043d494606c3cd5d43e80924c577efd12c57b
-            buildorder: 1
-        seabios:
-            rationale: qemu-kvm dep
-            ref: b11bf36ec6a95464ca4dba150240d615f286b38d
-            arches: [x86_64, ppc64le]
-            buildorder: 1
-        sgabios:
-            rationale: qemu-kvm dep
-            ref: b8034210019e1e6086c268d38d7cd6c5ffd2a411
-            arches: [x86_64, ppc64le]
-            buildorder: 1
-        SLOF:
-            rationale: qemu-kvm dep
-            ref: 20c5acc80ee00349c195fd6057e215bceebf1939
-            arches: [ppc64le]
-            buildorder: 1
-        libssh2:
-            rationale: qemu-kvm dep
-            ref: 53ed9bf5b08b9e74e818dd5a9d4057a4107fc609
-            buildorder: 1
-
-
-        # libvirt and libvirt specific deps
-        libvirt:
-            rationale: Primary module content
-            ref: 0bdc98dde6c1ac58f9885259404ae968c32b58e5
-            buildorder: 3
-        libvirt-python:
-            rationale: Primary module content
-            ref: 69534b43774e1101ec5b1182288bfe2118e7d8a5
-            # Build after libvirt
-            buildorder: 4
-        libvirt-dbus:
-            rationale: libvirt-dbus is part of the virtualization module
-            ref: b270d9ae348e217d3c808f9193cda54368bc5c07
-            # Build after libvirt
-            buildorder: 4
-        perl-Sys-Virt:
-            rationale: Primary module content
-            ref: 412bc7b01874065f6f7e1fae4667ae38e9f7ab62
-            # Build after libvirt
-            buildorder: 4
-        netcf:
-            rationale: libvirt dep
-            ref: 0b03839bd3899be9a9138bdd5167a3fb75cc23c4
-            buildorder: 1
-
-
-        # libguestfs, virt-v2v and dependencies
-        hivex:
-            rationale: libguestfs dep
-            ref: 597497f08a8fbf2314caf13cf19e58225386fd17
-            # Build before libguestfs.
-            buildorder: 1
-        supermin:
-            rationale: libguestfs dep
-            ref: dcb5c5160919040a36d3645786bc7c8faf55d7ce
-            # Build before libguestfs.
-            buildorder: 2
-        libguestfs:
-            rationale: Primary module content
-            ref: 30d550d4f31758eaf6e207e108bc26e94413cd84
-            buildorder: 4
-        libguestfs-winsupport:
-            rationale: Primary module content
-            ref: 82323d57a788598281f6b480f31ba15362be1400
-            buildorder: 5
-        nbdkit:
-            rationale: Primary module content
-            ref: fa19e4be8feb003e46567be887165b9d8964125b
-            # Build after libguestfs.
-            buildorder: 5