diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index af952c4..641fb10 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -59,7 +59,8 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5.5.1
         with:
-          images: dotfiles:archlinux
+          images: dotfiles
+          tags: latest,archlinux
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5.3.0
@@ -96,7 +97,8 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5.5.1
         with:
-          images: dotfiles:fedora
+          images: dotfiles
+          tags: fedora
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5.3.0
diff --git a/Dockerfile.archlinux b/Dockerfile.archlinux
index 7eb15c9..0620cb9 100644
--- a/Dockerfile.archlinux
+++ b/Dockerfile.archlinux
@@ -36,7 +36,12 @@ RUN mkdir -p /home/max/src && \
 COPY --chown=max install.sh /home/max/src/miscellaneous/install.sh
 
 WORKDIR /home/max/src/miscellaneous
-RUN /bin/sh -o pipefail -c "yes | AUTOMATED=1 /home/max/src/miscellaneous/install.sh"
+RUN /bin/sh -o pipefail -c "yes | \
+	AUTOMATED=1 /home/max/src/miscellaneous/install.sh && \
+	pacman -Scc --noconfirm && \
+	yay -Scc --noconfirm && \
+	rm -rf /home/max/.cache/yay/* && \
+    rm -rf /var/cache/pacman/pkg/*"
 
 WORKDIR /home/max
 ENTRYPOINT ["/bin/zsh"]