diff --git a/fedora/f37/Containerfile b/fedora/f37/Containerfile
index a58be5b7..608446ae 100644
--- a/fedora/f37/Containerfile
+++ b/fedora/f37/Containerfile
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \
       summary="Base image for creating Fedora toolbox containers" \
       maintainer="Debarshi Ray <rishi@fedoraproject.org>"
 
-COPY README.md /
-
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-RUN dnf -y upgrade
-RUN dnf -y swap coreutils-single coreutils-full
-RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks
-
-COPY missing-docs /
-RUN dnf -y reinstall $(<missing-docs)
-RUN rm /missing-docs
+COPY README.md missing-docs extra-packages ensure-files /
 
-COPY extra-packages /
-RUN dnf -y install $(<extra-packages)
-RUN rm /extra-packages
+RUN dnf -y upgrade && \
+    dnf -y swap coreutils-single coreutils-full && \
+    dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \
+    dnf -y reinstall $(<missing-docs) && \
+    dnf -y install $(<extra-packages) && \
+    dnf clean all
 
-COPY ensure-files /
 RUN ret_val=0; \
   while read file; do \
     if ! compgen -G "$file" >/dev/null; then \
@@ -39,6 +33,5 @@ RUN ret_val=0; \
   if [ "$ret_val" -ne 0 ]; then \
     false; \
   fi
-RUN rm /ensure-files
 
-RUN dnf clean all
+RUN rm /missing-docs /extra-packages /ensure-files
diff --git a/fedora/f38/Containerfile b/fedora/f38/Containerfile
index f99e2dc9..a868553e 100644
--- a/fedora/f38/Containerfile
+++ b/fedora/f38/Containerfile
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \
       summary="Base image for creating Fedora toolbox containers" \
       maintainer="Debarshi Ray <rishi@fedoraproject.org>"
 
-COPY README.md /
-
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-RUN dnf -y upgrade
-RUN dnf -y swap coreutils-single coreutils-full
-RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks
-
-COPY missing-docs /
-RUN dnf -y reinstall $(<missing-docs)
-RUN rm /missing-docs
+COPY README.md missing-docs extra-packages ensure-files /
 
-COPY extra-packages /
-RUN dnf -y install $(<extra-packages)
-RUN rm /extra-packages
+RUN dnf -y upgrade && \
+    dnf -y swap coreutils-single coreutils-full && \
+    dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \
+    dnf -y reinstall $(<missing-docs) && \
+    dnf -y install $(<extra-packages) && \
+    dnf clean all
 
-COPY ensure-files /
 RUN ret_val=0; \
   while read file; do \
     if ! compgen -G "$file" >/dev/null; then \
@@ -39,6 +33,5 @@ RUN ret_val=0; \
   if [ "$ret_val" -ne 0 ]; then \
     false; \
   fi
-RUN rm /ensure-files
 
-RUN dnf clean all
+RUN rm /missing-docs /extra-packages /ensure-files
diff --git a/fedora/f39/Containerfile b/fedora/f39/Containerfile
index b4d45b36..27b6f766 100644
--- a/fedora/f39/Containerfile
+++ b/fedora/f39/Containerfile
@@ -10,24 +10,18 @@ LABEL com.github.containers.toolbox="true" \
       summary="Base image for creating Fedora toolbox containers" \
       maintainer="Debarshi Ray <rishi@fedoraproject.org>"
 
-COPY README.md /
-
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-RUN dnf -y upgrade
-RUN dnf -y swap coreutils-single coreutils-full
-RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks
-
-COPY missing-docs /
-RUN dnf -y reinstall $(<missing-docs)
-RUN rm /missing-docs
+COPY README.md missing-docs extra-packages ensure-files /
 
-COPY extra-packages /
-RUN dnf -y install $(<extra-packages)
-RUN rm /extra-packages
+RUN dnf -y upgrade && \
+    dnf -y swap coreutils-single coreutils-full && \
+    dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \
+    dnf -y reinstall $(<missing-docs) && \
+    dnf -y install $(<extra-packages) && \
+    dnf clean all
 
-COPY ensure-files /
 RUN ret_val=0; \
   while read file; do \
     if ! compgen -G "$file" >/dev/null; then \
@@ -39,6 +33,5 @@ RUN ret_val=0; \
   if [ "$ret_val" -ne 0 ]; then \
     false; \
   fi
-RUN rm /ensure-files
 
-RUN dnf clean all
+RUN rm /missing-docs /extra-packages /ensure-files