diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 7ff7618..e0072ff 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -1,9 +1,5 @@
 name: opentrashmail ci
 
-# use either
-# ${{steps.date.outputs.date}} for date tag
-# or ${{ github.event.release.tag_name }} for github release
-
 on:
   push:
     branches: [ master ]
@@ -11,23 +7,58 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
-
     steps:
-    - name: Get current date
-      id: date
-      run: echo "::set-output name=date::$(date +%s)"
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file docker/Dockerfile --tag hascheksolutions/opentrashmail:${{ steps.date.outputs.date }} --tag hascheksolutions/opentrashmail:latest
-    -
-      name: Login to registry
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Pushing push as latest
-      run: docker push hascheksolutions/opentrashmail:latest
-    - name: Pushing to private registry
-      run: docker push hascheksolutions/opentrashmail:${{ steps.date.outputs.date }}
\ No newline at end of file
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE="hascheksolutions/opentrashmail"
+          VERSION=latest
+          SHORTREF=${GITHUB_SHA::8}
+
+          # If this is git tag, use the tag name as a docker tag
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
+
+          # If the VERSION looks like a version number, assume that
+          # this is the most recent version of the image and also
+          # tag it 'latest'.
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+          fi
+
+          # Set output parameters.
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@master
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.prep.outputs.tags }}
\ No newline at end of file