From a05644d2da5fcfc1b1b0342e357e4f5767c24661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Sun, 11 Jan 2026 15:14:53 +0100
Subject: [PATCH 1/3] chore: don't use `JENKINS_REPO` and rename
 `DOCKERHUB_REPO` to `DOCKERHUB_REPOSITORY`

This change removes the use of `JENKINS_REPO` during publication in profit of `DOCKERHUB_ORGANISATION/DOCKERHUB_REPOSITORY`
so we can publish on other registries as well.

For that, it renames `DOCKERHUB_REPO` to `DOCKERHUB_REPOSITORY` and `REGISTRY` to `DOCKERHUB_REGISTRY` (more explicit),
and replace the use of `JENKINS_REPO` with `DOCKERHUB_ORGANISATION/DOCKERHUB_REPOSITORY` in docker bake file,
./ci/publish.sh publication script, and HACKING.md documentation.

Testing done:
```
$ docker login
$ export DOCKERHUB_ORGANISATION=hlemeur
$ JENKINS_VERSION=2.528.3 ./ci/publish.sh -d -n
$ JENKINS_VERSION=2.528.3 ./ci/publish.sh
$ docker inspect hlemeur/jenkins:2.528.3-lts
[
    {
        "Id": "sha256:1825aafdea6e58204b7eb323774c8c4e574318e0d18fb7bf27e0529abcb1b1ef",
        "RepoTags": [
            "hlemeur/jenkins:2.528.3",
            "hlemeur/jenkins:2.528.3-jdk21",
            "hlemeur/jenkins:2.528.3-lts",
            "hlemeur/jenkins:2.528.3-lts-jdk21",
            "hlemeur/jenkins:lts",
            "hlemeur/jenkins:lts-jdk21"
        ],
        "RepoDigests": [
            "hlemeur/jenkins@sha256:1825aafdea6e58204b7eb323774c8c4e574318e0d18fb7bf27e0529abcb1b1ef"
        ],
        "Comment": "buildkit.dockerfile.v0",
        "Created": "2026-01-11T13:48:33.84995609Z",
        "Config": {
            "User": "jenkins",
            "ExposedPorts": {
                "50000/tcp": {},
                "8080/tcp": {}
            },
            "Env": [
                "PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
                "LANG=C.UTF-8",
                "JENKINS_HOME=/var/jenkins_home",
                "JENKINS_SLAVE_AGENT_PORT=50000",
                "REF=/usr/share/jenkins/ref",
                "JENKINS_VERSION=2.528.3",
                "JENKINS_UC=https://updates.jenkins.io",
                "JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental",
                "JENKINS_INCREMENTALS_REPO_MIRROR=https://repo.jenkins-ci.org/incrementals",
                "COPY_REFERENCE_FILE_LOG=/var/jenkins_home/copy_reference_file.log",
                "JAVA_HOME=/opt/java/openjdk"
            ],
            "Entrypoint": [
                "/usr/bin/tini",
                "--",
                "/usr/local/bin/jenkins.sh"
            ],
            "Volumes": {
                "/var/jenkins_home": {}
            },
            "Labels": {
                "org.opencontainers.image.description": "The Jenkins Continuous Integration and Delivery server",
                "org.opencontainers.image.licenses": "MIT",
                "org.opencontainers.image.revision": "a0ab3fa020046a99ad7d9a49104cbaac4685e3b0",
                "org.opencontainers.image.source": "https://github.com/jenkinsci/docker",
                "org.opencontainers.image.title": "Official Jenkins Docker image",
                "org.opencontainers.image.url": "https://www.jenkins.io/",
                "org.opencontainers.image.vendor": "Jenkins project",
                "org.opencontainers.image.version": "2.528.3"
            }
        },
        "Architecture": "arm64",
        "Os": "linux",
        "Size": 288690242,
        "RootFS": {
            "Type": "layers",
            "Layers": [
                "sha256:4f9114eeb1e46da35d3a29b063ddfa69a0447888dd07117de77ddd565c54fb27",
                "sha256:4dccb090d7492f51e5752c94b2a4311cd1351cef18f05b5737f7138991e64906",
                "sha256:c2ff46607cfe9995b9e5310982ea95756ac9635f90b05db4c55415ef18dbeaf4",
                "sha256:38680db6fceda2720f91d241e9ffc1fe18bb5e80971d314de774ae8e05665e42",
                "sha256:cb337ba5f4bc7a25e13ee6f0e941f3c9ee55eae776e99c1105487c71c9f47748",
                "sha256:ec3cc3a9bb43919215cf5d39c940080aeaf993bb1a8e47a5ad28eff09eef3024",
                "sha256:b4d00230176fd3b195b4ac37dea53b8a3390decaa1238116d1c892f6320217de",
                "sha256:9dfb4b1bfc5bb8338db02c7d439500644c444502e27826aa3dd1bb578f758aa6",
                "sha256:5b5eb2fcc1a23df2a5a600d55f163ee5eea9fa2462385c7f8a6edc423add02c2",
                "sha256:9d6ca408160484d633fe9dede9a03e17f740a06a258db903a55520b122f4e679",
                "sha256:9a285ad710f7519f7868afd7bca59b59ba22e36627f9cfddebf61f343736d8c3",
                "sha256:3f83631eada5c1a69cb61ac5c9b3eef62f0bc9f61ddb39eec6e604fcb001d2ee"
            ]
        },
        "Metadata": {
            "LastTagTime": "2026-01-11T14:07:33.264826923Z"
        },
        "Descriptor": {
            "mediaType": "application/vnd.oci.image.index.v1+json",
            "digest": "sha256:1825aafdea6e58204b7eb323774c8c4e574318e0d18fb7bf27e0529abcb1b1ef",
            "size": 3117
        }
    }
]
```
---
 .ci/publish.sh          | 13 +++++++------
 HACKING.adoc            |  8 +++++---
 Jenkinsfile             |  4 ++--
 build-windows.yaml      | 16 ++++++++--------
 docker-bake.hcl         | 16 +++++++++++-----
 make.ps1                | 12 ++++++------
 tests/test_helpers.psm1 |  2 +-
 7 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/.ci/publish.sh b/.ci/publish.sh
