diff --git a/container/dist.dockerfile b/container/dist.dockerfile
index b16f432e4..66ece521f 100644
--- a/container/dist.dockerfile
+++ b/container/dist.dockerfile
@@ -1,10 +1,11 @@
-FROM ghcr.io/searxng/base:searxng AS dist
-
 ARG CONTAINER_IMAGE_ORGANIZATION="searxng"
 ARG CONTAINER_IMAGE_NAME="searxng"
 
-COPY --chown=searxng:searxng --from=localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder /usr/local/searxng/.venv/ ./.venv/
-COPY --chown=searxng:searxng --from=localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder /usr/local/searxng/searx/ ./searx/
+FROM localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder AS builder
+FROM ghcr.io/searxng/base:searxng AS dist
+
+COPY --chown=searxng:searxng --from=builder /usr/local/searxng/.venv/ ./.venv/
+COPY --chown=searxng:searxng --from=builder /usr/local/searxng/searx/ ./searx/
 COPY --chown=searxng:searxng ./container/ ./
 #COPY --chown=searxng:searxng ./searx/version_frozen.py ./searx/
 
diff --git a/utils/lib_sxng_container.sh b/utils/lib_sxng_container.sh
index 27d6c5414..eee218c06 100644
--- a/utils/lib_sxng_container.sh
+++ b/utils/lib_sxng_container.sh
@@ -62,6 +62,10 @@ container.build() {
     esac
     info_msg "Selected platform: $platform"
 
+    if [ "$container_engine" = "docker" ] && ! docker buildx version &>/dev/null; then
+        die 42 "docker buildx is not installed: https://docs.docker.com/go/buildx/"
+    fi
+
     pyenv.install
 
     (