diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 608c6e2..2e47e66 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -35,11 +35,13 @@ data:
       - conmon
       - container-selinux
       - containernetworking-plugins
+      - containers-common
       - criu
       - crun
       - fuse-overlayfs
       - libslirp
       - podman
+      - python3-podman
       - runc
       - skopeo
       - slirp4netns
@@ -58,6 +60,7 @@ data:
     - podman-docker
     - podman-manpages
     - podman-remote
+    - python3-podman
     - runc
     - skopeo
     - slirp4netns
@@ -69,51 +72,57 @@ data:
     rpms:
       buildah:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       cockpit-podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       conmon:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       container-selinux:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       containernetworking-plugins:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
+      containers-common:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       criu:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       crun:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       fuse-overlayfs:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       libslirp:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
         buildorder: -1
       oci-seccomp-bpf-hook:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
+      python-podman:
+        rationale: Primary component of this module
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       runc:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       skopeo:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       slirp4netns:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       toolbox:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
       udica:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        ref: stream-container-tools-rhel8-rhel-8.5.0
 ...
diff --git a/container-tools.yaml b/container-tools.yaml
deleted file mode 100644
index 70defe2..0000000
--- a/container-tools.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: container-tools
-  stream: rhel8
-  summary: >-
-    Most recent (rolling) versions of podman, buildah, skopeo, runc, conmon, runc,
-    conmon, CRIU, Udica, etc as well as dependencies such as container-selinux
-    built and tested together, and updated as frequently as every 12 weeks.
-  description: >-
-    Latest versions of podman, buildah, skopeo, runc, conmon, CRIU, Udica, etc as
-    well as dependencies such as container-selinux built and tested together, and
-    updated as frequently as every 12 weeks. Only very limited back ports are
-    provided to this stream, and most patches come from providing new versions.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      go-toolset: [rhel8]
-      golang-ecosystem: [1.0]
-      platform: [el8.4.0]
-    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
-      - crun
-      - fuse-overlayfs
-      - libslirp
-      - podman
-      - runc
-      - skopeo
-      - slirp4netns
-      - toolbox
-      - udica
-  api:
-    rpms:
-    - buildah
-    - conmon
-    - container-selinux
-    - containernetworking-plugins
-    - containers-common
-    - fuse-overlayfs
-    - libslirp
-    - podman
-    - podman-docker
-    - podman-manpages
-    - podman-remote
-    - runc
-    - skopeo
-    - slirp4netns
-  buildopts:
-    rpms:
-      macros: |
-        %_with_ignore_tests 1
-  components:
-    rpms:
-      buildah:
-        rationale: Primary component of this module
-        ref: 17dd158a27e0bbc9ec74e3ba973cfb6b1e1b8cec
-      cockpit-podman:
-        rationale: Primary component of this module
-        ref: 48e1d5d657517676994445fba1195830c86e3f4e
-      conmon:
-        rationale: Primary component of this module
-        ref: 950ce7c8bb78362cde8db2f017d0ba6eddd3650b
-      container-selinux:
-        rationale: Primary component of this module
-        ref: 1f88d7755624dcc438a6c0caa34915ebacb992b7
-      containernetworking-plugins:
-        rationale: Primary component of this module
-        ref: c3dd30de5686ea2ddc2e8f72f782c2878394590a
-      criu:
-        rationale: Primary component of this module
-        ref: d82137cbbc50b45b5f89946a50662d004993d43c
-      crun:
-        rationale: Primary component of this module
-        ref: 87dc3912e8692ab8022eabe85007406d1c275409
-      fuse-overlayfs:
-        rationale: Primary component of this module
-        ref: 2b7c0892c044d7c0dd833462011fd9366c331170
-      libslirp:
-        rationale: Primary component of this module
-        ref: 4cbaabca93711fd52d99a34142eb43d2fe6bcf08
-        buildorder: -1
-      oci-seccomp-bpf-hook:
-        rationale: Primary component of this module
-        ref: 6b63733495cb443f90ea9ebc36322c81f54fcff7
-      podman:
-        rationale: Primary component of this module
-        ref: 2563af784d63cf5a04661579fff24661a0dfb7e1
-      runc:
-        rationale: Primary component of this module
-        ref: 121bdabc9bc89e14428a453a13adb6fd528f4947
-      skopeo:
-        rationale: Primary component of this module
-        ref: f9b602a52e34fb4366cee92b9d3a60ae60c21681
-      slirp4netns:
-        rationale: Primary component of this module
-        ref: 8935e36b43decf9cdf30fd51f24c968ced3af948
-      toolbox:
-        rationale: Primary component of this module
-        ref: a8b534750aa0b0e846727e6718b82e75bafec827
-      udica:
-        rationale: Primary component of this module
-        ref: 8cf51d125e1f0b20485dec04a31f535b04c95026
-...