diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 9936e4a5..3c8a89a6 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -5,6 +5,7 @@ name: Create and publish a Docker image
 on:
   push:
     branches: ['master']
+    tags: 'v*'
 
 env:
   REGISTRY: ghcr.io
@@ -30,6 +31,10 @@ jobs:
         uses: docker/metadata-action@548e2346a9987b56d8a4104fe776321ff8e23440
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: latest=true
+          tags: |
+            type=semver,pattern={{version}}
+            type=sha,prefix=
 
       - name: Build and push Docker image
         uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229
diff --git a/README.rst b/README.rst
index 4976d9a6..8d9ae211 100644
--- a/README.rst
+++ b/README.rst
@@ -51,8 +51,8 @@ If you do not want to install any additional libraries/dependencies you can use
 
 Example for external web site check::
 
-  docker run --rm -it -u $(id -u):$(id -g) ghcr.io/linkchecker/linkchecker:master --verbose https://www.example.com
+  docker run --rm -it -u $(id -u):$(id -g) ghcr.io/linkchecker/linkchecker:latest --verbose https://www.example.com
 
 Local HTML file check::
 
-  docker run --rm -it -u $(id -u):$(id -g) -v "$PWD":/mnt ghcr.io/linkchecker/linkchecker:master --verbose index.html
+  docker run --rm -it -u $(id -u):$(id -g) -v "$PWD":/mnt ghcr.io/linkchecker/linkchecker:latest --verbose index.html