diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 65e72c3..a98b4a1 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -168,7 +168,7 @@ jobs:
               context: .
               file: ${{ matrix.dockerfile }}
               platforms: linux/amd64,linux/arm64
-              push: false
+              push: true
               tags: |
                   ghcr.io/ultramarine-linux/ultramarine-devtools:40
                   ghcr.io/ultramarine-linux/ultramarine-devtools:latest
diff --git a/dockerfiles/devtools.dockerfile b/dockerfiles/devtools.dockerfile
index 5ccae70..f3c03d0 100644
--- a/dockerfiles/devtools.dockerfile
+++ b/dockerfiles/devtools.dockerfile
@@ -2,4 +2,4 @@ ARG RELEASE
 
 FROM ghcr.io/ultramarine-linux/ultramarine:${RELEASE}
 
-RUN dnf install -y @development-tools
+RUN dnf install -y @development-tools && dnf clean all
diff --git a/katsu/modules/base/devtools-docker-aarch64.yaml b/katsu/modules/base/devtools-docker-aarch64.yaml
deleted file mode 100644
index 85a0bd9..0000000
--- a/katsu/modules/base/devtools-docker-aarch64.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-builder: dnf
-distro: Ultramarine Linux 40 Container (Development Tools)
-
-import:
-  - base-docker.yaml
-
-dnf:
-  releasever: 40
-  arch: aarch64
-packages:
-  #releng and packaging
-  - katsu
-  - anda
-  - anda-mock-configs
-  - anda-srpm-macros
-  - libostree
-  - rpm-ostree
-  #languages
-  - vala
-  - rust
-  - python3
-  - python3-pip
-  - nodejs
-  #hwe/anywhere
-  - vboot-utils
-  #gui
-  - libhelium
-  - libhelium-devel
-  - tau-helium
-  - tau-hydrogen
-  - gtk4-devel
-  - rust-gtk4-devel
-  #utils
-  - git
-  - micro
-  - nano
-  - vim
diff --git a/katsu/modules/base/devtools-docker-x86_64.yaml b/katsu/modules/base/devtools-docker-x86_64.yaml
deleted file mode 100644
index c312bd2..0000000
--- a/katsu/modules/base/devtools-docker-x86_64.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-builder: dnf
-distro: Ultramarine Linux 40 Container (Development Tools)
-
-import:
-  - base-docker.yaml
-
-dnf:
-  releasever: 40
-  arch: x86_64
-packages:
-  #releng and packaging
-  - katsu
-  - anda
-  - anda-mock-configs
-  - anda-srpm-macros
-  - libostree
-  - rpm-ostree
-  #languages
-  - vala
-  - rust
-  - python3
-  - python3-pip
-  - nodejs
-  #hwe/anywhere
-  - vboot-utils
-  #gui
-  - libhelium
-  - libhelium-devel
-  - tau-helium
-  - tau-hydrogen
-  - gtk4-devel
-  - rust-gtk4-devel
-  #utils
-  - git
-  - micro
-  - nano
-  - vim