diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml
index f940b133f..c0b9faaf7 100644
--- a/toci-quickstart/config/testenv/multinode-rdocloud.yml
+++ b/toci-quickstart/config/testenv/multinode-rdocloud.yml
@@ -41,8 +41,8 @@ build_undercloud: false
 tempest_track_resources: false
 
 # Container settings
-docker_registry_host: trunk.registry.rdoproject.org
-docker_registry_namespace: "{{ release }}"
+docker_registry_host: docker.io
+docker_registry_namespace: "tripleo{{ release }}"
 
 # Container update settings
 update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"
diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml
index 5b041e8fb..49ed454c7 100644
--- a/toci-quickstart/config/testenv/ovb-rdocloud.yml
+++ b/toci-quickstart/config/testenv/ovb-rdocloud.yml
@@ -19,8 +19,8 @@ workers_args: >-
     -e {{ overcloud_templates_path }}/environments/debug.yaml
 overcloud_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
 ipa_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
-docker_registry_host: trunk.registry.rdoproject.org
-docker_registry_namespace: "{{ release }}"
+docker_registry_host: docker.io
+docker_registry_namespace: "tripleo{{ release }}"
 
 # Container update settings
 update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"