diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml
index 1c1fc6b2c..7143a1871 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleomaster
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-ocata.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-ocata.yml
index d745da7e6..14a635dc3 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-ocata.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-ocata.yml
@@ -3,7 +3,7 @@ overcloud_as_undercloud: true
 use_specific_hash: true
 # Ocata doesn't have container support, is it necessary to have this here ?
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleoocata
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-pike.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-pike.yml
index 6932440a3..05a230d81 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-pike.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-pike.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleopike
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-queens.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-queens.yml
index d00bf06e4..585d44571 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-queens.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-queens.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleoqueens
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-rocky.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-rocky.yml
index 4e71aafe5..5c4aec305 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-rocky.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-rocky.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleorocky
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-stein.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-stein.yml
index 4e8cb9106..d1499bd02 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-stein.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-stein.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleostein
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-train.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-train.yml
index a0076b5c2..e921099be 100644
--- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-train.yml
+++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-train.yml
@@ -2,7 +2,7 @@ devmode: true
 overcloud_as_undercloud: true
 use_specific_hash: true
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: "tripleo{{ release }}"
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/RedHat-8/master.yml b/config/release/tripleo-ci/RedHat-8/master.yml
index 624f8770b..b7a8962ff 100644
--- a/config/release/tripleo-ci/RedHat-8/master.yml
+++ b/config/release/tripleo-ci/RedHat-8/master.yml
@@ -22,7 +22,7 @@ dlrn_hash_tag_newest: current
 dlrn_target: redhat
 dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
diff --git a/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-master.yml b/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-master.yml
index 1130f922b..ab63f362f 100644
--- a/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-master.yml
+++ b/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-master.yml
@@ -22,7 +22,7 @@ dlrn_hash_tag: tripleo-ci-testing
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 dlrn_hash_tag_newest: current
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: tripleomaster
 docker_image_tag: *promotion-testing-tag
diff --git a/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-train.yml b/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-train.yml
index 6871186fd..43572adae 100644
--- a/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-train.yml
+++ b/config/release/tripleo-ci/RedHat-8/promotion-testing-hash-train.yml
@@ -22,7 +22,7 @@ dlrn_hash_tag: tripleo-ci-testing
 delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 dlrn_hash_tag_newest: current
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: *promotion-testing-tag
diff --git a/config/release/tripleo-ci/RedHat-8/train.yml b/config/release/tripleo-ci/RedHat-8/train.yml
index e5df601a8..43a05e306 100644
--- a/config/release/tripleo-ci/RedHat-8/train.yml
+++ b/config/release/tripleo-ci/RedHat-8/train.yml
@@ -22,7 +22,7 @@ dlrn_hash_tag_newest: current
 dlrn_target: redhat
 dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
 docker_registry_host: "{{ 'trunk.registry-vexxhost.rdoproject.org'
-      if 'vexxhost' in job.nodepool_provider|default('rdo-cloud')
+      if 'vexxhost-nodepool-tripleo' in job.nodepool_provider|default('rdo-cloud')
       else 'trunk.registry.rdoproject.org' }}"
 docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"