diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 614614a4..ef9cf270 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -30,10 +30,10 @@ jobs:
 
     - name: Build and push to GitHub Container Registry
       run: |
-        docker build -t ghcr.io/${{ github.repository }}:latest .
-        docker push ghcr.io/${{ github.repository }}:latest
+        docker build -t ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest .
+        docker push ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest
 
     - name: Build and push to Docker Hub
       run: |
-        docker build -t ${{ github.repository }}:latest .
-        docker push ${{ github.repository }}:latest
\ No newline at end of file
+        docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest .
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest
\ No newline at end of file