diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1979b40..5f17975 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Build the Docker image
-      run: docker build . --file ./OpenMediaServer/Dockerfile --tag ghcr.io/${{ github.repository_owner }}/openmediaserver:latest
+      run: docker build . --file ./OpenMediaServer/Dockerfile --tag ghcr.io/openmediastation/openmediaserver:latest
 
     - name: Log in to GitHub Docker Registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
     - name: Push Docker image to GitHub Packages
-      run: docker push ghcr.io/${{ github.repository_owner }}/openmediaserver:latest
+      run: docker push ghcr.io/openmediastation/openmediaserver:latest