diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2b35471c..19da7ec3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -53,7 +53,7 @@ repos:
     hooks:
     -   id: docker-build-client
         name: Docker - build client
-        entry: bash -c 'docker build client/'
+        entry: bash -c '<client/Dockerfile sed "s/--platform.*BUILDPLATFORM//g" | docker build -f - client/'
         language: system
         types: [file]
         files: client/
diff --git a/client/Dockerfile b/client/Dockerfile
index 8039ed29..eaca651b 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9 as builder
+FROM --platform=$BUILDPLATFORM node:9 as builder
 WORKDIR /opt/app
 
 COPY package.json package-lock.json ./
@@ -11,7 +11,7 @@ ARG CLIENT_BUILD_ARGS=""
 RUN BASE_URL="__BASEURL__" node build.js --gzip ${CLIENT_BUILD_ARGS}
 
 
-FROM scratch as approot
+FROM --platform=$BUILDPLATFORM scratch as approot
 
 COPY docker-start.sh /
 
diff --git a/client/hooks/build b/client/hooks/build
index ee588f67..eb02cbc9 100755
--- a/client/hooks/build
+++ b/client/hooks/build
@@ -7,8 +7,11 @@ else
 	BUILD_INFO="v${CLOSEST_VER}-edge-$(git rev-parse --short ${SOURCE_COMMIT})"
 fi
 
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
 echo "Using BUILD_INFO=${BUILD_INFO}"
-docker build \
+docker buildx build \
+	--platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 \
 	--build-arg BUILD_INFO=${BUILD_INFO} \
 	--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
 	--build-arg SOURCE_COMMIT \
diff --git a/client/hooks/pre_build b/client/hooks/pre_build
new file mode 100755
index 00000000..2bbc131f
--- /dev/null
+++ b/client/hooks/pre_build
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
+docker buildx create --use
diff --git a/server/hooks/build b/server/hooks/build
index fea6b426..1bba46c4 100755
--- a/server/hooks/build
+++ b/server/hooks/build
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-docker build \
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
+docker buildx build \
+	--platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 \
 	--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
 	--build-arg SOURCE_COMMIT \
 	--build-arg DOCKER_REPO \
diff --git a/server/hooks/pre_build b/server/hooks/pre_build
new file mode 100755
index 00000000..2bbc131f
--- /dev/null
+++ b/server/hooks/pre_build
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
+docker buildx create --use