diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9c65a1..200005b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+variables:
+    CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
 stages:
   - build
 
@@ -8,10 +10,6 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform linux/amd64,linux/arm64 .
-    - 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 --tag $IMAGE_NAME:$CI_COMMIT_SHA --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:$CI_COMMIT_REF_NAME --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:latest --push .