diff --git a/attributes/default.rb b/attributes/default.rb
index f30c3655..b64c5bb7 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -131,10 +131,10 @@ default['openstack']['apt']['components'] = ["#{node['lsb']['codename']}-updates
 # default['openstack']['apt']['components'] = [ '%codename%-proposed/%release%', 'main' ]
 
 default['openstack']['yum']['rdo_enabled'] = true
-default['openstack']['yum']['uri'] = 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/'
+default['openstack']['yum']['uri'] = "http://mirror.centos.org/centos/$releasever/cloud/$basearch/openstack-#{node['openstack']['release']}"
 default['openstack']['yum']['repo-key'] = 'https://raw.githubusercontent.com/redhat-openstack/rdo-release/master/RPM-GPG-KEY-CentOS-SIG-Cloud'
 # Enforcing GnuPG signature check for RDO repo. Set this to false if you want to disable the check.
-default['openstack']['yum']['gpgcheck'] = false
+default['openstack']['yum']['gpgcheck'] = true
 default['openstack']['endpoints']['family'] = 'inet'
 
 # Set a default region that other regions are set to - such that changing the region for all services can be done in one place
diff --git a/spec/default-redhat_spec.rb b/spec/default-redhat_spec.rb
index 4a9d16c9..19910159 100644
--- a/spec/default-redhat_spec.rb
+++ b/spec/default-redhat_spec.rb
@@ -14,7 +14,6 @@ describe 'openstack-common::default' do
     context 'enabling RDO with gpgcheck enabled' do
       before do
         node.set['openstack']['yum']['rdo_enabled'] = true
-        node.set['openstack']['yum']['gpgcheck'] = true
       end
 
       it 'adds RDO yum repository' do