diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index ba3c682..d80c7d0 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -15,3 +15,6 @@
     # Nova
     nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     nova_memcache_secret_key: ''
+    # Glance
+    glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+    glance_memcache_secret_key: ''
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index 7985217..964899d 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -9,6 +9,9 @@
     gerrit_ldap_group_base: ""
     gerrit_http_listen_url: http://*:8080/
     gerrit_extra_opts: ""
+    gerrit_db_publish_port: 13306
+    gerrit_publish_port: 18083
+    gerrit_ssh_publish_port: 29417
   docker:
     client:
       stack:
@@ -20,8 +23,8 @@
                   condition: any
               image: ${_param:docker_image_gerrit}
               ports:
-                - 18083:8080
-                - 29417:29418
+                - ${_param:gerrit_publish_port}:8080
+                - ${_param:gerrit_ssh_publish_port}:29418
               volumes:
                 - /srv/volumes/gerrit:/var/gerrit/review_site
               depends_on:
@@ -62,6 +65,6 @@
                   condition: any
               image: "${_param:docker_image_mysql}"
               ports:
-                - 13306:3306
+                - ${_param:gerrit_db_publish_port}:3306
               volumes:
                 - /srv/volumes/mysql:/var/lib/mysql
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index de8e9ae..0c17ac8 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,9 +6,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
-  _param:
-    glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
-    glance_memcache_secret_key: ''
   linux:
     system:
       cron:
diff --git a/glance/control/single.yml b/glance/control/single.yml
index ad6e1cb..c9b818d 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,9 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
-  _param:
-    glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
-    glance_memcache_secret_key: ''
   linux:
     system:
       cron:
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 958fae1..485b95e 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -15,21 +15,3 @@
                   is_admin: true
                   password: ${_param:keystone_cinder_password}
                   email: ${_param:admin_email}
-          service:
-            cinder:
-              type: volume
-              description: OpenStack Volume Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8776
-                public_path: '/v1/$(project_id)s'
-                internal_address: ${_param:cinder_service_host}
-                internal_port: 8776
-                internal_path: '/v1/$(project_id)s'
-                internal_protocol: ${_param:cinder_service_protocol}
-                admin_protocol: ${_param:cinder_service_protocol}
-                admin_address: ${_param:cinder_service_host}
-                admin_port: 8776
-                admin_path: '/v1/$(project_id)s'
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index b8ab7f1..74d3e5b 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -2,6 +2,7 @@
 - system.keystone.client.os_client_config.admin_identity
 - system.keystone.client.service.cinder
 - system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
 - system.keystone.client.service.glance
 - system.keystone.client.service.heat
 - system.keystone.client.service.heat-cfn
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index bfb0e70..30a159f 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -14,20 +14,3 @@
                 service_admin:
                   name: admin
                   project_id: service
-          services:
-            cinder:
-              type: volume
-              description: OpenStack Volume Service
-              endpoints:
-                cinder_public_v1:
-                  interface: 'public'
-                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8776/v1/$(project_id)s
-                  region: ${_param:openstack_region}
-                cinder_internal_v1:
-                  interface: 'internal'
-                  url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
-                  region: ${_param:openstack_region}
-                cinder_admin_v1:
-                  interface: 'admin'
-                  url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
-                  region: ${_param:openstack_region}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 52a91ea..18227df 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -3,7 +3,6 @@
 - service.haproxy.proxy.single
 - service.neutron.control.cluster
 - system.haproxy.proxy.listen.openstack.neutron
-- system.galera.server.database.neutron
 - system.salt.minion.cert.mysql.clients.openstack.neutron
 - system.salt.minion.cert.rabbitmq.clients.openstack.neutron
 parameters:
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 5cf06bf..e47aa2c 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -1,6 +1,5 @@
 classes:
 - system.neutron.control.single
-- system.galera.server.database.neutron
 parameters:
   neutron:
     server:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 40bdea3..2210f2f 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,6 +1,5 @@
 classes:
 - service.neutron.control.single
-- system.galera.server.database.neutron
 - system.salt.minion.cert.mysql.clients.openstack.neutron
 - system.salt.minion.cert.rabbitmq.clients.openstack.neutron
 parameters: