diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 036cb90..63ed4c2 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -40,7 +40,6 @@ data:
       - fuse-overlayfs
       - libslirp
       - podman
-      - python-podman-api
       - runc
       - skopeo
       - slirp4netns
@@ -59,7 +58,6 @@ data:
     - podman-docker
     - podman-manpages
     - podman-remote
-    - python-podman-api
     - runc
     - skopeo
     - slirp4netns
@@ -71,54 +69,51 @@ 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
       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
-      python-podman-api:
-        rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.4.0
+        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 611dfce..0000000
--- a/container-tools.yaml
+++ /dev/null
@@ -1,124 +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
-      - python-podman-api
-      - 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
-    - python-podman-api
-    - runc
-    - skopeo
-    - slirp4netns
-  buildopts:
-    rpms:
-      macros: |
-        %_with_ignore_tests 1
-  components:
-    rpms:
-      buildah:
-        rationale: Primary component of this module
-        ref: 34669e7a5923d83e7d8cf4a622f87f9fe04feeeb
-      cockpit-podman:
-        rationale: Primary component of this module
-        ref: f990548e3b6ab728d6dc6781dd263f603bdce925
-      conmon:
-        rationale: Primary component of this module
-        ref: 340f01f746b26f9f56c6bf2c91f1f660967c19ef
-      container-selinux:
-        rationale: Primary component of this module
-        ref: d9d254877fbef0a031dada150b82990c401393aa
-      containernetworking-plugins:
-        rationale: Primary component of this module
-        ref: c5ecbfea23426b8ac172217ffc6715facbee9d96
-      criu:
-        rationale: Primary component of this module
-        ref: d82137cbbc50b45b5f89946a50662d004993d43c
-      crun:
-        rationale: Primary component of this module
-        ref: 3745b563d243ff881f2d2f2f7bf90a4e828e0a80
-      fuse-overlayfs:
-        rationale: Primary component of this module
-        ref: 5b7cef5ff399bf8731ca73e6409e863f18910a3b
-      libslirp:
-        rationale: Primary component of this module
-        ref: 4cbaabca93711fd52d99a34142eb43d2fe6bcf08
-        buildorder: -1
-      oci-seccomp-bpf-hook:
-        rationale: Primary component of this module
-        ref: 6a84278019352e0ec380b75cc39b1a92457f2b6f
-      podman:
-        rationale: Primary component of this module
-        ref: c3a525201170916b587639f75cb9e0b1bc22fabf
-      python-podman-api:
-        rationale: Primary component of this module
-        ref: 1cd9eb4c85378ff671967ab5d2acaf596c3f0765
-      runc:
-        rationale: Primary component of this module
-        ref: 5f8f9fa50602a9f876c3a612a2db44a645bab8c6
-      skopeo:
-        rationale: Primary component of this module
-        ref: caaf4088ecb0a61928a5787156cb1a3ba1708787
-      slirp4netns:
-        rationale: Primary component of this module
-        ref: 8935e36b43decf9cdf30fd51f24c968ced3af948
-      toolbox:
-        rationale: Primary component of this module
-        ref: d5298befd163ee5cc16b58ced91adbc3876132be
-      udica:
-        rationale: Primary component of this module
-        ref: b3d9ab2f7f53017322f25715a8ff7759d29414e7
-...