diff --git a/SOURCES/CentOS-OpenStack.repo b/SOURCES/CentOS-OpenStack.repo
index fe98fb6..3fce86d 100644
--- a/SOURCES/CentOS-OpenStack.repo
+++ b/SOURCES/CentOS-OpenStack.repo
@@ -4,7 +4,7 @@
 # information
 
 [centos-openstack-OPENSTACK_VERSION]
-name=CentOS- $releasever - OpenStack OPENSTACK_VERSION
+name=CentOS-$releasever - OpenStack OPENSTACK_VERSION
 #baseurl=http://mirror.centos.org/$contentdir/$releasever/cloud/$basearch/openstack-OPENSTACK_VERSION/
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-OPENSTACK_VERSION
 gpgcheck=1
@@ -14,7 +14,7 @@ exclude=sip,PyQt4
 module_hotfixes=1
 
 [centos-openstack-OPENSTACK_VERSION-test]
-name=CentOS- $releasever - OpenStack OPENSTACK_VERSION Testing
+name=CentOS-$releasever - OpenStack OPENSTACK_VERSION Testing
 baseurl=https://buildlogs.centos.org/centos/$releasever/cloud/$basearch/openstack-OPENSTACK_VERSION/
 gpgcheck=0
 enabled=0
@@ -39,9 +39,107 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
 exclude=sip,PyQt4
 module_hotfixes=1
 
-[rdo-trunk-OPENSTACK_VERSION-tested]
-name=OpenStack OPENSTACK_VERSION Trunk Tested
-baseurl=https://trunk.rdoproject.org/centos$releasever-OPENSTACK_VERSION/current-passed-ci/
+[rdo-trunk-OPENSTACK_VERSION-tested-component-baremetal]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-baremetal
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/baremetal/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-cinder]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-cinder
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/cinder/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-clients]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-clients
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/clients/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-cloudops]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-cloudops
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/cloudops/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-common]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-common
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/common/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-compute]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-compute
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/compute/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-glance]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-glance
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/glance/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-manila]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-manila
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/manila/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-network]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-network
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/network/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-octavia]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-octavia
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/octavia/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-security]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-security
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/security/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-swift]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-swift
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/swift/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-tempest]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-tempest
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/tempest/current-tripleo-rdo
+enabled=0
 gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-tripleo]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-tripleo
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/tripleo/current-tripleo-rdo
 enabled=0
+gpgcheck=0
+module_hotfixes=1
+
+[rdo-trunk-OPENSTACK_VERSION-tested-component-ui]
+name=rdo-trunk-OPENSTACK_VERSION-tested-component-ui
+baseurl=https://trunk.rdoproject.org/centos8-OPENSTACK_VERSION/component/ui/current-tripleo-rdo
+enabled=0
+gpgcheck=0
 module_hotfixes=1
diff --git a/SPECS/centos-release-openstack.spec b/SPECS/centos-release-openstack.spec
index 1255881..1c65cc3 100644
--- a/SPECS/centos-release-openstack.spec
+++ b/SPECS/centos-release-openstack.spec
@@ -2,7 +2,7 @@
 Summary: OpenStack from the CentOS Cloud SIG repo configs
 Name: centos-release-openstack-%{OpenStackVersion}
 Version: 1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://wiki.centos.org/SpecialInterestGroup/Cloud
 Source0: CentOS-OpenStack.repo
@@ -37,6 +37,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Tue Jul 07 2020 - Alfredo Moralejo amoralej@redhat.com> - %{OpenStackVersion}-1-3
+- Replace rdo-trunk-ussuri-tested by component based promoted repos
+
 * Thu Jun 04 2020  - %{OpenStackVersion}-1-2
 - Rely on ceph nautilus release rpm instead of ceph repo