diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 25c02a3..036cb90 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -71,54 +71,54 @@ data:
     rpms:
       buildah:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       cockpit-podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       conmon:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       container-selinux:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       containernetworking-plugins:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       criu:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       crun:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       fuse-overlayfs:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       libslirp:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
         buildorder: -1
       oci-seccomp-bpf-hook:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       podman:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        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.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       runc:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       skopeo:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       slirp4netns:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       toolbox:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
       udica:
         rationale: Primary component of this module
-        ref: stream-container-tools-rhel8-rhel-8.3.1
+        ref: stream-container-tools-rhel8-rhel-8.4.0
 ...
diff --git a/container-tools.yaml b/container-tools.yaml
deleted file mode 100644
index 4da0e34..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: eb4334788c76cc47bc20ee1da435610049553581
-      cockpit-podman:
-        rationale: Primary component of this module
-        ref: b777bb76eb0ccd54ede2346f33013c397bb8fdb3
-      conmon:
-        rationale: Primary component of this module
-        ref: a125cdefa31d3a9a680bad999163ee6feed1aebb
-      container-selinux:
-        rationale: Primary component of this module
-        ref: b0856be64535d15af04bbf901375b8631986418d
-      containernetworking-plugins:
-        rationale: Primary component of this module
-        ref: 5bc927effc6d614a22bb0fdc0d02bde01bdd658b
-      criu:
-        rationale: Primary component of this module
-        ref: 13335dc395b9f62a22e3e218b083471a4213a1c3
-      crun:
-        rationale: Primary component of this module
-        ref: e1b5cf900264b38d54abfb98bb49daf2c705b29b
-      fuse-overlayfs:
-        rationale: Primary component of this module
-        ref: d37043544b2c8db229897bce29ebb8979212f370
-      libslirp:
-        rationale: Primary component of this module
-        ref: 4cbaabca93711fd52d99a34142eb43d2fe6bcf08
-        buildorder: -1
-      oci-seccomp-bpf-hook:
-        rationale: Primary component of this module
-        ref: 0c22e2e0d632f8f060e74d109e430c67feb11a7c
-      podman:
-        rationale: Primary component of this module
-        ref: 6ad3acd5fa62fe4098d618814d6ba828ee216181
-      python-podman-api:
-        rationale: Primary component of this module
-        ref: 1cd9eb4c85378ff671967ab5d2acaf596c3f0765
-      runc:
-        rationale: Primary component of this module
-        ref: 3313694e0ff77f59f1ad270ae4a9f4e515a7abb4
-      skopeo:
-        rationale: Primary component of this module
-        ref: a460b1be7c4ee6fb283910f1cd9bb1536d43c56b
-      slirp4netns:
-        rationale: Primary component of this module
-        ref: a9e0224a50450e43fabd34d2ec0b30bf03a5bdc3
-      toolbox:
-        rationale: Primary component of this module
-        ref: c380bab89cb0d429591e06976392c0484227cbb6
-      udica:
-        rationale: Primary component of this module
-        ref: fd52829b49626e6d5ba535c282a1e32f0ef0f93f
-...