diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fab5c250ce..587a5b06fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,13 +130,22 @@ jobs:
       run: docker login $REGISTRY -u $GITHUB_ACTOR -p $GITHUB_TOKEN
     - name: Docker Pull short-sha
       run: docker pull $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:${{ steps.vars.outputs.sha_short }}
-    - name: Docker Tag
-      run: docker tag $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:${{ steps.vars.outputs.sha_short }} $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:latest 
     - name: Semantic Release
       uses: cycjimmy/semantic-release-action@v2
       with:
-        dry_run: false
+        dry_run:  false
         semantic_version: 17.0.4
         extra_plugins: |
-          semantic-release-docker@v2.2.0
-          
\ No newline at end of file
+          @semantic-release/exec@5.0.0
+    - name: Docker Tag Version
+      run: docker tag $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:${{ steps.vars.outputs.sha_short }} $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:$CAOS_NEXT_VERSION
+      if: env.CAOS_NEXT_VERSION !=  ''
+    - name: Docker Tag Latest
+      run: docker tag $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:${{ steps.vars.outputs.sha_short }} $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:latest
+      if: env.CAOS_NEXT_VERSION !=  ''
+    - name: Docker Push Version
+      run: docker push $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:$CAOS_NEXT_VERSION
+      if: env.CAOS_NEXT_VERSION !=  ''
+    - name: Docker Push Latest
+      run: docker push $REGISTRY/$GITHUB_REPOSITORY/$IMAGE:latest
+      if: env.CAOS_NEXT_VERSION !=  ''
diff --git a/.releaserc.js b/.releaserc.js
index b0190ca6b5..5c80756feb 100644
--- a/.releaserc.js
+++ b/.releaserc.js
@@ -4,10 +4,8 @@ module.exports = {
         "@semantic-release/commit-analyzer",
         "@semantic-release/release-notes-generator",
         "@semantic-release/github",
-        ["semantic-release-docker", {
-            "registryUrl": "docker.pkg.github.com",
-            "name": "caos/zitadel/zitadel"
-            }
-        ],
+        ["@semantic-release/exec", {
+            "publishCmd": "echo '::set-env name=CAOS_NEXT_VERSION::${nextRelease.version}'"
+            }],
     ]
 };
\ No newline at end of file
diff --git a/README.md b/README.md
index 624c0aa68a..2543408c36 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![ZITADEL](./raw/img/zitadel-logo-oneline-lightdesign@2x.png)
+![ZITADEL](./docs/img/zitadel-logo-oneline-lightdesign@2x.png)
 
 # Zitadel
 
diff --git a/raw/img/zitadel-logo-oneline-lightdesign@2x.png b/docs/img/zitadel-logo-oneline-lightdesign@2x.png
similarity index 100%
rename from raw/img/zitadel-logo-oneline-lightdesign@2x.png
rename to docs/img/zitadel-logo-oneline-lightdesign@2x.png