diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index fc19db9..7b98c83 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -4,8 +4,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.barbican
 - system.salt.minion.cert.rabbitmq.clients.openstack.barbican
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   barbican:
     server:
       role: ${_param:openstack_node_role}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 3eefcb7..29a1228 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -6,8 +6,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.cinder
 - system.salt.minion.cert.rabbitmq.clients.openstack.cinder
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index c3115e1..825a338 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -3,8 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.cinder
 - system.salt.minion.cert.rabbitmq.clients.openstack.cinder
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index eedc587..8029768 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -1,14 +1,19 @@
 parameters:
   _param:
+    # General
+    cluster_public_protocol: https
+    cluster_internal_protocol: http
     # SSL
     ceilometer_agent_ssl_enabled: False
     openstack_mysql_x509_enabled: False
     # for non-ssl use 5672 / for ssl 5671
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
-    # Openstack memcache security
+    # Openstack memcache
     openstack_memcache_security_enabled: False
     openstack_memcache_security_strategy: 'ENCRYPT'
+    openstack_memcached_proto_tcp_enabled: True
+    openstack_memcached_proto_udp_enabled: False
     # Cinder
     cinder_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     cinder_memcache_secret_key: ''
@@ -38,9 +43,6 @@
     # Ironic
     ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     ironic_memcache_secret_key: ''
-    # Openstack memcached server protocols
-    openstack_memcached_proto_tcp_enabled: True
-    openstack_memcached_proto_udp_enabled: False
     # Apache mods defaults
     apache_mods_status_enabled: True
     apache_mods_status_status: 'disabled'
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index db453f7..ea53cb6 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -8,7 +8,6 @@
 parameters:
   _param:
     designate_admin_api_enabled: false
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index bf520a4..6ab1013 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -5,7 +5,6 @@
 parameters:
   _param:
     designate_admin_api_enabled: false
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 927af95..d442d82 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -6,9 +6,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.heat
 - system.salt.minion.cert.rabbitmq.clients.openstack.heat
 parameters:
-  _param:
-    cluster_public_protocol: 'https'
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index 7ed3772..e7c8a0d 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.aodh
 parameters:
   _param:
-    cluster_public_protocol: https
     aodh_service_protocol: http
     aodh_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index aeb7035..8c975ba 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.barbican
 parameters:
   _param:
-    cluster_public_protocol: https
     barbican_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/billometer.yml b/keystone/client/service/billometer.yml
index 282848e..5aa1f2e 100644
--- a/keystone/client/service/billometer.yml
+++ b/keystone/client/service/billometer.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.billometer
 parameters:
   _param:
-    cluster_public_protocol: https
     billometer_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index ba4d66e..0a08cd2 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.ceilometer
 parameters:
   _param:
-    cluster_public_protocol: https
     ceilometer_service_protocol: http
     ceilometer_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 485b95e..cf27875 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.cinder
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
index a7e8e49..997651a 100644
--- a/keystone/client/service/cinder2.yml
+++ b/keystone/client/service/cinder2.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.cinder2
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/cinder3.yml b/keystone/client/service/cinder3.yml
index 5c6b6d0..870c781 100644
--- a/keystone/client/service/cinder3.yml
+++ b/keystone/client/service/cinder3.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.cinder3
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/congress.yml b/keystone/client/service/congress.yml
index a6599d5..1e1141b 100644
--- a/keystone/client/service/congress.yml
+++ b/keystone/client/service/congress.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.congress
 parameters:
   _param:
-    cluster_public_protocol: https
     congress_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/contrail.yml b/keystone/client/service/contrail.yml
index 91c925e..4486766 100644
--- a/keystone/client/service/contrail.yml
+++ b/keystone/client/service/contrail.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.contrail
 parameters:
   _param:
-    cluster_public_protocol: https
     contrail_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/designate.yml b/keystone/client/service/designate.yml
index b1828cc..83bb7ef 100644
--- a/keystone/client/service/designate.yml
+++ b/keystone/client/service/designate.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.designate
 parameters:
   _param:
-    cluster_public_protocol: https
     designate_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/glance.yml b/keystone/client/service/glance.yml
index ac4394f..8c6f39d 100644
--- a/keystone/client/service/glance.yml
+++ b/keystone/client/service/glance.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.glance
 parameters:
   _param:
-    cluster_public_protocol: https
     glance_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/glare.yml b/keystone/client/service/glare.yml
index 4534b0e..24d827a 100644
--- a/keystone/client/service/glare.yml
+++ b/keystone/client/service/glare.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     glare_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index 1d1b075..0b46f36 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.gnocchi
 parameters:
   _param:
