diff --git a/.github/workflows/build_test_package.yml b/.github/workflows/build_test_package.yml
index 8e1943656..06bf6c8f8 100644
--- a/.github/workflows/build_test_package.yml
+++ b/.github/workflows/build_test_package.yml
@@ -232,8 +232,8 @@ jobs:
             ./gradlew
             :cosmotech-api:jibDockerBuild
             -Djib.to.image=com.cosmotech/cosmotech-api:${{ github.sha }}
-            -Pbaseimage.repository.user="${{ secrets.BASEIMAGE_REPOSITORY_USER }}"
-            -Pbaseimage.repository.password="${{ secrets.BASEIMAGE_REPOSITORY_PASSWORD }}"
+            -Pbaseimage.repository.user='${{ secrets.HARBOR_ROBOT_ACCOUNT_NAME }}'
+            -Pbaseimage.repository.password='${{ secrets.HARBOR_ROBOT_ACCOUNT_SECRET }}'
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@v0.36.0
diff --git a/gradle.properties b/gradle.properties
index 51fb43774..0fb03c356 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx2g
 detekt.ignoreFailures=false
 
 # Hardened Images repository. Used to generate the Docker image.
-baseimage.name=cgr.dev/cosmotech/adoptium-jdk:adoptium-openjdk-25
+baseimage.name=registry.cosmotech.com/proxy-chainguard/cosmotech/adoptium-jdk:adoptium-openjdk-25
 
 # SonarQube configuration
 sonar.host.url=https://sonar.cosmo-mellon.com/