diff --git a/.github/workflows/docker-publish-on-release.yml b/.github/workflows/docker-publish-on-release.yml
index 8960b80..12332c7 100644
--- a/.github/workflows/docker-publish-on-release.yml
+++ b/.github/workflows/docker-publish-on-release.yml
@@ -30,10 +30,10 @@ jobs:
         context: .
         push: true
         tags: |
-          ghcr.io/${{ github.repository }}/fortsphere:latest
-          ghcr.io/${{ github.repository }}/fortsphere:${{ github.event.release.tag_name }}
+          ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest
+          ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ github.event.release.tag_name }}
         labels: |
-          org.opencontainers.image.title=Fortsphere
+          org.opencontainers.image.title=fortsphere
           org.opencontainers.image.description="Fortify your digital sphere, one command at a time."
           org.opencontainers.image.url=https://github.com/OpenPathfinder/fortSphere
           org.opencontainers.image.source=https://github.com/OpenPathfinder/fortSphere.git