-    cluster_public_protocol: https
     gnocchi_service_protocol: http
     gnocchi_public_host: ${_param:cluster_public_host}
     gnocchi_public_port: 8041
diff --git a/keystone/client/service/heat-cfn.yml b/keystone/client/service/heat-cfn.yml
index 2ccafc9..b376866 100644
--- a/keystone/client/service/heat-cfn.yml
+++ b/keystone/client/service/heat-cfn.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.heat-cfn
 parameters:
   _param:
-    cluster_public_protocol: https
     heat_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
index 28aa582..e0bae14 100644
--- a/keystone/client/service/heat.yml
+++ b/keystone/client/service/heat.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.heat
 parameters:
   _param:
-    cluster_public_protocol: https
     heat_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
index c1b00d0..1466039 100644
--- a/keystone/client/service/ironic.yml
+++ b/keystone/client/service/ironic.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.ironic
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
     ironic_service_protocol: http
   keystone:
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index 53e7cd1..701fe68 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.keystone
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
     keystone_public_path: "/v2.0"
     keystone_internal_path: "/v2.0"
diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
index 5138c4f..cc7afa3 100644
--- a/keystone/client/service/keystone3.yml
+++ b/keystone/client/service/keystone3.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/manila.yml b/keystone/client/service/manila.yml
index d230892..358ed36 100644
--- a/keystone/client/service/manila.yml
+++ b/keystone/client/service/manila.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.manila
 parameters:
   _param:
-    cluster_public_protocol: https
     manila_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/manila2.yml b/keystone/client/service/manila2.yml
index ae9a02f..38f2672 100644
--- a/keystone/client/service/manila2.yml
+++ b/keystone/client/service/manila2.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.manila2
 parameters:
   _param:
-    cluster_public_protocol: https
     manila_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/murano.yml b/keystone/client/service/murano.yml
index e6c70f1..aa3cee3 100644
--- a/keystone/client/service/murano.yml
+++ b/keystone/client/service/murano.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     murano_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
index 06690ce..33434c1 100644
--- a/keystone/client/service/neutron.yml
+++ b/keystone/client/service/neutron.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.neutron
 parameters:
   _param:
-    cluster_public_protocol: https
     neutron_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/nova-ec2.yml b/keystone/client/service/nova-ec2.yml
index 586701c..f8faf34 100644
--- a/keystone/client/service/nova-ec2.yml
+++ b/keystone/client/service/nova-ec2.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    cluster_public_protocol: https
   keystone:
     client:
       server:
diff --git a/keystone/client/service/nova-placement.yml b/keystone/client/service/nova-placement.yml
index 3ab8e95..1537a62 100644
--- a/keystone/client/service/nova-placement.yml
+++ b/keystone/client/service/nova-placement.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.nova-placement
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
index 147d0f7..24a1dd5 100644
--- a/keystone/client/service/nova.yml
+++ b/keystone/client/service/nova.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.nova
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 33ebda5..2335f5a 100644
--- a/keystone/client/service/nova21.yml
+++ b/keystone/client/service/nova21.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.nova21
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index bf16b79..a38d40e 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.octavia
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
     octavia_service_protocol: http
   keystone:
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index 6c6a036..7ad4397 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.panko
 parameters:
   _param:
-    cluster_public_protocol: https
     panko_service_protocol: http
     panko_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index e53d9fc..b44d7eb 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.radosgw-s3
 parameters:
   _param:
-    cluster_public_protocol: https
     radosgw_s3_cluster_port: 8081
     radosgw_service_protocol: http
   keystone:
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index a643433..5dc4c3b 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -2,7 +2,6 @@
 - system.keystone.client.v3.service.radosgw-swift
 parameters:
   _param:
-    cluster_public_protocol: https
     radosgw_swift_cluster_port: 8081
     radosgw_service_protocol: http
   keystone:
diff --git a/keystone/client/service/sahara.yml b/keystone/client/service/sahara.yml
index b635137..526649a 100644
--- a/keystone/client/service/sahara.yml
+++ b/keystone/client/service/sahara.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     sahara_internal_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/swift-s3.yml b/keystone/client/service/swift-s3.yml
index b2769a0..d36d279 100644
--- a/keystone/client/service/swift-s3.yml
+++ b/keystone/client/service/swift-s3.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     swift_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/swift.yml b/keystone/client/service/swift.yml
index 6f558fb..b599d97 100644
--- a/keystone/client/service/swift.yml
+++ b/keystone/client/service/swift.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     swift_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/service/tacker.yml b/keystone/client/service/tacker.yml
index 335bc6e..28eef93 100644
--- a/keystone/client/service/tacker.yml
+++ b/keystone/client/service/tacker.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     tacker_service_protocol: http
     tacker_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/v3/service/aodh.yml b/keystone/client/v3/service/aodh.yml
