diff --git a/Dockerfile b/Dockerfile
index 9210695..27b6c1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,13 +36,18 @@ RUN \
   echo 'pref("trailhead.firstrun.branches", "nofirstrun-empty");' >> ${FIREFOX_SETTING} && \
   echo 'pref("browser.aboutwelcome.enabled", false);' >> ${FIREFOX_SETTING} && \
   echo "**** cleanup ****" && \
+  apt-get autoclean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
     /tmp/*
 
 # add local files
 COPY /root /
 
 # ports and volumes
-EXPOSE 3000
+EXPOSE 3001
 
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index cafe4ff..720e2a6 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -36,13 +36,18 @@ RUN \
   echo 'pref("trailhead.firstrun.branches", "nofirstrun-empty");' >> ${FIREFOX_SETTING} && \
   echo 'pref("browser.aboutwelcome.enabled", false);' >> ${FIREFOX_SETTING} && \
   echo "**** cleanup ****" && \
+  apt-get autoclean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
     /tmp/*
 
 # add local files
 COPY /root /
 
 # ports and volumes
-EXPOSE 3000
+EXPOSE 3001
 
 VOLUME /config
diff --git a/README.md b/README.md
index 5dcf07c..b6c96b4 100644
--- a/README.md
+++ b/README.md
@@ -440,6 +440,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.08.25:** - Add proper cleanup logic for builds.
 * **01.07.25:** - Add Kasm branch.
 * **23.06.25:** - Rebase to Selkies, HTTPS is now required.
 * **25.09.24:** - Rebase to Ubuntu Noble.
diff --git a/readme-vars.yml b/readme-vars.yml
index 81666a7..bc20c10 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -111,6 +111,7 @@ init_diagram: |
   "firefox:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "16.08.25:", desc: "Add proper cleanup logic for builds."}
   - {date: "01.07.25:", desc: "Add Kasm branch."}
   - {date: "23.06.25:", desc: "Rebase to Selkies, HTTPS is now required."}
   - {date: "25.09.24:", desc: "Rebase to Ubuntu Noble."}