diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index fc49133..71bfc6f 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -24,15 +24,18 @@ data:
         common:
             rpms:
                 - buildah
+                - cockpit-podman
                 - container-selinux
                 - containernetworking-plugins
                 - fuse-overlayfs
                 - oci-systemd-hook
                 - oci-umount
                 - podman
+                - python-podman-api
                 - runc
                 - skopeo
                 - slirp4netns
+                - toolbox
     api:
         rpms:
             - buildah
@@ -44,6 +47,9 @@ data:
             - oci-umount
             - podman
             - podman-docker
+            - podman-manpages
+            - podman-remote
+            - python-podman-api
             - runc
             - skopeo
             - slirp4netns
@@ -55,31 +61,40 @@ data:
         rpms:
             buildah:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
+            cockpit-podman:
+                rationale: Primary component of this module
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             container-selinux:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             containernetworking-plugins:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             fuse-overlayfs:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             oci-systemd-hook:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             oci-umount:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             podman:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
+            python-podman-api:
+                rationale: Primary component of this module
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             runc:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             skopeo:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
             slirp4netns:
                 rationale: Primary component of this module
-                ref: stream-container-tools-rhel8-rhel-8.0.0
+                ref: stream-container-tools-rhel8-rhel-8.1.0
+            toolbox:
+                rationale: Primary component of this module
+                ref: stream-container-tools-rhel8-rhel-8.1.0
diff --git a/container-tools.yaml b/container-tools.yaml
deleted file mode 100644
index fd252bf..0000000
--- a/container-tools.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-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.0.0]
-              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: a5c0f12ee2add8b6ec2477cf67652a85200bf0c7
-            container-selinux:
-                rationale: Primary component of this module
-                ref: 2ea28ac5b90bd0b2f5ebc92d50dc525932f43297
-            containernetworking-plugins:
-                rationale: Primary component of this module
-                ref: 63400dc635f7cfbd255de8abeed60fbefc2e702e
-            fuse-overlayfs:
-                rationale: Primary component of this module
-                ref: 9431add295ee3f868bf7f48ed20898b01609b4b8
-            oci-systemd-hook:
-                rationale: Primary component of this module
-                ref: 329dab61c624e78b6fae9f756fa6c561eab0458b
-            oci-umount:
-                rationale: Primary component of this module
-                ref: 56dcb72e4be914f26543435bf052c31c5f71b16c
-            podman:
-                rationale: Primary component of this module
-                ref: fff05c30b3fcb542fa035200f6f9440d811edb41
-            runc:
-                rationale: Primary component of this module
-                ref: b58745f5a6309d491e8d6041b41604aa33847f3c
-            skopeo:
-                rationale: Primary component of this module
-                ref: bae5f54e438e1a0328cae770616c6f06268d0920
-            slirp4netns:
-                rationale: Primary component of this module
-                ref: b545a715eafde0f7e70f81d2f5fc7f848f030b28