diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index cf3d46a..da7c269 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,118 +1,99 @@
+---
 document: modulemd
 version: 2
 data:
-    summary: Virtualization module
-    stream: rhel
-    description: >-
-        A virtualization module
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-            platform: [el8]
-          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
-            - qemu-kvm-tests-debuginfo
-
-    # SRPMs that are rebuilt and distributed as part of this module
-    components:
+  stream: rhel
+  summary: Virtualization module
+  description: >-
+    A virtualization module
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  profiles:
+    common:
       rpms:
-        # qemu and qemu specific deps
-        qemu-kvm:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 2
-        libiscsi:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 1
-        seabios:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.1.0
-            arches: [x86_64, ppc64le]
-            buildorder: 1
-        sgabios:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.1.0
-            arches: [x86_64, ppc64le]
-            buildorder: 1
-        SLOF:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.1.0
-            arches: [ppc64le]
-            buildorder: 1
-        libssh2:
-            rationale: qemu-kvm dep
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 1
-
-
-        # libvirt and libvirt specific deps
-        libvirt:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 3
-        libvirt-python:
-            rationale: Primary module content
-            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.1.0
-            # Build after libvirt
-            buildorder: 4
-        perl-Sys-Virt:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            # Build after libvirt
-            buildorder: 4
-        netcf:
-            rationale: libvirt dep
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 1
-
-
-        # libguestfs, virt-v2v and dependencies
-        hivex:
-            rationale: libguestfs dep
-            ref: stream-rhel-rhel-8.1.0
-            # Build before libguestfs.
-            buildorder: 1
-        supermin:
-            rationale: libguestfs dep
-            ref: stream-rhel-rhel-8.1.0
-            # Build before libguestfs.
-            buildorder: 2
-        libguestfs:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 4
-        libguestfs-winsupport:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            buildorder: 5
-        nbdkit:
-            rationale: Primary module content
-            ref: stream-rhel-rhel-8.1.0
-            # Build after libguestfs.
-            buildorder: 5
+      - 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
+    - qemu-kvm-tests
+    - qemu-kvm-tests-debuginfo
+  components:
+    rpms:
+      SLOF:
+        rationale: qemu-kvm dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+        arches: [ppc64le]
+      hivex:
+        rationale: libguestfs dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+      libguestfs:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 4
+      libguestfs-winsupport:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 5
+      libiscsi:
+        rationale: qemu-kvm dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+      libvirt:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 3
+      libvirt-dbus:
+        rationale: libvirt-dbus is part of the virtualization module
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 4
+      libvirt-python:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 4
+      nbdkit:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 5
+      netcf:
+        rationale: libvirt dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+      perl-Sys-Virt:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 4
+      qemu-kvm:
+        rationale: Primary module content
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 2
+      seabios:
+        rationale: qemu-kvm dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+        arches: [ppc64le, x86_64]
+      sgabios:
+        rationale: qemu-kvm dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 1
+        arches: [ppc64le, x86_64]
+      supermin:
+        rationale: libguestfs dep
+        ref: stream-rhel-rhel-8.2.0
+        buildorder: 2
+...