diff --git a/.gitea/workflows/delete-preview.yml b/.gitea/workflows/delete-preview.yml
new file mode 100644
index 0000000..b3f8d21
--- /dev/null
+++ b/.gitea/workflows/delete-preview.yml
@@ -0,0 +1,19 @@
+name: delete closed PR preview s3
+
+on:
+  pull_request:
+    types: [closed]
+
+env:
+  AWS_REGION: eu-central-1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  delete_preview:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install aws cli
+        run: apt update -y && apt install -y awscli
+      - name: delete bucket
+        run: aws s3 rb s3://preview-gitea-org-website-${{ github.event.repository.name }}-${{ github.event.number }} --force || /bin/true
diff --git a/.gitea/workflows/test-pr.yml b/.gitea/workflows/test-pr.yml
index ffe9ae9..1af7071 100644
--- a/.gitea/workflows/test-pr.yml
+++ b/.gitea/workflows/test-pr.yml
@@ -29,14 +29,14 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
-          aws s3api create-bucket --acl public-read --bucket preview-gitea-org-website-${{ github.event.pull_request.head.repo.name }}-${{ github.event.pull_request.number }} --region ${{ env.AWS_REGION }} --create-bucket-configuration LocationConstraint=${{ env.AWS_REGION }} || /bin/true
-          aws s3 website s3://preview-gitea-org-website-${{ github.event.pull_request.head.repo.name }}-${{ github.event.pull_request.number }}/ --index-document index.html --error-document error.html || /bin/true
+          aws s3api create-bucket --acl public-read --bucket preview-gitea-org-website-${{ github.event.repository.name }}-${{ github.event.number }} --region ${{ env.AWS_REGION }} --create-bucket-configuration LocationConstraint=${{ env.AWS_REGION }} || /bin/true
+          aws s3 website s3://preview-gitea-org-website-${{ github.event.repository.name }}-${{ github.event.number }}/ --index-document index.html --error-document error.html || /bin/true
       - name: "[PR] deploy website to S3 bucket"
         uses: https://github.com/jakejarvis/s3-sync-action@master
         with:
           args: --acl public-read --follow-symlinks --delete
         env:
-          AWS_S3_BUCKET: preview-gitea-org-website-${{ github.event.pull_request.head.repo.name }}-${{ github.event.pull_request.number }}
+          AWS_S3_BUCKET: preview-gitea-org-website-${{ github.event.repository.name }}-${{ github.event.number }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ env.AWS_REGION }}}
@@ -46,5 +46,5 @@ jobs:
         env:
           GITEA_TOKEN: ${{ secrets.COMMENT_ACCESS_TOKEN }}
         run: |
-          'COMMENTS=$(curl -sL -X GET -H "Authorization: token $GITEA_TOKEN" https://gitea.com/api/v1/repos/${{ github.event.pull_request.head.repo.owner }}/${{ github.event.pull_request.head.repo.name }}/issues/${{ github.event.pull_request.number }}/comments)'
-          'if [[ $COMMENTS == "[]" ]]; then curl -sL -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-type: application/json" https://gitea.com/api/v1/repos/${{ github.event.pull_request.head.repo.owner }}/${{ github.event.pull_request.head.repo.name }}/issues/${{ github.event.pull_request.number }}/comments -d "{\"body\": \"Website preview: http://preview-gitea-org-website-${{ github.event.pull_request.head.repo.name }}-${{ github.event.pull_request.number }}.s3-website.${{ env.AWS_REGION }}}.amazonaws.com/\"}"; else echo -e "\n INFO: Comment already exist, doing nothing"; fi'
+          'COMMENTS=$(curl -sL -X GET -H "Authorization: token $GITEA_TOKEN" https://gitea.com/api/v1/repos/${{ github.event.repository.owner }}/${{ github.event.repository.name }}/issues/${{ github.event.number }}/comments)'
+          'if [[ $COMMENTS == "[]" ]]; then curl -sL -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-type: application/json" https://gitea.com/api/v1/repos/${{ github.event.repository.owner }}/${{ github.event.repository.name }}/issues/${{ github.event.number }}/comments -d "{\"body\": \"Website preview: http://preview-gitea-org-website-${{ github.event.repository.name }}-${{ github.event.number }}.s3-website.${{ env.AWS_REGION }}}.amazonaws.com/\"}"; else echo -e "\n INFO: Comment already exist, doing nothing"; fi'