diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index fc49133..8949fdb 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,84 +2,105 @@
 document: modulemd
 version: 2
 data:
-    stream: rhel8
-    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-rhel8-rhel-8.0.0
-            container-selinux:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            containernetworking-plugins:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            fuse-overlayfs:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            oci-systemd-hook:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            oci-umount:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            podman:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            runc:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            skopeo:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
-            slirp4netns:
-                rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+  name: container-tools
+  stream: rhel8
+  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
+      - cockpit-podman
+      - conmon
+      - container-selinux
+      - containernetworking-plugins
+      - criu
+      - fuse-overlayfs
+      - podman
+      - python-podman-api
+      - runc
+      - skopeo
+      - slirp4netns
+      - toolbox
+      - udica
+  api:
+    rpms:
+    - buildah
+    - conmon
+    - container-selinux
+    - containernetworking-plugins
+    - containers-common
+    - fuse-overlayfs
+    - podman
+    - podman-docker
+    - podman-manpages
+    - podman-remote
+    - python-podman-api
+    - runc
+    - skopeo
+    - slirp4netns
+  buildopts:
+    rpms:
+      macros: |
+        %_with_ignore_tests 1
+  components:
+    rpms:
+      buildah:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      cockpit-podman:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      conmon:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      container-selinux:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      containernetworking-plugins:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      criu:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      fuse-overlayfs:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      podman:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      python-podman-api:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      runc:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      skopeo:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      slirp4netns:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      toolbox:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+      udica:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.2.0
+...
diff --git a/container-tools.yaml b/container-tools.yaml
index 3e2893d..0c56049 100644
--- a/container-tools.yaml
+++ b/container-tools.yaml
@@ -1,24 +1,23 @@
+---
 document: modulemd
 version: 2
 data:
+  name: container-tools
   stream: rhel8
   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
@@ -27,64 +26,82 @@ data:
     common:
       rpms:
       - buildah
+      - cockpit-podman
+      - conmon
       - container-selinux
       - containernetworking-plugins
+      - criu
       - fuse-overlayfs
-      - oci-systemd-hook
-      - oci-umount
       - podman
+      - python-podman-api
       - runc
       - skopeo
       - slirp4netns
+      - toolbox
+      - udica
   api:
     rpms:
     - buildah
+    - conmon
     - container-selinux
-    - containers-common
     - containernetworking-plugins
+    - containers-common
     - fuse-overlayfs
-    - oci-systemd-hook
-    - oci-umount
     - podman
     - podman-docker
+    - podman-manpages
+    - podman-remote
+    - python-podman-api
     - runc
     - skopeo
     - slirp4netns
   buildopts:
     rpms:
-      macros: '%_with_ignore_tests 1
-
-        '
+      macros: >
+        %_with_ignore_tests 1
   components:
     rpms:
       buildah:
         rationale: Primary component of this module
-        ref: a5c0f12ee2add8b6ec2477cf67652a85200bf0c7
+        ref: b22ff0f5cac202cb216ce9f932f0c62836981e0e
+      cockpit-podman:
+        rationale: Primary component of this module
+        ref: bfea7fb2b43b472aeedd74dd776bf46663f963f9
+      conmon:
+        rationale: Primary component of this module
+        ref: f636952e467feba23fa56409fe10ab16d61c46a9
       container-selinux:
         rationale: Primary component of this module
-        ref: 2ea28ac5b90bd0b2f5ebc92d50dc525932f43297
+        ref: aa899c2569e1f7cad2ba321fcded7dec3abe4578
       containernetworking-plugins:
         rationale: Primary component of this module
-        ref: 63400dc635f7cfbd255de8abeed60fbefc2e702e
-      fuse-overlayfs:
-        rationale: Primary component of this module
-        ref: 9431add295ee3f868bf7f48ed20898b01609b4b8
-      oci-systemd-hook:
+        ref: 21357e8e64a70942e01123379d957a94ff214e38
+      criu:
         rationale: Primary component of this module
-        ref: 329dab61c624e78b6fae9f756fa6c561eab0458b
-      oci-umount:
+        ref: b8466edfba10fe9ec9f1e226014aff3355d44c1e
+      fuse-overlayfs:
         rationale: Primary component of this module
-        ref: 56dcb72e4be914f26543435bf052c31c5f71b16c
+        ref: 4b358f9f48004ff550d14c693a3f3bc58e1a9e68
       podman:
         rationale: Primary component of this module
-        ref: 18056a23645c70872f4e2ca288345b0c686e24d6
+        ref: 3733b297af65b11616c7f62fbf41ef0769c3a2a6
+      python-podman-api:
+        rationale: Primary component of this module
+        ref: 3f8a184aa406894e84e9edffd49dd3832a5d9168
       runc:
         rationale: Primary component of this module
-        ref: b58745f5a6309d491e8d6041b41604aa33847f3c
+        ref: 7dc2cc7e4a00f11749b6346456ef533850d6cf26
       skopeo:
         rationale: Primary component of this module
-        ref: bae5f54e438e1a0328cae770616c6f06268d0920
+        ref: d8f6d1319e19883a410f9852f2f647b9cf89bfad
       slirp4netns:
         rationale: Primary component of this module
-        ref: b545a715eafde0f7e70f81d2f5fc7f848f030b28
-  name: container-tools
+        ref: b911500408ecc5dc48feb9b9b4964e5fe9af66e4
+      toolbox:
+        rationale: Primary component of this module
+        ref: 79403ea8e67b221522107e2cbfb4068fdaf58090
+      udica:
+        rationale: Primary component of this module
+        ref: b85a2c3efc5c62e4eac4ea41584461a449c7ea9a
+...
+