diff --git a/.github/workflows/build-api-image.sh b/.github/workflows/build-api-image.sh
index 491186ecb3..b3c625be11 100644
--- a/.github/workflows/build-api-image.sh
+++ b/.github/workflows/build-api-image.sh
@@ -46,7 +46,7 @@ EOF
 # Build image
 #
 cd api
-docker build \
+docker buildx build \
   ${API_CACHE_FROM_SCRIPT} \
   --platform=linux/amd64,linux/arm64,linux/arm/v7 \
   --build-arg COMMIT_SHA=${SHA} \
diff --git a/.github/workflows/build-api-image.yml b/.github/workflows/build-api-image.yml
index 4aab69ba70..0d27bca8d5 100644
--- a/.github/workflows/build-api-image.yml
+++ b/.github/workflows/build-api-image.yml
@@ -17,6 +17,9 @@ jobs:
       with:
         persist-credentials: false
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
diff --git a/.github/workflows/build-web-image.sh b/.github/workflows/build-web-image.sh
index f474cef2bc..a0d0ac44ce 100644
--- a/.github/workflows/build-web-image.sh
+++ b/.github/workflows/build-web-image.sh
@@ -46,7 +46,7 @@ EOF
 # Build image
 #
 cd web
-docker build \
+docker buildx build \
   ${WEB_CACHE_FROM_SCRIPT} \
   --build-arg COMMIT_SHA=${SHA} \
   --platform=linux/amd64,linux/arm64,linux/arm/v7 \
diff --git a/.github/workflows/build-web-image.yml b/.github/workflows/build-web-image.yml
index 0d41c34b3e..87e552c083 100644
--- a/.github/workflows/build-web-image.yml
+++ b/.github/workflows/build-web-image.yml
@@ -17,6 +17,9 @@ jobs:
       with:
         persist-credentials: false
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with: