diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d0bf09009ffe1376a549d2e70ac30844045821ab..6f2c225635d86c7321ff037c5475930b5fb873fc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -35,11 +35,11 @@ jobs:
         run: |
           brew_version=${GITHUB_REF:10}
           echo "::set-env name=brew_version::$brew_version"
-          docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
-          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
-          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:latest"
-          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:latest"
+          docker login ghcr.io -u BrewTestBot -p ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
+          docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
+          docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
 
       - name: Deploy the tagged Docker image to Docker Hub
         if: startsWith(github.ref, 'refs/tags/')
@@ -53,10 +53,10 @@ jobs:
       - name: Deploy the homebrew/brew Docker image to GitHub and Docker Hub
         if: startsWith(github.ref, 'refs/tags/') && matrix.version == '20.04'
         run: |
-          docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$brew_version"
-          docker push "docker.pkg.github.com/homebrew/brew/brew:$brew_version"
-          docker tag brew "docker.pkg.github.com/homebrew/brew/brew:latest"
-          docker push "docker.pkg.github.com/homebrew/brew/brew:latest"
+          docker tag brew "ghcr.io/homebrew/brew:$brew_version"
+          docker push "ghcr.io/homebrew/brew:$brew_version"
+          docker tag brew "ghcr.io/homebrew/brew:latest"
+          docker push "ghcr.io/homebrew/brew:latest"
           docker tag brew "homebrew/brew:$brew_version"
           docker push "homebrew/brew:$brew_version"
           docker tag brew "homebrew/brew:latest"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dc6e478d4293257f7dc8c2b7f9d6efdec8ed087f..1d7751e1d7512210b1d03bd3622525776f88151b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -142,9 +142,9 @@ jobs:
     - name: Deploy the Docker image to GitHub and Docker Hub
       if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
       run: |
-        docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu16.04:master"
-        docker push "docker.pkg.github.com/homebrew/brew/ubuntu16.04:master"
+        docker login ghcr.io -u BrewTestBot -p ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
+        docker tag brew "ghcr.io/homebrew/ubuntu16.04:master"
+        docker push "ghcr.io/homebrew/ubuntu16.04:master"
         docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
         docker tag brew "homebrew/ubuntu16.04:master"
         docker push "homebrew/ubuntu16.04:master"