diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml
index a36a9a4..ce734b0 100644
--- a/.github/workflows/update-base-image.yml
+++ b/.github/workflows/update-base-image.yml
@@ -37,10 +37,10 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/sethsimmons/simple-monerod:latest
-            ghcr.io/sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
-            sethsimmons/simple-monerod:latest
-            sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
+            ghcr.io/${{ github.repository_owner }}/simple-monerod:latest
+            ghcr.io/${{ github.repository_owner }}/simple-monerod:${{ steps.get_tag.outputs.tag }}
+            ${{ secrets.DOCKER_USERNAME }}/simple-monerod:latest
+            ${{ secrets.DOCKER_USERNAME }}/simple-monerod:${{ steps.get_tag.outputs.tag }}
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
diff --git a/.github/workflows/update-image-on-push.yml b/.github/workflows/update-image-on-push.yml
index 181aa67..d207389 100644
--- a/.github/workflows/update-image-on-push.yml
+++ b/.github/workflows/update-image-on-push.yml
@@ -38,10 +38,10 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/sethsimmons/simple-monerod:latest
-            ghcr.io/sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
-            sethsimmons/simple-monerod:latest
-            sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
+            ghcr.io/${{ github.repository_owner }}/simple-monerod:latest
+            ghcr.io/${{ github.repository_owner }}/simple-monerod:${{ steps.get_tag.outputs.tag }}
+            ${{ secrets.DOCKER_USERNAME }}/simple-monerod:latest
+            ${{ secrets.DOCKER_USERNAME }}/simple-monerod:${{ steps.get_tag.outputs.tag }}
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}