diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index ff03c4b..96ab8c5 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -1,4 +1,4 @@
-name: Build multi-arch Docker Images via buildx
+name: Build multi-platform docker images via buildx
 
 on:
   pull_request:
@@ -7,40 +7,60 @@ on:
   push:
     branches:
       - master
+    tags:
+      - 'v*.*.*'
 
 jobs:
-  docker-buildx:
+  docker:
     runs-on: ubuntu-latest
-    env:
-      DOCKER_IMAGE_NAME: vx3r/wg-gen-web
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       -
-        name: Set sha_short
-        id: vars
-        run: echo ::set-output name=sha_short::$(git rev-parse --short HEAD)
+        name: Set Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=vx3r/wg-gen-web
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+          VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+          VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          if [ "${{ github.event_name }}" = "push" ]; then
+          TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
+          fi
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          echo ::set-output name=sha_short::$(git rev-parse --short HEAD)
       -
-        name: Build Docker Images Only
-        if: github.event_name == 'pull_request'
-        uses: ilteoood/docker_buildx@master
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          publish: false
-          tag: dev
-          dockerFile: ./Dockerfile
-          platform: linux/amd64,linux/arm64,linux/arm/v7
-          imageName: ${{ env.DOCKER_IMAGE_NAME }}
+          username: ${{ secrets.DOCKER_LOGIN_USERNAME }}
+          password: ${{ secrets.DOCKER_LOGIN_PASSWORD }}
       -
-        name: Build and Publish Docker Images
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        uses: ilteoood/docker_buildx@master
+        name: Build and push
+        uses: docker/build-push-action@v2
         with:
-          publish: true
-          tag: latest
-          dockerFile: ./Dockerfile
-          platform: linux/amd64,linux/arm64,linux/arm/v7
-          imageName: ${{ env.DOCKER_IMAGE_NAME }}
-          dockerHubUser: ${{ secrets.DOCKER_LOGIN_USERNAME }}
-          dockerHubPassword: ${{ secrets.DOCKER_LOGIN_PASSWORD }}
-          buildArg: COMMIT=${{ steps.vars.outputs.sha_short }}
\ No newline at end of file
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+          build-args: |
+            COMMIT=${{ steps.prep.outputs.version }}
\ No newline at end of file