diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
index 588ff52..32b2758 100644
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@@ -3,6 +3,8 @@ name: Update docker image
 on:
   push:
     branches: [ master ]
+  tags:
+    - 'v*'
 
 jobs:
   build:
@@ -20,6 +22,18 @@ jobs:
       - name: Assemble Jar
         run: sbt assembly
 
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: librecaptcha/lc-core
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
@@ -37,8 +51,9 @@ jobs:
         with:
           context: ./
           file: ./Runner.Dockerfile
-          tags: librecaptcha/lc-core:latest
           push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}