diff --git a/Dockerfile b/Dockerfile
index d82f85b..557b5b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,9 +41,13 @@ RUN \
   yarn build && \
   yarn install --production --ignore-scripts --prefer-offline && \
   yarn cache clean && \
+  rm -rf \
+    /app/overseerr/src \
+    /app/overseerr/server && \
   echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
+  touch /config/DOCKER && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e82c510..c6994d9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -41,9 +41,13 @@ RUN \
   yarn build && \
   yarn install --production --ignore-scripts --prefer-offline && \
   yarn cache clean && \
+  rm -rf \
+    /app/overseerr/src \
+    /app/overseerr/server && \
   echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
+  touch /config/DOCKER && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 1b4300a..26d546e 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -41,9 +41,13 @@ RUN \
   yarn build && \
   yarn install --production --ignore-scripts --prefer-offline && \
   yarn cache clean && \
+  rm -rf \
+    /app/overseerr/src \
+    /app/overseerr/server && \
   echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
+  touch /config/DOCKER && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/readme-vars.yml b/readme-vars.yml
index 8f35a14..c226cfc 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -47,5 +47,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "10.10.21:", desc: "Add additional post-build cleanup." }
   - { date: "17.06.21:", desc: "Rebase to alpine 3.14." }
   - { date: "05.04.21:", desc: "Initial Release." }