diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh
index 9d0f4542..21e92ba8 100755
--- a/docker/dev/docker_update.sh
+++ b/docker/dev/docker_update.sh
@@ -1,2 +1,6 @@
 #!/bin/sh
+set -e
+
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 docker-compose up -d --no-deps --build
diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
index 1ae91f65..ce85f60c 100755
--- a/docker/dev/test_deploy.sh
+++ b/docker/dev/test_deploy.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+set -e
+
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 
 # Rebuilding dev docker
 docker-compose build
diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index e5f9a98e..0ad47bcd 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 git checkout master
 
 # Import translations
@@ -32,6 +33,9 @@ git add ../../ansible/templates/docker-compose.yml
 git commit -m"Version $new_tag"
 git tag $new_tag
 
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
+
 # Rebuilding docker
 docker-compose build
 docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag