diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6a2a3a0..b27983bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
   logout:
@@ -45,7 +45,7 @@ jobs:
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           logout: ${{ matrix.logout }}
 
@@ -175,7 +175,7 @@ jobs:
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
   gitlab:
diff --git a/README.md b/README.md
index f2de6f69..99d2dbf7 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,7 @@ jobs:
 
 ### GitHub Container Registry
 
-To use the [GitHub Container Registry](https://docs.github.com/en/packages/getting-started-with-github-container-registry),
-you need to [enable this feature for your personal or organization account](https://docs.github.com/en/packages/guides/enabling-improved-container-support).
-
-To [authenticate against it](https://docs.github.com/en/packages/guides/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry),
+To authenticate against the [GitHub Container Registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry),
 use the [`GITHUB_TOKEN`](https://docs.github.com/en/actions/reference/authentication-in-a-workflow) for the best
 security and experience.
 
@@ -78,7 +75,7 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 ```