diff --git a/build/build.sh b/build/build.sh
index 68f28bab..2f77b287 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -10,4 +10,8 @@ REPO_PATH="github.com/wildfly/wildfly-operator"
 VERSION="$(git describe --tags --always --dirty)"
 GO_LDFLAGS_ARG="-X '${REPO_PATH}/version.Version=${VERSION}'"
 echo "building ${PROJECT_NAME} and tagging with ${IMAGE_NAME}"
+
+# Workaround https://github.com/docker/cli/issues/2533
+export DOCKER_API_VERSION=1.43
+
 docker build -t ${IMAGE_NAME} --build-arg GO_LDFLAGS="${GO_LDFLAGS_ARG}" .
diff --git a/config/tests/build-test-images.sh b/config/tests/build-test-images.sh
index f4dadbed..7882b321 100755
--- a/config/tests/build-test-images.sh
+++ b/config/tests/build-test-images.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -e
+# Workaround https://github.com/docker/cli/issues/2533
+export DOCKER_API_VERSION=1.43
 
 WORKDIR=$(readlink -f "$(dirname "$0")/../../bin/test_repos")
 echo "WORKDIR: ${WORKDIR}"