diff --git a/.github/workflows/publish-releases.yml b/.github/workflows/publish-releases.yml
index 405440207..609038b6f 100644
--- a/.github/workflows/publish-releases.yml
+++ b/.github/workflows/publish-releases.yml
@@ -3,6 +3,7 @@ name: Publish releases
 on: workflow_dispatch
 
 permissions:
+  contents: write
   packages: write
 
 jobs:
@@ -29,6 +30,17 @@ jobs:
           ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
+      - name: Tag version
+        run: |
+          VERSION=$(./gradlew -p springwolf-core properties | grep "version:" | awk '{print $2}')
+          TAG="springwolf-core-$VERSION"
+          git tag "$TAG"
+
+          echo "Publishing tag"
+          git push origin "$TAG" || true # Do not fail, if the tag already exists
+        env:
+          ORG_GRADLE_PROJECT_SNAPSHOT: false
+
   publish-springwolf-amqp-release:
     runs-on: ubuntu-latest
     steps:
@@ -52,6 +64,17 @@ jobs:
           ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
+      - name: Tag version
+        run: |
+          VERSION=$(./gradlew -p springwolf-plugins/springwolf-amqp-plugin properties | grep "version:" | awk '{print $2}')
+          TAG="springwolf-amqp-$VERSION"
+          git tag "$TAG"
+
+          echo "Publishing tag"
+          git push origin "$TAG" || true # Do not fail, if the tag already exists
+        env:
+          ORG_GRADLE_PROJECT_SNAPSHOT: false
+
   publish-springwolf-kafka-release:
     runs-on: ubuntu-latest
     steps:
@@ -75,6 +98,17 @@ jobs:
           ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
+      - name: Tag version
+        run: |
+          VERSION=$(./gradlew -p springwolf-plugins/springwolf-kafka-plugin properties | grep "version:" | awk '{print $2}')
+          TAG="springwolf-kafka-$VERSION"
+          git tag "$TAG"
+
+          echo "Publishing tag"
+          git push origin "$TAG" || true # Do not fail, if the tag already exists
+        env:
+          ORG_GRADLE_PROJECT_SNAPSHOT: false
+
   publish-springwolf-cloud-stream-release:
     runs-on: ubuntu-latest
     steps:
@@ -97,3 +131,14 @@ jobs:
           ORG_GRADLE_PROJECT_SIGNINGPASSWORD: ${{secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD}}
           ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+
+      - name: Tag version
+        run: |
+          VERSION=$(./gradlew -p springwolf-plugins/springwolf-cloud-stream-plugin properties | grep "version:" | awk '{print $2}')
+          TAG="springwolf-cloud-stream-$VERSION"
+          git tag "$TAG"
+
+          echo "Publishing tag"
+          git push origin "$TAG" || true # Do not fail, if the tag already exists
+        env:
+          ORG_GRADLE_PROJECT_SNAPSHOT: false
diff --git a/RELEASING.md b/RELEASING.md
index 0cb984b2f..0560b0438 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -5,10 +5,9 @@ The following lists describe the steps necessary to release a new version.
 ## springwolf-core
 1. Update version number in `springwolf-core/build.gradle`
 2. Run all tests (including all examples + integration)
-3. Tag commit
-4. Run github `Publish releases` pipeline
-5. Release version in nexus
-6. Update version number on website
+3. Run github `Publish releases` pipeline
+4. Release version in nexus
+5. Update version number on website
 
 ## Plugins
 
@@ -20,10 +19,9 @@ The following lists describe the steps necessary to release a new version.
    4. `springwolf-examples/springwolf-amqp-example/docker-compose.yml`
 2. Run all tests (including all examples + integration)
 3. Run docker compose and manually test ui
-4. Tag commit
-5. Run github `Publish releases` pipeline
-6. Release version in nexus
-7. Update version number on website
+4. Run github `Publish releases` pipeline
+5. Release version in nexus
+6. Update version number on website
 
 ### springwolf-cloud-stream
 1. Update version number in
@@ -32,10 +30,9 @@ The following lists describe the steps necessary to release a new version.
    3. `springwolf-examples/springwolf-cloud-stream-example/docker-compose.yml`
 2. Run all tests (including all examples + integration)
 3. Run docker compose and manually test ui
-4. Tag commit
-5. Run github `Publish releases` pipeline
-6. Release version in nexus
-7. Update version number on website
+4. Run github `Publish releases` pipeline
+5. Release version in nexus
+6. Update version number on website
 
 ### springwolf-kafka
 1. Update version number in
@@ -45,7 +42,6 @@ The following lists describe the steps necessary to release a new version.
    4. `springwolf-examples/springwolf-kafka-example/docker-compose.yml`
 2. Run all tests (including all examples + integration)
 3. Run docker compose and manually test ui
-4. Tag commit
-5. Run github `Publish releases` pipeline
-6. Release version in nexus
-7. Update version number on website
+4. Run github `Publish releases` pipeline
+5. Release version in nexus
+6. Update version number on website