diff --git a/.github/workflows/deploy-preview.yaml b/.github/workflows/deploy-preview.yaml
index 1a8e2b0..2b73514 100644
--- a/.github/workflows/deploy-preview.yaml
+++ b/.github/workflows/deploy-preview.yaml
@@ -54,15 +54,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       preview_url: ${{ steps.print-preview-url.outputs.preview_url }}
-      pr_number: ${{ steps.sanitize_pr_name.outputs.PR_ID }}
-      pr_name: ${{ steps.sanitize_pr_name.outputs.PR_ID }}-${{ steps.repo_name.outputs.REPO_NAME }}
+      pr_name: "pr-${{ github.event.pull_request.number }}-${{ steps.repo_name.outputs.REPO_NAME }}"
     steps:
-      - name: Sanitize pull request Name
-        id: sanitize_pr_name
-        shell: bash
-        run: |
-          echo "PR_ID=pr-$(echo "$GITHUB_REF" | awk -F / '{print $3}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
       - name: Repository name
         id: repo_name
         shell: bash
@@ -72,7 +65,7 @@ jobs:
       - name: Print preview URL
         id: print-preview-url
         shell: bash
-        run: echo "preview_url=https://${{ steps.sanitize_pr_name.outputs.PR_ID }}-${{ steps.repo_name.outputs.REPO_NAME }}.preview.dignio.dev" >> $GITHUB_OUTPUT
+        run: echo "preview_url=https://pr-${{ github.event.pull_request.number }}-${{ steps.repo_name.outputs.REPO_NAME }}.preview.dignio.dev" >> $GITHUB_OUTPUT
 
   build_and_push:
     runs-on: ubuntu-latest
@@ -109,7 +102,7 @@ jobs:
           flavor: |
             latest=false
           tags: |
-            type=raw,value=preview-${{ needs.setup.outputs.pr_number }}
+            type=raw,value=preview-pr-${{ github.event.pull_request.number }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
@@ -231,9 +224,9 @@ jobs:
         uses: octokit/request-action@v2.x
         id: create_commit_status
         with:
-          name: "${{ needs.setup.outputs.pr_number }} deploy preview"
+          name: "pr-${{ github.event.pull_request.number }} deploy preview"
           description: Deploy Preview ready! Click Details to browse to it.
-          context: "Preview - ${{ needs.setup.outputs.pr_number }}"
+          context: "Preview - pr-${{ github.event.pull_request.number }}"
           owner: dignio
           repo: ${{ github.event.repository.name }}
           state: success