diff --git a/.github/workflows/build-and-push-on-tag.yaml b/.github/workflows/build-and-push-on-tag.yaml
index 1fb196a..d9a7500 100644
--- a/.github/workflows/build-and-push-on-tag.yaml
+++ b/.github/workflows/build-and-push-on-tag.yaml
@@ -4,7 +4,7 @@ name: Build and push Docker Image on Tag
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9].[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'
 jobs:
   pre_build:
     runs-on: ubuntu-latest
@@ -16,7 +16,7 @@ jobs:
         uses: olegtarasov/get-tag@v2.1
         id: tag
         with:
-          tagRegex: "(?<tag>[0-9]+.[0-9]+.[0-9]+.[0-9]+)"
+          tagRegex: "(?<tag>[0-9]+.[0-9]+.[0-9]+)(?<suffix>.[0-9]+)"
   build_and_push:
     needs: pre_build
     uses: hpi-schul-cloud/infra-tools/.github/workflows/build-and-push.yaml@master
@@ -24,3 +24,4 @@ jobs:
       registry: ghcr.io
       image: dbildungsplattform/etherpad
       tag: ${{ needs.pre_build.outputs.tag }}
+      suffix: ${{ needs.pre_build.outputs.suffix }}