diff --git a/.github/workflows/starguard.yml b/.github/workflows/starguard.yml
index 072c65c..e5ca77b 100644
--- a/.github/workflows/starguard.yml
+++ b/.github/workflows/starguard.yml
@@ -1,4 +1,4 @@
-name: Publish Docker images to ghcr.io
+name: Publish Docker images to GitHub Packages
 
 on:
   push:
@@ -17,10 +17,10 @@ jobs:
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2.1.0
+      - name: Log in to the GitHub Packages registry
+        uses: docker/login-action@v2
         with:
-          registry: ghcr.io
+          registry: https://ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -30,10 +30,8 @@ jobs:
 
       - name: Tag and push bot image
         run: |
-          docker tag starguard-bot:latest ghcr.io/${{ github.repository_owner }}/starguard-bot:${{ github.sha }}
-          docker push ghcr.io/${{ github.repository_owner }}/starguard-bot:${{ github.sha }}
-          docker tag starguard-bot:latest ghcr.io/${{ github.repository_owner }}/starguard-bot:latest
-          docker push ghcr.io/${{ github.repository_owner }}/starguard-bot:latest
+          docker tag starguard-bot:latest ghcr.io/${{ github.repository }}:bot
+          docker push ghcr.io/${{ github.repository }}:bot
 
   build-and-push-image-server:
     runs-on: ubuntu-latest
@@ -45,10 +43,10 @@ jobs:
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2.1.0
+      - name: Log in to the GitHub Packages registry
+        uses: docker/login-action@v2
         with:
-          registry: ghcr.io
+          registry: https://ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -58,7 +56,5 @@ jobs:
 
       - name: Tag and push server image
         run: |
-          docker tag starguard-server:latest ghcr.io/${{ github.repository_owner }}/starguard-server:${{ github.sha }}
-          docker push ghcr.io/${{ github.repository_owner }}/starguard-server:${{ github.sha }}
-          docker tag starguard-server:latest ghcr.io/${{ github.repository_owner }}/starguard-server:latest
-          docker push ghcr.io/${{ github.repository_owner }}/starguard-server:latest
+          docker tag starguard-server:latest ghcr.io/${{ github.repository }}:server
+          docker push ghcr.io/${{ github.repository }}:server