diff --git a/README.md b/README.md
index 08fab039..02a1c09a 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,6 @@
 
 Docker images we use in development.
 
-# Note
-If you do build on Codespaces, make sure you set `DOCKER_BUILDKIT=0` .
-
 # EFSS versions
 ## Nextcloud version
 
diff --git a/docker/build/all.sh b/docker/build/all.sh
index 26509968..366fb472 100755
--- a/docker/build/all.sh
+++ b/docker/build/all.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/sciencemesh.sh b/docker/build/sciencemesh.sh
index 0c993f0d..aee13b88 100755
--- a/docker/build/sciencemesh.sh
+++ b/docker/build/sciencemesh.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/solid.sh b/docker/build/solid.sh
index e329950c..512568a1 100755
--- a/docker/build/solid.sh
+++ b/docker/build/solid.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/sunet.sh b/docker/build/sunet.sh
index ad6508c7..b72a8a66 100755
--- a/docker/build/sunet.sh
+++ b/docker/build/sunet.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/surf-rd-sram.sh b/docker/build/surf-rd-sram.sh
index 0335d530..71cf3365 100755
--- a/docker/build/surf-rd-sram.sh
+++ b/docker/build/surf-rd-sram.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/surf-token-based-access.sh b/docker/build/surf-token-based-access.sh
index 74b9214e..d8510cc5 100755
--- a/docker/build/surf-token-based-access.sh
+++ b/docker/build/surf-token-based-access.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/build/surf-trashbin.sh b/docker/build/surf-trashbin.sh
index 5e564c74..53c7cae8 100755
--- a/docker/build/surf-trashbin.sh
+++ b/docker/build/surf-trashbin.sh
@@ -5,8 +5,10 @@
 
 set -e
 
-# @michielbdejong avoid docker buildkit
-export DOCKER_BUILDKIT=0
+# use docker buildkit. you can disable buildkit by providing 0 as first argument.
+USE_BUILDKIT=${1:-"1"}
+
+export DOCKER_BUILDKIT="${USE_BUILDKIT}"
 
 # find this scripts location.
 SOURCE=${BASH_SOURCE[0]}
diff --git a/docker/delete-all-images.sh b/docker/delete-all-images.sh
index 31bbecec..086f075a 100755
--- a/docker/delete-all-images.sh
+++ b/docker/delete-all-images.sh
@@ -6,10 +6,10 @@
 set -e
 
 # delete all containers including its volumes.
-docker rm -vf $(docker ps -aq) || true
+docker rm -vf $(docker ps -aq) >/dev/null 2>&1 || true
 
 # delete all images.
-docker rmi -f $(docker images -aq) || true
+docker rmi -f $(docker images -aq) >/dev/null 2>&1 || true
 
 docker system prune --force
 docker volume prune --force