index de85fb0..eafd92a 100644
--- a/keystone/client/v3/service/aodh.yml
+++ b/keystone/client/v3/service/aodh.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     aodh_service_protocol: http
     aodh_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/v3/service/barbican.yml b/keystone/client/v3/service/barbican.yml
index 4262ffd..93ce204 100644
--- a/keystone/client/v3/service/barbican.yml
+++ b/keystone/client/v3/service/barbican.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     barbican_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/billometer.yml b/keystone/client/v3/service/billometer.yml
index 17cc28a..0992519 100644
--- a/keystone/client/v3/service/billometer.yml
+++ b/keystone/client/v3/service/billometer.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     billometer_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/ceilometer.yml b/keystone/client/v3/service/ceilometer.yml
index e52a5c0..4c62ec7 100644
--- a/keystone/client/v3/service/ceilometer.yml
+++ b/keystone/client/v3/service/ceilometer.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     ceilometer_service_protocol: http
     ceilometer_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index 30a159f..4f6c76c 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/cinder2.yml b/keystone/client/v3/service/cinder2.yml
index c1ccec6..886edee 100644
--- a/keystone/client/v3/service/cinder2.yml
+++ b/keystone/client/v3/service/cinder2.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/cinder3.yml b/keystone/client/v3/service/cinder3.yml
index 2184c4c..9682186 100644
--- a/keystone/client/v3/service/cinder3.yml
+++ b/keystone/client/v3/service/cinder3.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     cinder_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/congress.yml b/keystone/client/v3/service/congress.yml
index db0085b..15cce34 100644
--- a/keystone/client/v3/service/congress.yml
+++ b/keystone/client/v3/service/congress.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     congress_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/contrail.yml b/keystone/client/v3/service/contrail.yml
index 9eee3e8..1b5701f 100644
--- a/keystone/client/v3/service/contrail.yml
+++ b/keystone/client/v3/service/contrail.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     contrail_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/designate.yml b/keystone/client/v3/service/designate.yml
index 59b2e6b..821f2cb 100644
--- a/keystone/client/v3/service/designate.yml
+++ b/keystone/client/v3/service/designate.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     designate_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/glance.yml b/keystone/client/v3/service/glance.yml
index dd86545..a690a73 100644
--- a/keystone/client/v3/service/glance.yml
+++ b/keystone/client/v3/service/glance.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     glance_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/gnocchi.yml b/keystone/client/v3/service/gnocchi.yml
index 82c796a..6a11023 100644
--- a/keystone/client/v3/service/gnocchi.yml
+++ b/keystone/client/v3/service/gnocchi.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     gnocchi_service_protocol: http
     gnocchi_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/v3/service/heat-cfn.yml b/keystone/client/v3/service/heat-cfn.yml
index 786d9d8..c8a068b 100644
--- a/keystone/client/v3/service/heat-cfn.yml
+++ b/keystone/client/v3/service/heat-cfn.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     heat_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
index 6c45bfe..a1b248f 100644
--- a/keystone/client/v3/service/heat.yml
+++ b/keystone/client/v3/service/heat.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     heat_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/ironic.yml b/keystone/client/v3/service/ironic.yml
index bd101e6..216049c 100644
--- a/keystone/client/v3/service/ironic.yml
+++ b/keystone/client/v3/service/ironic.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
     ironic_service_protocol: http
   keystone:
diff --git a/keystone/client/v3/service/keystone.yml b/keystone/client/v3/service/keystone.yml
index a2c7837..ab3b29c 100644
--- a/keystone/client/v3/service/keystone.yml
+++ b/keystone/client/v3/service/keystone.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/manila.yml b/keystone/client/v3/service/manila.yml
index f486845..9030c98 100644
--- a/keystone/client/v3/service/manila.yml
+++ b/keystone/client/v3/service/manila.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     manila_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/manila2.yml b/keystone/client/v3/service/manila2.yml
index 635147a..06aa44e 100644
--- a/keystone/client/v3/service/manila2.yml
+++ b/keystone/client/v3/service/manila2.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     manila_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/neutron.yml b/keystone/client/v3/service/neutron.yml
index 277a563..8f3c47e 100644
--- a/keystone/client/v3/service/neutron.yml
+++ b/keystone/client/v3/service/neutron.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     neutron_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/nova-placement.yml b/keystone/client/v3/service/nova-placement.yml
index 1fea757..fc8956a 100644
--- a/keystone/client/v3/service/nova-placement.yml
+++ b/keystone/client/v3/service/nova-placement.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/nova.yml b/keystone/client/v3/service/nova.yml
index 6665617..d2f76f6 100644
--- a/keystone/client/v3/service/nova.yml
+++ b/keystone/client/v3/service/nova.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/nova21.yml b/keystone/client/v3/service/nova21.yml
index e936676..5bccedf 100644
--- a/keystone/client/v3/service/nova21.yml
+++ b/keystone/client/v3/service/nova21.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     nova_service_protocol: http
   keystone:
     client:
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index eca4975..26940ff 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -3,7 +3,6 @@
 
 parameters:
   _param:
