diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 884217c..956529b 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,84 +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
-            - 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.0.0
-            container-selinux:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            containernetworking-plugins:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            fuse-overlayfs:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            oci-systemd-hook:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            oci-umount:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            podman:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            runc:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            skopeo:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.0
-            slirp4netns:
-                rationale: Primary component of this module
-                ref: stream-container-tools-1.0-rhel-8.0.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
index 8dfcbd8..7227583 100644
--- a/container-tools.yaml
+++ b/container-tools.yaml
@@ -1,24 +1,23 @@
+---
 document: modulemd
 version: 2
 data:
-  stream: '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
+  description: >-
+    Contains SELinux policies, binaries and other dependencies for use with container
+    runtimes
   license:
     module:
     - MIT
   dependencies:
   - buildrequires:
-      platform:
-      - el8.0.0
-      go-toolset:
-      - rhel8
-      golang-ecosystem:
-      - 1.0
+      go-toolset: [rhel8]
+      golang-ecosystem: [1.0]
+      platform: [el8.2.0]
     requires:
-      platform:
-      - el8
+      platform: [el8]
   references:
     community: https://github.com/projectatomic
     documentation: https://projectatomic.io
@@ -29,6 +28,7 @@ data:
       - buildah
       - container-selinux
       - containernetworking-plugins
+      - criu
       - fuse-overlayfs
       - oci-systemd-hook
       - oci-umount
@@ -40,8 +40,8 @@ data:
     rpms:
     - buildah
     - container-selinux
-    - containers-common
     - containernetworking-plugins
+    - containers-common
     - fuse-overlayfs
     - oci-systemd-hook
     - oci-umount
@@ -52,39 +52,42 @@ data:
     - slirp4netns
   buildopts:
     rpms:
-      macros: '%_with_ignore_tests 1
-
-        '
+      macros: >
+        %_with_ignore_tests 1
   components:
     rpms:
       buildah:
         rationale: Primary component of this module
-        ref: d5ff548fef3bd5c97e5dfd7fabd8dcac909b4991
+        ref: 0ef1e75ad8889ca6cee8480cc47eefd527ffba1f
       container-selinux:
         rationale: Primary component of this module
-        ref: 5c9fab5c79b2729defa35474bc90f3088c9a3e4f
+        ref: 61d8e267c5c1971321f179862d6acbc2e6949fd2
       containernetworking-plugins:
         rationale: Primary component of this module
-        ref: 48b17db8c7730580353be41bcefa022ca50e92f5
+        ref: aba2da20711138772c4ead921cc2965146002a82
+      criu:
+        rationale: Primary component of this module
+        ref: b8466edfba10fe9ec9f1e226014aff3355d44c1e
       fuse-overlayfs:
         rationale: Primary component of this module
-        ref: 208de99f7066ab2f181ec2743530fedac74cb102
+        ref: 88a6862516a08fd9801c728747740af6a9757861
       oci-systemd-hook:
         rationale: Primary component of this module
         ref: f3a7397f9eb34f449d99ee0c14a9b1190a3b4975
       oci-umount:
         rationale: Primary component of this module
-        ref: c381f57a4ad3e13fe8a0b243da80a6c7a3b8e20d
+        ref: c3eba0302a7c6a5d3f95b268b3c283372befe608
       podman:
         rationale: Primary component of this module
-        ref: f2d347fa0460f90d3cefef2591f624f2bd4d2317
+        ref: d43c5a1e969ced7d4c5579c6889d2d48a12cedc3
       runc:
         rationale: Primary component of this module
-        ref: 1f559302c95edfe286d7f8f7a72088e0cecf91d4
+        ref: fa1eb4c4b2343e89925238f9ecdb153ad2589f6c
       skopeo:
         rationale: Primary component of this module
-        ref: 689117f937426e66b3900d2a069290dfeb789d09
+        ref: 39f5f42b457e7ba441586107e098ce0f592b56e9
       slirp4netns:
         rationale: Primary component of this module
-        ref: 53d4720a7c7a883656fce838b05c9446d29476a2
-  name: container-tools
+        ref: ecec4e4f5766fd1b770191588048d8c0c5d77b13
+...
+