diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 2b672d1..679a33a 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -59,16 +59,23 @@ jobs:
       - name: Docker Release - Dev
         if: startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/heads/feature/')
         run: |
-          docker image tag "$IMAGE:latest" "$IMAGE:${GITHUB_REF_NAME}"
+          TAG="${GITHUB_REF_NAME//\//-}"
+          docker image tag "$IMAGE:latest" "$IMAGE:${TAG}"
 
       - name: Docker Release - Tagged
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           docker image tag "$IMAGE:latest" "$IMAGE:${GITHUB_REF_NAME}"
 
+      - name: Docker Release - PR
+        if: startsWith(github.ref, 'refs/pull/')
+        run: |
+          PR_NUM=${GITHUB_REF#refs/pull/}
+          PR_NUM=${PR_NUM%/head}
+          docker image tag "$IMAGE:latest" "$IMAGE:pr-${PR_NUM}"
 
       - name: Docker Push
-        if: startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/heads/feature/') || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/')
         env:
           USERNAME: ${{ secrets.DockerUsername }}
           PASSWORD: ${{ secrets.DockerPassword }}