diff --git a/.github/workflows/.e2e-run.yml b/.github/workflows/.e2e-run.yml
index 5c34cc5..a76abf7 100644
--- a/.github/workflows/.e2e-run.yml
+++ b/.github/workflows/.e2e-run.yml
@@ -130,6 +130,8 @@ jobs:
         name: Login to Registry
         if: github.event_name != 'pull_request' && (inputs.type == 'remote' || inputs.provider == 'aws' || env.REGISTRY_USER != '')
         uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        env:
+          DOCKERHUB_OIDC_CONNECTIONID: ${{ inputs.provider == 'dockerhub' && vars.DOCKERHUB_OIDC_CONNECTIONID || '' }}
         with:
           registry: ${{ env.REGISTRY_FQDN || inputs.registry }}
           username: ${{ env.REGISTRY_USER || secrets.registry_username || (inputs.registry == 'ghcr.io' && github.actor) || '' }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index dfc6871..f75b05f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -22,7 +22,7 @@ jobs:
     uses: ./.github/workflows/.e2e-run.yml
     permissions:
       contents: read
-      id-token: write # to get AWS credentials
+      id-token: write # to get Docker Hub and AWS credentials
       packages: write # to push image to GHCR
     strategy:
       fail-fast: false
@@ -107,10 +107,10 @@ jobs:
     secrets:
       # Pass only the registry-specific secrets needed by each matrix entry.
       # GHCR uses the called workflow's GITHUB_TOKEN fallback.
-      # AWS ECR uses OIDC to get credentials.
+      # Docker Hub and AWS ECR use OIDC to get credentials.
       registry_username: >-
         ${{
-          matrix.provider == 'dockerhub' && vars.DOCKERPUBLICBOT_USERNAME ||
+          matrix.provider == 'dockerhub' && 'dockereng' ||
           matrix.provider == 'gitlab' && secrets.GITLAB_USERNAME ||
           matrix.provider == 'gar' && secrets.GAR_USERNAME ||
           matrix.provider == 'acr' && secrets.AZURE_CLIENT_ID ||
@@ -120,7 +120,6 @@ jobs:
         }}
       registry_password: >-
         ${{
-          matrix.provider == 'dockerhub' && secrets.DOCKERPUBLICBOT_WRITE_PAT ||
           matrix.provider == 'gitlab' && secrets.GITLAB_TOKEN ||
           matrix.provider == 'gar' && secrets.GAR_JSON_KEY ||
           matrix.provider == 'acr' && secrets.AZURE_CLIENT_SECRET ||