diff --git a/group_vars/all/cinder.yml b/group_vars/all/cinder.yml
index 4dc16c5e92..84902446c6 100644
--- a/group_vars/all/cinder.yml
+++ b/group_vars/all/cinder.yml
@@ -15,3 +15,4 @@
 
 # Consumed by the Nova role so it must remain in the 'all' scoped vars
 cinder_ceph_client: cinder
+cinder_service_port: 8776
diff --git a/group_vars/all/keystone.yml b/group_vars/all/keystone.yml
index db388114f7..f9593dd400 100644
--- a/group_vars/all/keystone.yml
+++ b/group_vars/all/keystone.yml
@@ -32,3 +32,8 @@ keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | de
 keystone_service_internaluri_insecure: "{% if keystone_service_internaluri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
 keystone_service_internaluri: "{{ keystone_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_service_port }}"
 keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
+
+keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}"
+keystone_service_publicuri_insecure: "{% if keystone_service_publicuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
+keystone_service_publicuri: "{{ keystone_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ keystone_service_port }}"
+keystone_service_publicurl: "{{ keystone_service_publicuri }}/v3"
diff --git a/group_vars/all/nova.yml b/group_vars/all/nova.yml
index 0e115ac970..22d7bde8cd 100644
--- a/group_vars/all/nova.yml
+++ b/group_vars/all/nova.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+nova_service_port: 8774
 # Consumed by Neutron role and must remained scoped to 'all' group
 nova_metadata_port: 8775
 nova_service_region: "{{ service_region }}"
diff --git a/group_vars/cinder_all.yml b/group_vars/cinder_all.yml
index cce37e1127..5a79789aa9 100644
--- a/group_vars/cinder_all.yml
+++ b/group_vars/cinder_all.yml
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 cinder_service_region: "{{ service_region }}"
-cinder_service_port: 8776
 # If there are Swift hosts in the environment, then enable cinder backups to it
 cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
 
diff --git a/group_vars/keystone_all.yml b/group_vars/keystone_all.yml
index e7be3a9e63..9f246cde70 100644
--- a/group_vars/keystone_all.yml
+++ b/group_vars/keystone_all.yml
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}"
-keystone_service_publicuri_insecure: "{% if keystone_service_publicuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
-keystone_service_publicuri: "{{ keystone_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ keystone_service_port }}"
-keystone_service_publicurl: "{{ keystone_service_publicuri }}/v3"
-
 # These are here rather than in keystone_all because
 # both the os_ceilometer and os_keystone roles require them