diff --git a/.github/workflows/prebuild-docker.yml b/.github/workflows/prebuild-docker.yml
index ff3b05a10701e4..d593d1c05fdfbd 100644
--- a/.github/workflows/prebuild-docker.yml
+++ b/.github/workflows/prebuild-docker.yml
@@ -85,13 +85,14 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: hpccsystemsrisk.jfrog.io
+          username: ${{ secrets.JFROG_USERNAME }}
+          password: ${{ secrets.JFROG_TOKEN }}
 
       - name: Pull previous images
         run: |
-          docker pull hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }} || true
-          docker pull hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }} || true
+          docker pull hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }} || true
+          docker pull hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }} || true
 
       - name: Build ${{ matrix.os }} image
         uses: docker/build-push-action@v5
@@ -105,8 +106,8 @@ jobs:
             GITHUB_ACTOR=${{ github.repository_owner }}
             GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
           tags: |
-            hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
-            hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
+            hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
+            hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
           cache-from: |
-            type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
-            type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
+            type=registry,ref=hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
+            type=registry,ref=hpccpl-docker-local/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}