diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ce422a0..f4f60ec 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -78,7 +78,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ${{ env.REGISTRY }}/cedar2025/xboard:latest,${{ env.REGISTRY }}/cedar2025/xboard,${{ env.REGISTRY }}/cedar2025/xboard:${{ steps.get_version.outputs.version }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:latest,${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard,${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:${{ steps.get_version.outputs.version }}
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker