diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index edf9bc3..07cd8fc 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -3,8 +3,6 @@ name: Build and push docker images
 
 env:
   DOCKERHUB_REPOSITORY: traccar/traccar
-  DOCKERHUB_IMAGE_TAGS:
-  DOCKERHUB_IMAGE_EXTEND_PLATFORMS:
 
 on:
   push:
@@ -52,18 +50,20 @@ jobs:
           _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_MAJOR_VERSION"
         fi
         echo "DOCKERHUB_IMAGE_TAGS=$_DOCKERHUB_IMAGE_TAGS" >> $GITHUB_ENV
-    - name: Set environment DOCKERHUB_IMAGE_EXTEND_PLATFORMS
+    - name: Set environment DOCKERHUB_IMAGE_PLATFORMS
       run: |
+        _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64"
         if [ "${{ matrix.os }}" == "alpine" ]; then
-          echo "DOCKERHUB_IMAGE_EXTEND_PLATFORMS=,linux/386,linux/arm/v6" >> $GITHUB_ENV
+          _DOCKERHUB_IMAGE_PLATFORMS+=",linux/386,linux/arm/v6"
         elif [ "${{ matrix.os }}" == "ubuntu" ]; then
-          echo "DOCKERHUB_IMAGE_EXTEND_PLATFORMS=,linux/arm/v7,linux/arm64/v8" >> $GITHUB_ENV
+          _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64"
         fi
+        echo "DOCKERHUB_IMAGE_PLATFORMS=$_DOCKERHUB_IMAGE_PLATFORMS" >> $GITHUB_ENV
     - name: Build and push
       if: env.DOCKERHUB_IMAGE_TAGS != ''
       uses: docker/build-push-action@v2
       with:
         file: Dockerfile.${{ matrix.os }}
         tags: ${{ env.DOCKERHUB_IMAGE_TAGS }}
-        platforms: linux/amd64${{ env.DOCKERHUB_IMAGE_EXTEND_PLATFORMS }}
+        platforms: ${{ env.DOCKERHUB_IMAGE_PLATFORMS }}
         push: true