diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..d6cd259
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,51 @@
+name: Build and publish Docker image
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Build Docker image
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest,enable=${{ github.ref != 'refs/heads/master' }}
+            type=edge
+          flavor: |
+            latest=false
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
deleted file mode 100644
index 57903f1..0000000
--- a/.github/workflows/on-push.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Build on push
-
-permissions:
-  packages: write
-
-on:
-    push:
-        branches:
-            - main
-            - master
-
-jobs:
-  build:
-    name: Build image
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout project
-        uses: actions/checkout@v2
-
-      - name: Set env variables
-        run: |
-          echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')" >> $GITHUB_ENV
-          IMAGE_NAME="${GITHUB_REPOSITORY#*/}"
-          echo "IMAGE_NAME=${IMAGE_NAME//docker-/}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-        id: qemu
-
-      - name: Setup Docker buildx action
-        uses: docker/setup-buildx-action@v1
-        id: buildx
-
-      - name: Run Docker buildx
-        run: |
-                docker buildx build \
-                --platform linux/amd64,linux/arm64 \
-                --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$BRANCH \
-                --output "type=registry" ./
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
deleted file mode 100644
index f35c595..0000000
--- a/.github/workflows/on-tag.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Build on tag
-
-permissions:
-  packages: write
-
-on:
-  push:
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-      - v[0-9]+.[0-9]+.[0-9]+-*
-
-jobs:
-  build:
-    name: Build image
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout project
-        uses: actions/checkout@v2
-
-      - name: Set env variables
-        run: |
-          echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-          IMAGE_NAME="${GITHUB_REPOSITORY#*/}"
-          echo "IMAGE_NAME=${IMAGE_NAME//docker-/}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-        id: qemu
-
-      - name: Setup Docker buildx action
-        uses: docker/setup-buildx-action@v1
-        id: buildx
-
-      - name: Run Docker buildx
-        run: |
-                docker buildx build \
-                --platform linux/amd64,linux/arm64 \
-                --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$BRANCH \
-                --output "type=registry" ./