diff --git a/fedora-40-minimal/Containerfile b/fedora-40-minimal/Containerfile
index f96316b..0ca6035 100644
--- a/fedora-40-minimal/Containerfile
+++ b/fedora-40-minimal/Containerfile
@@ -1,11 +1,20 @@
 FROM fedora:40
 
-RUN dnf update -y --setopt install_weak_deps=False && \
-    dnf install -y --setopt install_weak_deps=False git git-lfs git-ftp fuse-overlayfs \
-    nodejs nodejs-npm python3-devel python3-pip pipx coreutils bash clang gcc \
-    aria2 jq yq zstd brotli perl perl-CPAN ruby rubygems sqlite  && \
-    dnf group install -y --setopt install_weak_deps=False "Container Management" --exclude container-selinux && \
-    dnf clean all -y
+RUN dnf update -y --setopt install_weak_deps=False
+
+RUN dnf install -y --setopt install_weak_deps=False git git-lfs git-ftp fuse-overlayfs
+
+RUN dnf install -y --setopt install_weak_deps=False nodejs nodejs-npm python3-devel python3-pip pipx
+
+RUN dnf install -y --setopt install_weak_deps=False perl perl-CPAN ruby rubygems
+
+RUN dnf install -y --setopt install_weak_deps=False clang gcc
+
+RUN dnf install -y --setopt install_weak_deps=False coreutils bash aria2 jq yq zstd brotli sqlite
+
+RUN dnf group install -y --setopt install_weak_deps=False "Container Management" --exclude container-selinux
+
+# We don't clean up dnf cache since user may want to install packages for their use
 
 ADD containers.conf /etc/containers/
 ADD containers/storage.conf /etc/containers/
diff --git a/fedora-40/Containerfile b/fedora-40/Containerfile
index c31811a..3aa9885 100644
--- a/fedora-40/Containerfile
+++ b/fedora-40/Containerfile
@@ -1,17 +1,21 @@
 FROM code.lightstands.xyz/standcoded/fedora:40-minimal
 
-RUN dnf install -y --setopt install_weak_deps=False \
-        sqlite-devel binutils \
-        bison flex \
-        nodejs-devel \
-        poetry \
-        perl-devel \
-        ruby-devel \
-        php php-devel composer \
-        java-1.8.0-openjdk java-1.8.0-openjdk-devel \
-        java-11-openjdk java-11-openjdk-devel \
-        java-17-openjdk java-17-openjdk-devel \
-        java-21-openjdk java-21-openjdk-devel \
-        qemu-user-static qemu-user-binfmt && \
-    dnf group install -y --setopt install_weak_deps=False "C Development Tools and Libraries" && \
-    dnf clean all -y
+RUN dnf install -y --setopt install_weak_deps=False sqlite-devel binutils
+
+RUN dnf install -y --setopt install_weak_deps=False nodejs-devel poetry perl-devel ruby-devel
+
+RUN dnf install -y --setopt install_weak_deps=False php php-devel composer
+
+RUN dnf install -y --setopt install_weak_deps=False java-1.8.0-openjdk java-1.8.0-openjdk-devel
+
+RUN dnf install -y --setopt install_weak_deps=False java-11-openjdk java-11-openjdk-devel
+
+RUN dnf install -y --setopt install_weak_deps=False java-17-openjdk java-17-openjdk-devel
+
+RUN dnf install -y --setopt install_weak_deps=False java-21-openjdk java-21-openjdk-devel
+
+RUN dnf install -y --setopt install_weak_deps=False qemu-user-static qemu-user-binfmt
+
+RUN dnf install -y --setopt install_weak_deps=False bison flex
+
+RUN dnf group install -y --setopt install_weak_deps=False "C Development Tools and Libraries"