diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 4c391ab..cece56c 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -72,51 +72,51 @@ data:
     rpms:
       buildah:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       cockpit-podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       conmon:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       container-selinux:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       containernetworking-plugins:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       criu:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       crun:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       fuse-overlayfs:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       libslirp:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
         buildorder: -1
       oci-seccomp-bpf-hook:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       runc:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       skopeo:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       slirp4netns:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       toolbox:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
       udica:
         rationale: Primary component of this module
-        ref: stream-container-tools-3.0-rhel-8.4.0
+        ref: stream-container-tools-3.0-rhel-8.5.0
 ...
diff --git a/container-tools.yaml b/container-tools.yaml
deleted file mode 100644
index 55db072..0000000
--- a/container-tools.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: container-tools
-  stream: 3.0
-  summary: Stable versions of podman 3.0, buildah 1.19, skopeo 1.2, runc, conmon,
-    etc as well as dependencies such as container-selinux built and tested together,
-    and supported as documented on the Application Stream lifecycle page.
-  description: >-
-    Stable versions of podman 3.0, buildah 1.19, skopeo 1.2, runc, conmon, CRIU, Udica,
-    etc as well as dependencies such as container-selinux built and tested together.
-    Released with RHEL 8.4 and supported for 24 months. During the support lifecycle,
-    back ports of important, critical vulnerabilities (CVEs, RHSAs) and bug fixes
-    (RHBAs) are provided to this stream, and versions do not move forward. For more
-    information see: https://access.redhat.com/support/policy/updates/containertools
-  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: 17b3266cac2fe4a21a8c2bf57495b7d0e2751543
-      cockpit-podman:
-        rationale: Primary component of this module
-        ref: ac1ac1a7951f7c53949d07ba4cf2bd522a6a31a9
-      conmon:
-        rationale: Primary component of this module
-        ref: 0c4708a8b1c923ee61dbf259d86edc57459ef547
-      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: a280c366d81b9506e08e2fbffc639913f472e8b2
-      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: 61c8a7b62ab635b19d1998079b4f85ca4e218637
-      runc:
-        rationale: Primary component of this module
-        ref: 0331becdf7f7d7604a09701f2905b4695d5916ac
-      skopeo:
-        rationale: Primary component of this module
-        ref: 379816624a75557d4e66405e6646895ba73acbf0
-      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: b3d9ab2f7f53017322f25715a8ff7759d29414e7
-...
-