diff --git a/.github/workflows/buildkit-image.yml b/.github/workflows/buildkit-image.yml
index 8e1fe9a9..44ea7186 100644
--- a/.github/workflows/buildkit-image.yml
+++ b/.github/workflows/buildkit-image.yml
@@ -41,8 +41,8 @@ jobs:
         if: ${{ inputs.push }}
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERBUILDBOT_USERNAME }}
-          password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
+          username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
+          password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
       -
         name: Create
         run: |
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2f600ae8..9a8e4f0b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -59,8 +59,8 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERBUILDBOT_USERNAME }}
-          password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
+          username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
+          password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
       -
         name: Build
         uses: docker/bake-action@v2
@@ -80,7 +80,6 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: peter-evans/dockerhub-description@v3
         with:
-          username: ${{ secrets.DOCKERBUILDBOT_USERNAME }}
-          password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
+          username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
+          password: ${{ secrets.DOCKERPUBLICBOT_DELETE_PAT }}
           repository: ${{ env.DOCKERHUB_SLUG }}
-