diff --git a/Jenkinsfile b/Jenkinsfile
index ae2d0cbfaa..d5028c921b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
+                    make -f docker.Makefile test-e2e-non-experimental"
             }
         }
         stage("e2e (non-experimental) - 18.09 engine") {
@@ -26,21 +26,21 @@ pipeline {
                 sh "E2E_ENGINE_VERSION=18.09-dind \
                   E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                   IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                  DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
+                  make -f docker.Makefile test-e2e-non-experimental"
             }
         }
         stage("e2e (experimental)") {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-experimental"
+                    make -f docker.Makefile test-e2e-experimental"
             }
         }
         stage("e2e (ssh connhelper)") {
             steps {
                 sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
                     IMAGE_TAG=clie2e${BUILD_NUMBER} \
-                    DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-connhelper-ssh"
+                    make -f docker.Makefile test-e2e-connhelper-ssh"
             }
         }
     }
diff --git a/docker.Makefile b/docker.Makefile
index d30d56b4ce..804133b2fb 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -23,6 +23,9 @@ endif
 VERSION = $(shell cat VERSION)
 ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS -e GOOS -e GOARCH -e GOARM -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION)
 
+# Some Dockerfiles use features that are only supported with BuildKit enabled
+export DOCKER_BUILDKIT=1
+
 # build docker image (dockerfiles/Dockerfile.build)
 .PHONY: build_docker_image
 build_docker_image: