diff --git a/mybinder/templates/buildkit-pruner.yaml b/mybinder/templates/buildkit-pruner.yaml
index de016a6f8..d7272f8a0 100644
--- a/mybinder/templates/buildkit-pruner.yaml
+++ b/mybinder/templates/buildkit-pruner.yaml
@@ -26,6 +26,7 @@ spec:
             - /bin/sh
             - -c
             - |
+              docker image prune ---force -all && \
               docker builder prune --force --all --keep-storage={{ .Values.buildkitPruner.buildkitCacheSize }} && \
               docker system df
             volumeMounts:
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index dd691558c..514428991 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -362,7 +362,7 @@ binderhub:
         memory: 4Gi
 
   imageCleaner:
-    enabled: true
+    enabled: false
     # Use 40GB as upper limit, size is given in bytes
     imageGCThresholdHigh: 40e9
     imageGCThresholdLow: 10e9