diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e08f22f..94c3082 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,9 +17,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t ${{ github.repository }}:ubuntu-22.04 -f ./Dockerfile.ubuntu-2204 .
+        run: docker build -t gameservermanagers/linuxgsm:ubuntu-22.04 -f ./Dockerfile.ubuntu-2204 .
       - name: Test
-        run: docker run --rm ${{ github.repository }}:ubuntu-22.04 ./linuxgsm.sh list
+        run: docker run --rm gameservermanagers/linuxgsm:ubuntu-22.04 ./linuxgsm.sh list
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with:
@@ -54,9 +54,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t ${{ github.repository }}:ubuntu-20.04 -f ./Dockerfile.ubuntu-2004 .
+        run: docker build -t gameservermanagers/linuxgsm:ubuntu-20.04 -f ./Dockerfile.ubuntu-2004 .
       - name: Test
-        run: docker run --rm ${{ github.repository }}:ubuntu-20.04 ./linuxgsm.sh list
+        run: docker run --rm gameservermanagers/linuxgsm:ubuntu-20.04 ./linuxgsm.sh list
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with:
@@ -89,9 +89,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t ${{ github.repository }}:ubuntu-18.04 -f ./Dockerfile.ubuntu-1804 .
+        run: docker build -t gameservermanagers/linuxgsm:ubuntu-18.04 -f ./Dockerfile.ubuntu-1804 .
       - name: Test
-        run: docker run --rm ${{ github.repository }}:ubuntu-18.04 ./linuxgsm.sh list
+        run: docker run --rm gameservermanagers/linuxgsm:ubuntu-18.04 ./linuxgsm.sh list
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with: