diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 43b1ba3..474deb9 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -11,7 +11,7 @@
         password: ${_param:heat_domain_admin_password}
         domain: heat
       enabled: true
-      region: RegionOne
+      region: ${_param:openstack_region}
       version: ${_param:heat_version}
       bind:
         api_cfn:
@@ -52,4 +52,4 @@
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}
-          - host: ${_param:openstack_message_queue_node03_address}
\ No newline at end of file
+          - host: ${_param:openstack_message_queue_node03_address}
diff --git a/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
index e108f68..12fe9fe 100644
--- a/keystone/client/service/neutron.yml
+++ b/keystone/client/service/neutron.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    neutron_public_protocol: https
+    cluster_public_protocol: https
   keystone:
     client:
       server:
@@ -19,7 +19,7 @@
               endpoints:
               - region: ${_param:openstack_region}
                 public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:neutron_public_protocol}
+                public_protocol: ${_param:cluster_public_protocol}
                 public_port: 9696
                 public_path: '/'
                 internal_address: ${_param:neutron_service_host}