diff --git a/roles/build-containers/tasks/main.yaml b/roles/build-containers/tasks/main.yaml
index 71ab550c7..23d2dd5d3 100644
--- a/roles/build-containers/tasks/main.yaml
+++ b/roles/build-containers/tasks/main.yaml
@@ -163,12 +163,6 @@
           {% endif %}
           chown -R {{ ansible_user }}: /tmp/base-build/repos/*
 
-    - name: render dockerfile rhui
-      when: zuul_internal is undefined
-      template:
-        src: templates/Dockerfile_rhui.j2
-        dest: /tmp/base-build/Dockerfile
-
     - name: render dockerfile zuul_internal
       when: zuul_internal is defined
       template:
@@ -291,7 +285,7 @@
         $(command -v docker || command -v podman) run -d \
           -e REGISTRY_HTTP_ADDR=0.0.0.0:{{ provider_registry_port }} \
           -p {{ provider_registry_port }}:{{ provider_registry_port }} \
-          --name registry trunk.registry.rdoproject.org/ceph/registry:2
+          --name registry quay.rdoproject.org/ceph/registry:2
       changed_when: true
   become: true
 
diff --git a/roles/build-containers/templates/Dockerfile_rhui.j2 b/roles/build-containers/templates/Dockerfile_rhui.j2
deleted file mode 100644
index 42f2cccb7..000000000
--- a/roles/build-containers/templates/Dockerfile_rhui.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM trunk.registry.rdoproject.org/rhel/rhel8-rhui:8.0-126
-RUN rm -f /etc/yum.repos.d/delorean*
-COPY repos/delorean* /etc/yum.repos.d/
-RUN dnf clean all
diff --git a/toci-quickstart/config/testenv/multinode-ibm.yml b/toci-quickstart/config/testenv/multinode-ibm.yml
index 8b1b76e77..53e7f7470 100644
--- a/toci-quickstart/config/testenv/multinode-ibm.yml
+++ b/toci-quickstart/config/testenv/multinode-ibm.yml
@@ -46,11 +46,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if ansible_distribution|lower in ["centos"] -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # Container update settings
diff --git a/toci-quickstart/config/testenv/multinode-psi.yml b/toci-quickstart/config/testenv/multinode-psi.yml
index 01ef18516..3060890b8 100644
--- a/toci-quickstart/config/testenv/multinode-psi.yml
+++ b/toci-quickstart/config/testenv/multinode-psi.yml
@@ -48,11 +48,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # Container update settings
diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml
index 5eca897fd..93b821117 100644
--- a/toci-quickstart/config/testenv/multinode-rdocloud.yml
+++ b/toci-quickstart/config/testenv/multinode-rdocloud.yml
@@ -49,11 +49,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # Container settings are set in release files
diff --git a/toci-quickstart/config/testenv/multinode-vexxhost.yml b/toci-quickstart/config/testenv/multinode-vexxhost.yml
index 88c74d2c1..42ad0a857 100644
--- a/toci-quickstart/config/testenv/multinode-vexxhost.yml
+++ b/toci-quickstart/config/testenv/multinode-vexxhost.yml
@@ -59,11 +59,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # Container update settings
diff --git a/toci-quickstart/config/testenv/ovb-ibm.yml b/toci-quickstart/config/testenv/ovb-ibm.yml
index bd9f8cbcb..51d31fed1 100644
--- a/toci-quickstart/config/testenv/ovb-ibm.yml
+++ b/toci-quickstart/config/testenv/ovb-ibm.yml
@@ -33,11 +33,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if ansible_distribution|lower in ["centos"] -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # build-test packages
diff --git a/toci-quickstart/config/testenv/ovb-psi.yml b/toci-quickstart/config/testenv/ovb-psi.yml
index 3c1a0f6b1..ffa309274 100644
--- a/toci-quickstart/config/testenv/ovb-psi.yml
+++ b/toci-quickstart/config/testenv/ovb-psi.yml
@@ -33,11 +33,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # build-test packages
diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml
index 06ebee8f5..28caab83d 100644
--- a/toci-quickstart/config/testenv/ovb-rdocloud.yml
+++ b/toci-quickstart/config/testenv/ovb-rdocloud.yml
@@ -34,11 +34,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # build-test packages
diff --git a/toci-quickstart/config/testenv/ovb-vexxhost.yml b/toci-quickstart/config/testenv/ovb-vexxhost.yml
index 62766fb3c..0ad6786ae 100644
--- a/toci-quickstart/config/testenv/ovb-vexxhost.yml
+++ b/toci-quickstart/config/testenv/ovb-vexxhost.yml
@@ -36,11 +36,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
-  {%- else -%}
-  trunk.registry.rdoproject.org
-  {%- endif -%}
   {%- endif -%}
 
 # build-test packages