index e830fd3f97..c0e45b46db 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_ORGANISATION/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}"
+: "${DOCKERHUB_REGISTRY:=docker.io}"
+: "${CONTAINER_ORGANISATION:=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}
+* DOCKERHUB_REGISTRY: ${DOCKERHUB_REGISTRY}
+* CONTAINER_ORGANISATION: ${CONTAINER_ORGANISATION}
+* 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..f446411bbb 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_ORGANISATION=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
+* DOCKERHUB_REGISTRY: docker.io
+* CONTAINER_ORGANISATION: jenkins4eval
+* CONTAINER_REPOSITORY: test-jenkins
 ...
 --
diff --git a/Jenkinsfile b/Jenkinsfile
index 79ca1e9e06..b93da4f98b 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_ORGANISATION=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_ORGANISATION=jenkins', 'CONTAINER_REPOSITORY=jenkins']) {
                                                 powershell './make.ps1 build'
                                                 powershell './make.ps1 publish'
                                             }
diff --git a/build-windows.yaml b/build-windows.yaml
index 1515a5397e..05598d8e9f 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_ORGANISATION}/${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_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_ORGANISATION}/${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_ORGANISATION}/${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_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index cc8a77faa3..24b909fe4f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -23,12 +23,16 @@ variable "WAR_URL" {
   default = ""
 }
 
-variable "REGISTRY" {
+variable "DOCKERHUB_REGISTRY" {
   default = "docker.io"
 }
 
-variable "JENKINS_REPO" {
-  default = "jenkins/jenkins"
+variable "CONTAINER_ORGANISATION" {
+  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, "")
+    ? "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${tag}"
+    : "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${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) : "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${tag}"
 }
 
 # return a weekly optionaly prefixed by the Jenkins version
diff --git a/make.ps1 b/make.ps1
index 81620eabc8..a8801586f6 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_ORGANISATION)) {
+    $Organisation = $env:CONTAINER_ORGANISATION
 }
 
 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_ORGANISATION = "$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..697b6c9bf2 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_ORGANISATION, $env:CONTAINER_REPOSITORY, $env:CONTROLLER_IMAGE, $tag))
 }
 
 function Build-DockerChild($tag, $dir) {

From 49ad6b17f9d4270eb6b5baa49b95003d93c87dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Mon, 12 Jan 2026 21:21:40 +0100
Subject: [PATCH 2/3] s/CONTAINER_ORGANISATION/CONTAINER_NAMESPACE

---
 .ci/publish.sh          |  6 +++---
 HACKING.adoc            |  4 ++--
 Jenkinsfile             |  4 ++--
 build-windows.yaml      | 16 ++++++++--------
 docker-bake.hcl         |  8 ++++----
 make.ps1                |  6 +++---
 tests/test_helpers.psm1 |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.ci/publish.sh b/.ci/publish.sh
index c0e45b46db..e21155d442 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 CONTAINER_ORGANISATION/CONTAINER_REPOSITORY
+# 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
@@ -10,7 +10,7 @@
 set -eu -o pipefail
 
 : "${DOCKERHUB_REGISTRY:=docker.io}"
-: "${CONTAINER_ORGANISATION:=jenkins}"
+: "${CONTAINER_NAMESPACE:=jenkins}"
 : "${CONTAINER_REPOSITORY:=jenkins}"
 
 function sort-versions() {
@@ -88,7 +88,7 @@ export COMMIT_SHA JENKINS_VERSION WAR_SHA LATEST_WEEKLY LATEST_LTS
 cat <<EOF
 Using the following settings:
 * DOCKERHUB_REGISTRY: ${DOCKERHUB_REGISTRY}
-* CONTAINER_ORGANISATION: ${CONTAINER_ORGANISATION}
+* CONTAINER_NAMESPACE: ${CONTAINER_NAMESPACE}
 * CONTAINER_REPOSITORY: ${CONTAINER_REPOSITORY}
 * JENKINS_VERSION: ${JENKINS_VERSION}
 * WAR_SHA: ${WAR_SHA}
diff --git a/HACKING.adoc b/HACKING.adoc
index f446411bbb..d114fe356e 100644
--- a/HACKING.adoc
+++ b/HACKING.adoc
@@ -155,13 +155,13 @@ Create a new dedicated target repository in your Docker Hub account, and use it
 
 [source,bash]
 --
-export CONTAINER_ORGANISATION=jenkins4eval
+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:
 * DOCKERHUB_REGISTRY: docker.io
-* CONTAINER_ORGANISATION: jenkins4eval
+* CONTAINER_NAMESPACE: jenkins4eval
 * CONTAINER_REPOSITORY: test-jenkins
 ...
 --
diff --git a/Jenkinsfile b/Jenkinsfile
index b93da4f98b..956780b218 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,7 +83,7 @@ stage('Build') {
                         // if (branchName ==~ 'master'){
                         //    stage('Publish Experimental') {
                         //        infra.withDockerCredentials {
-                        //            withEnv(['CONTAINER_ORGANISATION=jenkins4eval','CONTAINER_REPOSITORY=jenkins']) {
+                        //            withEnv(['CONTAINER_NAMESPACE=jenkins4eval','CONTAINER_REPOSITORY=jenkins']) {
                         //                powershell './make.ps1 publish'
                         //            }
                         //        }
@@ -101,7 +101,7 @@ stage('Build') {
                                 ]) {
                                     stage('Publish') {
                                         infra.withDockerCredentials {
-                                            withEnv(['CONTAINER_ORGANISATION=jenkins', 'CONTAINER_REPOSITORY=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 05598d8e9f..6cd15fc4b2 100644
--- a/build-windows.yaml
+++ b/build-windows.yaml
@@ -1,6 +1,6 @@
 services:
   jdk21:
-    image: ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}${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:
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}${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: ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}${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:
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}${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 24b909fe4f..a6e5a77779 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -27,7 +27,7 @@ variable "DOCKERHUB_REGISTRY" {
   default = "docker.io"
 }
 
-variable "CONTAINER_ORGANISATION" {
+variable "CONTAINER_NAMESPACE" {
   default = "jenkins"
 }
 
@@ -198,14 +198,14 @@ function "jdks_to_build" {
 function "_tag_jenkins_version" {
   params = [tag]
   result = (notequal(tag, "")
-    ? "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${tag}"
-    : "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}")
+    ? "${DOCKERHUB_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${tag}"
+    : "${DOCKERHUB_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) : "${DOCKERHUB_REGISTRY}/${CONTAINER_ORGANISATION}/${CONTAINER_REPOSITORY}:${tag}"
+  result = equal(prepend_jenkins_version, true) ? _tag_jenkins_version(tag) : "${DOCKERHUB_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${tag}"
 }
 
 # return a weekly optionaly prefixed by the Jenkins version
diff --git a/make.ps1 b/make.ps1
index a8801586f6..f95a84db3d 100644
--- a/make.ps1
+++ b/make.ps1
@@ -17,8 +17,8 @@ if(![String]::IsNullOrWhiteSpace($env:CONTAINER_REPOSITORY)) {
     $Repository = $env:CONTAINER_REPOSITORY
 }
 
-if(![String]::IsNullOrWhiteSpace($env:CONTAINER_ORGANISATION)) {
-    $Organisation = $env:CONTAINER_ORGANISATION
+if(![String]::IsNullOrWhiteSpace($env:CONTAINER_NAMESPACE)) {
+    $Organisation = $env:CONTAINER_NAMESPACE
 }
 
 if(![String]::IsNullOrWhiteSpace($env:JENKINS_VERSION)) {
@@ -29,7 +29,7 @@ if(![String]::IsNullOrWhiteSpace($env:IMAGE_TYPE)) {
     $ImageType = $env:IMAGE_TYPE
 }
 
-$env:CONTAINER_ORGANISATION = "$Organisation"
+$env:CONTAINER_NAMESPACE = "$Organisation"
 $env:CONTAINER_REPOSITORY = "$Repository"
 $env:JENKINS_VERSION = "$JenkinsVersion"
 
diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1
index 697b6c9bf2..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:CONTAINER_ORGANISATION, $env:CONTAINER_REPOSITORY, $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) {

From e788a5b1f559da8b7bcdfa3acb5350c2d1ff962d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Mon, 12 Jan 2026 21:23:09 +0100
Subject: [PATCH 3/3] s/DOCKERHUB_REGISTRY/CONTAINER_REGISTRY

---
 .ci/publish.sh  | 4 ++--
 HACKING.adoc    | 2 +-
 docker-bake.hcl | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ci/publish.sh b/.ci/publish.sh
index e21155d442..c13fd79c98 100755
--- a/.ci/publish.sh
+++ b/.ci/publish.sh
@@ -9,7 +9,7 @@
 
 set -eu -o pipefail
 
-: "${DOCKERHUB_REGISTRY:=docker.io}"
+: "${CONTAINER_REGISTRY:=docker.io}"
 : "${CONTAINER_NAMESPACE:=jenkins}"
 : "${CONTAINER_REPOSITORY:=jenkins}"
 
@@ -87,7 +87,7 @@ export COMMIT_SHA JENKINS_VERSION WAR_SHA LATEST_WEEKLY LATEST_LTS
 
 cat <<EOF
 Using the following settings:
-* DOCKERHUB_REGISTRY: ${DOCKERHUB_REGISTRY}
+* CONTAINER_REGISTRY: ${CONTAINER_REGISTRY}
 * CONTAINER_NAMESPACE: ${CONTAINER_NAMESPACE}
 * CONTAINER_REPOSITORY: ${CONTAINER_REPOSITORY}
 * JENKINS_VERSION: ${JENKINS_VERSION}
diff --git a/HACKING.adoc b/HACKING.adoc
index d114fe356e..3424ea0236 100644
--- a/HACKING.adoc
+++ b/HACKING.adoc
@@ -160,7 +160,7 @@ export CONTAINER_REPOSITORY=test-jenkins
 # The log below will help confirm this override was taken in account:
 ./publish.sh
 Docker repository in Use:
-* DOCKERHUB_REGISTRY: docker.io
+* CONTAINER_REGISTRY: docker.io
 * CONTAINER_NAMESPACE: jenkins4eval
 * CONTAINER_REPOSITORY: test-jenkins
 ...
diff --git a/docker-bake.hcl b/docker-bake.hcl
index a6e5a77779..d48d5fa96c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -23,7 +23,7 @@ variable "WAR_URL" {
   default = ""
 }
 
-variable "DOCKERHUB_REGISTRY" {
+variable "CONTAINER_REGISTRY" {
   default = "docker.io"
 }
 
@@ -198,14 +198,14 @@ function "jdks_to_build" {
 function "_tag_jenkins_version" {
   params = [tag]
   result = (notequal(tag, "")
-    ? "${DOCKERHUB_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}-${tag}"
-    : "${DOCKERHUB_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${JENKINS_VERSION}")
+    ? "${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) : "${DOCKERHUB_REGISTRY}/${CONTAINER_NAMESPACE}/${CONTAINER_REPOSITORY}:${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