diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 641be41..755ca87 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - "*"
+    branches:
+      - "main"
   pull_request:
     branches:
       - "main"
@@ -34,7 +36,7 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=sha
-            type=match,pattern=(\d+.\d+.\d+)-\d+,group=1
+            type=semver,pattern={{version}}
 
       - uses: docker/setup-buildx-action@v1
         with:
diff --git a/.github/workflows/revbot.yml b/.github/workflows/revbot.yml
deleted file mode 100644
index 3636641..0000000
--- a/.github/workflows/revbot.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: revbot
-
-on:
-  push:
-    branches:
-      - "main"
-
-jobs:
-  revbot:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - id: revbot
-        run: echo "::set-output name=new_tag::$(head -n1 VERSION)-$(date +%Y%m%d)"
-
-      # REVBOT_TOKEN requires 'repo' access.
-      # Don't use GITHUB_TOKEN if you want this commit to trigger other workflows.
-      - uses: richardsimko/update-tag@v1
-        with:
-          tag_name: ${{ steps.revbot.outputs.new_tag }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.REVBOT_TOKEN }}