diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 885dd34..6dafa3e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -26,6 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
         with:
           config: .github/buildkit.toml
+          driver: docker
       - name: Build Image
         run: ./makeimage.sh ${{ matrix.target }} ${{ matrix.variant }}
       - name: Build ffmpeg
diff --git a/generate.sh b/generate.sh
index b5ceb93..c919417 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 cd "$(dirname "$0")"
 source util/vars.sh
 
diff --git a/makeimage.sh b/makeimage.sh
index 5fe9ebf..1e7761c 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -3,16 +3,14 @@ set -xe
 cd "$(dirname "$0")"
 source util/vars.sh
 
-export DOCKER_BUILDKIT=1
-
 if [[ -z "$QUICKBUILD" ]]; then
     if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
-        docker build --tag "$BASE_IMAGE" images/base
+        docker buildx --builder default build --load --tag "$BASE_IMAGE" images/base
     fi
 
-    docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
+    docker buildx --builder default build --load --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
 fi
 
 ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
 
-exec docker build --tag "$IMAGE" .
+docker buildx --builder default build --load --tag "$IMAGE" .