diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index ca76009c8c40..cb916bacba16 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -64,7 +64,7 @@ jobs:
           df -h
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: 'Set up JDK 21'
         uses: actions/setup-java@v5
@@ -89,10 +89,6 @@ jobs:
           echo "TEZ_VERSION=$(mvn -f "pom.xml" -q help:evaluate -Dexpression=tez.version -DforceStdout)" >> $GITHUB_ENV
           echo "BUILD_ENV=hybrid" >> $GITHUB_ENV
 
-      - name: Prepare common environment variables
-        run: |
-          echo "namespace=${{ vars.DOCKER_NAMESPACE || 'apache' }}" >> $GITHUB_ENV
-
       - name: Prepare an image tag for release
         if: github.event_name != 'schedule'
         run: |
@@ -190,7 +186,7 @@ jobs:
           file: ./packaging/src/docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.namespace }}/hive:${{ env.tag }}
+          tags: ${{ github.repository_owner }}/hive:${{ env.tag }}
           build-args:
             |
             HIVE_VERSION=${{ env.HIVE_VERSION }}
@@ -205,7 +201,7 @@ jobs:
           file: ./standalone-metastore/packaging/src/docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.namespace }}/hive:standalone-metastore-${{ env.tag }}
+          tags: ${{ github.repository_owner }}/hive:standalone-metastore-${{ env.tag }}
           build-args:
             |
             HIVE_VERSION=${{ env.HIVE_VERSION }}