diff --git a/tools/docker/build.sh b/tools/docker/build.sh
index e3ff5707a..3b4916060 100755
--- a/tools/docker/build.sh
+++ b/tools/docker/build.sh
@@ -79,7 +79,7 @@ for TARGET_ARCH in "${ALL_REQUESTED_ARCH[@]}"; do
     pushd "${REPO_ROOT}"
     DownloadQemuStatic "${TARGET_ARCH}"
     QEMU_ARCH=$(GetQemuArch "${TARGET_ARCH}")
-    docker build \
+    DOCKER_BUILDKIT=0 docker build \
         --build-arg TARGET_ARCH="${TARGET_ARCH}" \
         --build-arg QEMU_ARCH="${QEMU_ARCH}" \
         -f "${WORK_DIR}/core/Dockerfile" \
@@ -97,7 +97,7 @@ for plugin in "${CERTBOT_PLUGINS[@]}"; do
     for TARGET_ARCH in "${ALL_REQUESTED_ARCH[@]}"; do
         QEMU_ARCH=$(GetQemuArch "${TARGET_ARCH}")
         BASE_IMAGE="${DOCKER_HUB_ORG}/certbot:${TARGET_ARCH}-${TAG_BASE}"
-        docker build \
+        DOCKER_BUILDKIT=0 docker build \
             --build-arg BASE_IMAGE="${BASE_IMAGE}" \
             --build-arg QEMU_ARCH="${QEMU_ARCH}" \
             -f "${WORK_DIR}/plugin/Dockerfile" \
diff --git a/tools/docker/deploy_multiarch.sh b/tools/docker/deploy_multiarch.sh
index 893da8fa6..e604e4305 100755
--- a/tools/docker/deploy_multiarch.sh
+++ b/tools/docker/deploy_multiarch.sh
@@ -22,7 +22,7 @@ MakeMultiarchManifestForAllTargetArch() {
     echo ${SRC_IMAGES}
     docker buildx imagetools create -t ${DOCKER_REPO}:${TAG_BASE}${SRC_IMAGES}
     if [[ "${TAG_BASE}" =~ ^v([2-9]|[1-9][0-9]+)\.[0-9]+\.[0-9]+$ ]]; then
-        docker buildx imagetools create -t "${DOCKER_REPO}:latest" "${SRC_IMAGES}"
+        docker buildx imagetools create -t ${DOCKER_REPO}:latest ${SRC_IMAGES}
     fi
 }