diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 24f7447..956529b 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,86 +2,91 @@
 document: modulemd
 version: 2
 data:
-    stream: 1.0
-    summary: Common tools and dependencies for container runtimes
-    description: Contains SELinux policies, binaries and other
-        dependencies for use with container runtimes
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-              platform: [el8]
-              go-toolset: [rhel8]
-              golang-ecosystem: [1.0]
-          requires:
-              platform: [el8]
-    references:
-        community: https://github.com/projectatomic
-        documentation: https://projectatomic.io
-        tracker: https://github.com/projectatomic
-    profiles:
-        common:
-            rpms:
-                - buildah
-                - container-selinux
-                - containernetworking-plugins
-                - fuse-overlayfs
-                - oci-systemd-hook
-                - oci-umount
-                - podman
-                - runc
-                - skopeo
-                - slirp4netns
-    api:
-        rpms:
-            - buildah
-            - container-selinux
-            - containers-common
-            - containernetworking-plugins
-            - fuse-overlayfs
-            - oci-systemd-hook
-            - oci-umount
-            - podman
-            - podman-docker
-            - python3-podman
-            - python3-pypodman
-            - runc
-            - skopeo
-            - slirp4netns
-    buildopts:
-        rpms:
-            macros: |
-                %_with_ignore_tests 1
-    components:
-        rpms:
-            buildah:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            container-selinux:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            containernetworking-plugins:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            fuse-overlayfs:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            oci-systemd-hook:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            oci-umount:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            podman:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            runc:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            skopeo:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
-            slirp4netns:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.1.0
+  name: container-tools
+  stream: 1.0
+  summary: Common tools and dependencies for container runtimes
+  description: >-
+    Contains SELinux policies, binaries and other dependencies for use with container
+    runtimes
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      go-toolset: [rhel8]
+      golang-ecosystem: [1.0]
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: https://github.com/projectatomic
+    documentation: https://projectatomic.io
+    tracker: https://github.com/projectatomic
+  profiles:
+    common:
+      rpms:
+      - buildah
+      - container-selinux
+      - containernetworking-plugins
+      - criu
+      - fuse-overlayfs
+      - oci-systemd-hook
+      - oci-umount
+      - podman
+      - runc
+      - skopeo
+      - slirp4netns
+  api:
+    rpms:
+    - buildah
+    - container-selinux
+    - containernetworking-plugins
+    - containers-common
+    - fuse-overlayfs
+    - oci-systemd-hook
+    - oci-umount
+    - podman
+    - podman-docker
+    - runc
+    - skopeo
+    - slirp4netns
+  buildopts:
+    rpms:
+      macros: |
+        %_with_ignore_tests 1
+  components:
+    rpms:
+      buildah:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      container-selinux:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      containernetworking-plugins:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      criu:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      fuse-overlayfs:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      oci-systemd-hook:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      oci-umount:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      podman:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      runc:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      skopeo:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+      slirp4netns:
+        rationale: Primary component of this module
+        ref: stream-container-tools-1.0-rhel-8.2.0
+...
diff --git a/container-tools.yaml b/container-tools.yaml
deleted file mode 100644
index 59b214e..0000000
--- a/container-tools.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: container-tools
-  stream: 1.0
-  summary: Common tools and dependencies for container runtimes
-  description: >-
-    Contains SELinux policies, binaries and other dependencies for use with container
-    runtimes
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      go-toolset: [rhel8]
-      golang-ecosystem: [1.0]
-      platform: [el8.1.0]
-    requires:
-      platform: [el8]
-  references:
-    community: https://github.com/projectatomic
-    documentation: https://projectatomic.io
-    tracker: https://github.com/projectatomic
-  profiles:
-    common:
-      rpms:
-      - buildah
-      - container-selinux
-      - containernetworking-plugins
-      - fuse-overlayfs
-      - oci-systemd-hook
-      - oci-umount
-      - podman
-      - runc
-      - skopeo
-      - slirp4netns
-  api:
-    rpms:
-    - buildah
-    - container-selinux
-    - containernetworking-plugins
-    - containers-common
-    - fuse-overlayfs
-    - oci-systemd-hook
-    - oci-umount
-    - podman
-    - podman-docker
-    - python3-podman
-    - python3-pypodman
-    - runc
-    - skopeo
-    - slirp4netns
-  buildopts:
-    rpms:
-      macros: >
-        %_with_ignore_tests 1
-  components:
-    rpms:
-      buildah:
-        rationale: Primary component of this module
-        ref: ab706ef9cce1a885711261135cb66950b0d89abf
-      container-selinux:
-        rationale: Primary component of this module
-        ref: 19c7ec12babf38009b7598f7ffc6914daf255b8c
-      containernetworking-plugins:
-        rationale: Primary component of this module
-        ref: 274efa61982a6456781d8925e695332fa1770634
-      fuse-overlayfs:
-        rationale: Primary component of this module
-        ref: cae9ce81461744f1e18288e85b4a448c506f3ab6
-      oci-systemd-hook:
-        rationale: Primary component of this module
-        ref: 329dab61c624e78b6fae9f756fa6c561eab0458b
-      oci-umount:
-        rationale: Primary component of this module
-        ref: 6d895461ed1663faa967469e4ea57d3e17cd7a93
-      podman:
-        rationale: Primary component of this module
-        ref: 555e08c6d0d0d1148987e3a6b113cd97f7ae4f4d
-      runc:
-        rationale: Primary component of this module
-        ref: fda0f9df62275fcc1bcb8256c3379fe7daad9e3c
-      skopeo:
-        rationale: Primary component of this module
-        ref: df025ff554783f24b528f6e57fd937fddfefbaec
-      slirp4netns:
-        rationale: Primary component of this module
-        ref: 50f0feee5a63aac4e27bf95c07e62f786fc78136
-...
-