From 148c5a2291fe783b75969de71b8da93a4e1cd611 Mon Sep 17 00:00:00 2001
From: Zhiwei Liang <zliang@akamai.com>
Date: Thu, 27 Aug 2026 16:08:30 -0400
Subject: [PATCH] Using official naming conventions; use only login-action for
 OIDC

---
 .github/workflows/release.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e44e1fb67..0d4706f35 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,18 +47,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: OIDC connections
-        id: docker_oidc
-        uses: docker/oidc-action@v1
-        with:
-          connection-id: ${{ vars.DOCKER_OIDC_CONNECTION_ID }}
-          expires-in: 1800
-
       - name: Login to Docker Hub
         uses: docker/login-action@v4
         with:
-          username: ${{ vars.DOCKER_ORGANIZATION_NAME }}
-          password: ${{ steps.docker_oidc.outputs.token }}
+          username: ${{ vars.DOCKERHUB_ORGANIZATION }}
+        env:
+          DOCKERHUB_OIDC_CONNECTIONID: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
+          DOCKERHUB_OIDC_EXPIREIN: 1800
 
       # This is necessary as we want to ensure that version tags
       # are properly formatted before passing them into the