diff --git a/Jenkinsfile.pjt b/Jenkinsfile.pjt
index 12650fd..8c47e22 100644
--- a/Jenkinsfile.pjt
+++ b/Jenkinsfile.pjt
@@ -83,8 +83,7 @@ pipeline {
             set -e
 
             echo "[1/2] docker registry login"
-            echo "$DOCKER_PASS" | docker login ${REGISTRY_HOST} \
-              -u "$DOCKER_USER" --password-stdin
+            echo "$DOCKER_PASS" | docker login ${REGISTRY_HOST} -u "$DOCKER_USER" --password-stdin
 
             echo "[2/2] docker image push"
             docker push ${REGISTRY_HOST}/${IMAGE_REPO}:${IMAGE_TAG}
@@ -214,7 +213,14 @@ pipeline {
 
               Repo='"${REGISTRY_HOST}/${IMAGE_REPO}"'
 
+              echo "[1/3] Remove old image"
               docker images "${Repo}" --format '{{.Repository}}:{{.Tag}}' | grep -v -F -f <(docker ps --format '{{.Image}}') | xargs -r docker rmi
+
+              echo "[2/3] Remove dangling images"
+              docker image prune -f
+
+              echo "[3/3] Remove old build cache (safe-ish)"
+              docker builder prune -f || true
             '
           '''
         }