-    cluster_public_protocol: https
     keystone_service_protocol: http
     octavia_service_protocol: http
   keystone:
diff --git a/keystone/client/v3/service/panko.yml b/keystone/client/v3/service/panko.yml
index cf09f34..5f4c70b 100644
--- a/keystone/client/v3/service/panko.yml
+++ b/keystone/client/v3/service/panko.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     panko_service_protocol: http
     panko_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/keystone/client/v3/service/radosgw-s3.yml b/keystone/client/v3/service/radosgw-s3.yml
index d069d9e..7c03f4a 100644
--- a/keystone/client/v3/service/radosgw-s3.yml
+++ b/keystone/client/v3/service/radosgw-s3.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     radosgw_s3_cluster_port: 8081
     radosgw_service_protocol: http
   keystone:
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index e3b8ac3..4452e0f 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     radosgw_swift_cluster_port: 8081
     radosgw_service_protocol: http
   keystone:
diff --git a/keystone/client/v3/service/tacker.yml b/keystone/client/v3/service/tacker.yml
index c5187dd..8a01280 100644
--- a/keystone/client/v3/service/tacker.yml
+++ b/keystone/client/v3/service/tacker.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     tacker_service_protocol: http
     tacker_public_host: ${_param:cluster_public_host}
   keystone:
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 71d848d..a821aa3 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -5,7 +5,6 @@
 parameters:
   _param:
     manila_cluster_vip_address: ${_param:cluster_vip_address}
-    cluster_internal_protocol: 'http'
   manila:
     common:
       version: ${_param:openstack_version}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index 2ff514b..d91a115 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -3,8 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.manila
 - system.salt.minion.cert.rabbitmq.clients.openstack.manila
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   manila:
     common:
       version: ${_param:openstack_version}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 18227df..12e09e6 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -6,8 +6,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.neutron
 - system.salt.minion.cert.rabbitmq.clients.openstack.neutron
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 094449e..9578960 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -11,7 +11,6 @@
     neutron_enable_vlan_aware_vms: False
     neutron_enable_bgp_vpn: False
     neutron_bgp_vpn_driver: bagpipe
-    cluster_internal_protocol: 'http'
   neutron:
     server:
       role: ${_param:openstack_node_role}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 3053335..84e00fd 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -36,7 +36,6 @@
       7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo
       SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
       -----END RSA PRIVATE KEY-----
-    cluster_internal_protocol: 'http'
   openssh:
     client:
       enabled: True
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 7ba6775..a44fe23 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -36,7 +36,6 @@
       7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo
       SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
       -----END RSA PRIVATE KEY-----
-    cluster_internal_protocol: 'http'
   openssh:
     client:
       enabled: True
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index 885a869..deed63a 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -1,8 +1,6 @@
 classes:
 - service.nova.compute.ironic
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   nova:
     compute:
       version: ${_param:nova_version}
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index 69025d3..cddaa4d 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -1,8 +1,6 @@
 classes:
 - service.nova.compute.ironic
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   nova:
     compute:
       version: ${_param:nova_version}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 330a233..04ba5ee 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -13,7 +13,6 @@
     nova_ram_allocation_ratio: 1.5
     nova_disk_allocation_ratio: 1.0
     metadata_password: metadataPass
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 5b61f20..4f56665 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -3,8 +3,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.nova
 - service.nova.control.single
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   linux:
     system:
       package:
diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index 9e5d0c9..5b0f0ca 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -2,8 +2,6 @@
 - service.octavia.api.cluster
 - system.haproxy.proxy.listen.openstack.octavia
 parameters:
-  _param:
-    cluster_internal_protocol: 'http'
   octavia:
     api:
       enabled: true
diff --git a/vnf_onboarding/common/init.yml b/vnf_onboarding/common/init.yml
index 354a327..f988897 100644
--- a/vnf_onboarding/common/init.yml
+++ b/vnf_onboarding/common/init.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    cluster_public_protocol: https
     mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
     vnf_gerrit_credentials: "gerrit"
     vnf_openstack_api_url: "${_param:cluster_public_protocol}://${_param:cluster_public_host}:5000/v2.0"