diff --git a/.ci/publish.sh b/.ci/publish.sh
index e830fd3f97..c13fd79c98 100755
--- a/.ci/publish.sh
+++ b/.ci/publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-# Publish any versions of the docker image not yet pushed to ${JENKINS_REPO}
+# Publish any versions of the docker image not yet pushed to CONTAINER_NAMESPACE/CONTAINER_REPOSITORY
 # Arguments:
 #   -n dry run, do not build or publish images
 #   -d debug
@@ -9,10 +9,9 @@
 
 set -eu -o pipefail
 
-: "${DOCKERHUB_ORGANISATION:=jenkins}"
-: "${DOCKERHUB_REPO:=jenkins}"
-
-export JENKINS_REPO="${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}"
+: "${CONTAINER_REGISTRY:=docker.io}"
+: "${CONTAINER_NAMESPACE:=jenkins}"
+: "${CONTAINER_REPOSITORY:=jenkins}"
 
 function sort-versions() {
     if [ "$(uname)" == 'Darwin' ]; then
@@ -88,7 +87,9 @@ export COMMIT_SHA JENKINS_VERSION WAR_SHA LATEST_WEEKLY LATEST_LTS
 
 cat <<EOF
 Using the following settings:
-* JENKINS_REPO: ${JENKINS_REPO}
+* CONTAINER_REGISTRY: ${CONTAINER_REGISTRY}
+* CONTAINER_NAMESPACE: ${CONTAINER_NAMESPACE}
+* CONTAINER_REPOSITORY: ${CONTAINER_REPOSITORY}
 * JENKINS_VERSION: ${JENKINS_VERSION}
 * WAR_SHA: ${WAR_SHA}
 * COMMIT_SHA: ${COMMIT_SHA}
diff --git a/HACKING.adoc b/HACKING.adoc
index 913d5b0a7a..3424ea0236 100644
--- a/HACKING.adoc
+++ b/HACKING.adoc
@@ -155,11 +155,13 @@ Create a new dedicated target repository in your Docker Hub account, and use it
 
 [source,bash]
 --
-export DOCKERHUB_ORGANISATION=batmat
-export DOCKERHUB_REPO=test-jenkins
+export CONTAINER_NAMESPACE=jenkins4eval
+export CONTAINER_REPOSITORY=test-jenkins
 # The log below will help confirm this override was taken in account:
 ./publish.sh
 Docker repository in Use:
-* JENKINS_REPO: batmat/test-jenkins
+* CONTAINER_REGISTRY: docker.io
+* CONTAINER_NAMESPACE: jenkins4eval
+* CONTAINER_REPOSITORY: test-jenkins
 ...
 --
diff --git a/Jenkinsfile b/Jenkinsfile
index 79ca1e9e06..956780b218 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,7 +83,7 @@ stage('Build') {
                         // if (branchName ==~ 'master'){
                         //    stage('Publish Experimental') {
                         //        infra.withDockerCredentials {
-                        //            withEnv(['DOCKERHUB_ORGANISATION=jenkins4eval','DOCKERHUB_REPO=jenkins']) {
+                        //            withEnv(['CONTAINER_NAMESPACE=jenkins4eval','CONTAINER_REPOSITORY=jenkins']) {
                         //                powershell './make.ps1 publish'
                         //            }
                         //        }
@@ -101,7 +101,7 @@ stage('Build') {
                                 ]) {
                                     stage('Publish') {
                                         infra.withDockerCredentials {
-                                            withEnv(['DOCKERHUB_ORGANISATION=jenkins', 'DOCKERHUB_REPO=jenkins']) {
+                                            withEnv(['CONTAINER_NAMESPACE=jenkins', 'CONTAINER_REPOSITORY=jenkins']) {
                                                 powershell './make.ps1 build'
                                                 powershell './make.ps1 publish'
                                             }
diff --git a/build-windows.yaml b/build-windows.yaml
index 1515a5397e..6cd15fc4b2 100644
--- a/build-windows.yaml
+++ b/build-windows.yaml
@@ -1,6 +1,6 @@
 services:
   jdk21:
-    image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+    image: ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
     build:
       context: ./
       dockerfile: ./windows/${WINDOWS_FLAVOR}/hotspot/Dockerfile
@@ -13,11 +13,11 @@ services:
         WAR_URL: ${WAR_URL}
         WINDOWS_VERSION: ${WINDOWS_VERSION}
       tags:
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
   jdk25:
-    image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+    image: ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}${SEPARATOR_LTS_PREFIX}jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
     build:
       context: ./
       dockerfile: ./windows/${WINDOWS_FLAVOR}/hotspot/Dockerfile
@@ -30,6 +30,6 @@ services:
         WAR_URL: ${WAR_URL}
         WINDOWS_VERSION: ${WINDOWS_VERSION}
       tags:
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index cc8a77faa3..d48d5fa96c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -23,12 +23,16 @@ variable "WAR_URL" {
   default = ""
 }
 
-variable "REGISTRY" {
+variable "CONTAINER_REGISTRY" {
   default = "docker.io"
 }
 
-variable "JENKINS_REPO" {
-  default = "jenkins/jenkins"
+variable "CONTAINER_NAMESPACE" {
+  default = "jenkins"
+}
+
+variable "CONTAINER_REPOSITORY" {
+  default = "jenkins"
 }
 
 variable "LATEST_WEEKLY" {
@@ -193,13 +197,15 @@ function "jdks_to_build" {
 # return a tag prefixed by the Jenkins version
 function "_tag_jenkins_version" {
   params = [tag]
-  result = notequal(tag, "") ? "${REGISTRY}/${JENKINS_REPO}:${JENKINS_VERSION}-${tag}" : "${REGISTRY}/${JENKINS_REPO}:${JENKINS_VERSION}"
+  result = (notequal(tag, "")
+    ? "${CONTAINER_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${tag}"
+    : "${CONTAINER_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}")
 }
 
 # return a tag optionaly prefixed by the Jenkins version
 function "tag" {
   params = [prepend_jenkins_version, tag]
-  result = equal(prepend_jenkins_version, true) ? _tag_jenkins_version(tag) : "${REGISTRY}/${JENKINS_REPO}:${tag}"
+  result = equal(prepend_jenkins_version, true) ? _tag_jenkins_version(tag) : "${CONTAINER_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${tag}"
 }
 
 # return a weekly optionaly prefixed by the Jenkins version
diff --git a/make.ps1 b/make.ps1
index 81620eabc8..f95a84db3d 100644
--- a/make.ps1
+++ b/make.ps1
@@ -13,12 +13,12 @@ $Repository = 'jenkins'
 $Organisation = 'jenkins4eval'
 $ImageType = 'windowsservercore-ltsc2022' # <WINDOWS_FLAVOR>-<WINDOWS_VERSION>
 
-if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) {
-    $Repository = $env:DOCKERHUB_REPO
+if(![String]::IsNullOrWhiteSpace($env:CONTAINER_REPOSITORY)) {
+    $Repository = $env:CONTAINER_REPOSITORY
 }
 
-if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) {
-    $Organisation = $env:DOCKERHUB_ORGANISATION
+if(![String]::IsNullOrWhiteSpace($env:CONTAINER_NAMESPACE)) {
+    $Organisation = $env:CONTAINER_NAMESPACE
 }
 
 if(![String]::IsNullOrWhiteSpace($env:JENKINS_VERSION)) {
@@ -29,8 +29,8 @@ if(![String]::IsNullOrWhiteSpace($env:IMAGE_TYPE)) {
     $ImageType = $env:IMAGE_TYPE
 }
 
-$env:DOCKERHUB_ORGANISATION = "$Organisation"
-$env:DOCKERHUB_REPO = "$Repository"
+$env:CONTAINER_NAMESPACE = "$Organisation"
+$env:CONTAINER_REPOSITORY = "$Repository"
 $env:JENKINS_VERSION = "$JenkinsVersion"
 
 # Add 'lts-' prefix to LTS tags not including Jenkins version
diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1
index 9e89f1fb7b..594216e03a 100644
--- a/tests/test_helpers.psm1
+++ b/tests/test_helpers.psm1
@@ -109,7 +109,7 @@ function Build-Docker($tag) {
     if($exitCode -ne 0) {
         return $exitCode, $stdout, $stderr
     }
-    return(Run-Program 'docker' $('tag {0}/{1}:{2} {3}' -f $env:DOCKERHUB_ORGANISATION, $env:DOCKERHUB_REPO, $env:CONTROLLER_IMAGE, $tag))
+    return(Run-Program 'docker' $('tag {0}/{1}:{2} {3}' -f $env:CONTAINER_NAMESPACE, $env:CONTAINER_REPOSITORY, $env:CONTROLLER_IMAGE, $tag))
 }
 
 function Build-DockerChild($tag, $dir) {