diff --git a/config/hetzner-2i2c-bare.yaml b/config/hetzner-2i2c-bare.yaml
index f55f8dd86..2780f5121 100644
--- a/config/hetzner-2i2c-bare.yaml
+++ b/config/hetzner-2i2c-bare.yaml
@@ -29,6 +29,9 @@ cryptnono:
       containerdHostPath: /run/k3s/containerd/containerd.sock
 
 binderhub:
+  imageCleaner:
+    # handled by buildkit pruner
+    enabled: false
   config:
     BinderHub:
       hub_url: https://hub.2i2c-bare.mybinder.org
diff --git a/config/hetzner-2i2c.yaml b/config/hetzner-2i2c.yaml
index 73636981e..9a970e749 100644
--- a/config/hetzner-2i2c.yaml
+++ b/config/hetzner-2i2c.yaml
@@ -92,8 +92,8 @@ binderhub:
             - hub.2i2c.mybinder.org
 
   imageCleaner:
-    # don't cordon single-node cluster while cleaning
-    cordon: false
+    # handled by buildkit pruner
+    enabled: false
 
 grafana:
   ingress:
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index 514428991..dd691558c 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -362,7 +362,7 @@ binderhub:
         memory: 4Gi
 
   imageCleaner:
-    enabled: false
+    enabled: true
     # Use 40GB as upper limit, size is given in bytes
     imageGCThresholdHigh: 40e9
     imageGCThresholdLow: 10e9