diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81ff14a..52c44d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,14 +3,10 @@ stages:
 
 variables:
   IMAGE_NAME: thallian/alpine-s6
+  CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
 
 build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-    - docker build -t $IMAGE_NAME:latest .
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE_NAME:latest
+    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --tag "$IMAGE_NAME:latest" --push .