diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 144350989f..b74e53d2df 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           brew_version=${GITHUB_REF:10}
           echo "brew_version=$brew_version" >> ${GITHUB_ENV}
-          echo ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}} | docker login ghcr.io -u BrewTestBot --password-stdin
+          echo ${{secrets.HOMEBREW_BREW_GITHUB_PACKAGES_TOKEN}} | docker login ghcr.io -u BrewTestBot --password-stdin
           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"
@@ -45,7 +45,7 @@ jobs:
       - name: Deploy the tagged Docker image to Docker Hub
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          echo ${{secrets.DOCKER_TOKEN}} | docker login -u brewtestbot --password-stdin
+          echo ${{secrets.HOMEBREW_BREW_DOCKER_TOKEN}} | docker login -u brewtestbot --password-stdin
           docker tag brew "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker push "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker tag brew "homebrew/ubuntu${{matrix.version}}:latest"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7bc383878b..d5b25b2b5f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -165,11 +165,11 @@ jobs:
       - name: Deploy the Docker image to GitHub Packages and Docker Hub
         if: github.ref == 'refs/heads/master'
         run: |
-          echo ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}} | \
+          echo ${{secrets.HOMEBREW_BREW_GITHUB_PACKAGES_TOKEN}} | \
             docker login ghcr.io -u BrewTestBot --password-stdin
           docker tag brew "ghcr.io/homebrew/ubuntu16.04:master"
           docker push "ghcr.io/homebrew/ubuntu16.04:master"
-          echo ${{secrets.DOCKER_TOKEN}} | \
+          echo ${{secrets.HOMEBREW_BREW_DOCKER_TOKEN}} | \
             docker login -u brewtestbot --password-stdin
           docker tag brew "homebrew/ubuntu16.04:master"
           docker push "homebrew/ubuntu16.04:master"