diff --git a/.github/workflows/server-publish.yml b/.github/workflows/server-publish.yml
index 1ba1935171d5f3c5dba700c4e6669b34227e8507..b5aabbb8a2dfc4037b373df1cdfecbb1574f184c 100644
--- a/.github/workflows/server-publish.yml
+++ b/.github/workflows/server-publish.yml
@@ -38,3 +38,8 @@ jobs:
                   tags: ${{ inputs.commit }}, latest
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Tag as server/ghcr
+              run: |
+                  git tag -f server/ghcr
+                  git push -f origin server/ghcr
diff --git a/server/docs/publish.md b/server/docs/publish.md
index de4849d900f7870ed252605f5c524b8799264ab6..3a49a47611cd92ee30feace40d8227e7c50192d8 100644
--- a/server/docs/publish.md
+++ b/server/docs/publish.md
@@ -39,3 +39,7 @@ combine both these steps too.
 Once the workflow completes, the resultant image will be available at
 `ghcr.io/ente-io/server`. The image will be tagged by the commit SHA. The latest
 image will also be tagged, well, "latest".
+
+The workflow will also tag the commit it used to build the image with
+`server/ghcr`. This tag will be overwritten on each publish, and it'll point to
+the code that was used in the most recent publish.