diff --git a/cassandra/backup/client/single.yml b/cassandra/backup/client/single.yml
index 90fdc5d..892f92f 100644
--- a/cassandra/backup/client/single.yml
+++ b/cassandra/backup/client/single.yml
@@ -1,4 +1,5 @@
 classes:
+- service.cassandra.backup.client
 - system.openssh.client.root
 parameters:
   _param:
diff --git a/cassandra/backup/server/single.yml b/cassandra/backup/server/single.yml
index 1762504..ffb43cf 100644
--- a/cassandra/backup/server/single.yml
+++ b/cassandra/backup/server/single.yml
@@ -1,3 +1,5 @@
+classes:
+- service.cassandra.backup.server
 parameters:
   _param:
     cassandra_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN
diff --git a/jenkins/client/job/deploy/update/cloud_update.yml b/jenkins/client/job/deploy/update/cloud_update.yml
index 8fc84ee..0480557 100644
--- a/jenkins/client/job/deploy/update/cloud_update.yml
+++ b/jenkins/client/job/deploy/update/cloud_update.yml
@@ -56,10 +56,10 @@
               type: string
               default: ""
               description: "Comma separated list of nodes to rollback (Valid values are ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cmp,kvm,osd,gtw-physical)"
-            TARGET_MERGES:
+            TARGET_SNAPSHOT_MERGES:
               type: string
               default: ""
-              description: "Comma separated list of nodes to merge (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid)"
+              description: "Comma separated list of nodes to merge live snapshot for (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid)"
             CTL_TARGET:
               type: string
               default: "ctl*"
diff --git a/nginx/server/proxy/openstack/aodh.yml b/nginx/server/proxy/openstack/aodh.yml
index bd73165..d15bca5 100644
--- a/nginx/server/proxy/openstack/aodh.yml
+++ b/nginx/server/proxy/openstack/aodh.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_aodh_host: ${_param:aodh_service_host}
+    nginx_proxy_openstack_aodh_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -15,7 +16,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_aodh_host}
             port: 8042
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_aodh_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8042
diff --git a/nginx/server/proxy/openstack/barbican.yml b/nginx/server/proxy/openstack/barbican.yml
index 89e5a9c..6ac6a14 100644
--- a/nginx/server/proxy/openstack/barbican.yml
+++ b/nginx/server/proxy/openstack/barbican.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_barbican_host: ${_param:barbican_service_host}
+    nginx_proxy_openstack_barbican_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -15,7 +16,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_barbican_host}
             port: 9311
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_barbican_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 9311
diff --git a/nginx/server/proxy/openstack/ceilometer.yml b/nginx/server/proxy/openstack/ceilometer.yml
index 938b6cf..78b1f00 100644
--- a/nginx/server/proxy/openstack/ceilometer.yml
+++ b/nginx/server/proxy/openstack/ceilometer.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_ceilometer_host: ${_param:ceilometer_service_host}
+    nginx_proxy_openstack_ceilometer_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -15,7 +16,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_ceilometer_host}
             port: 8777
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_ceilometer_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8777
diff --git a/nginx/server/proxy/openstack/designate.yml b/nginx/server/proxy/openstack/designate.yml
index c238775..ce92ff6 100644
--- a/nginx/server/proxy/openstack/designate.yml
+++ b/nginx/server/proxy/openstack/designate.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_designate_host: ${_param:designate_service_host}
+    nginx_proxy_openstack_designate_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -14,7 +15,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_designate_host}
             port: 9001
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_designate_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 9001
diff --git a/nginx/server/proxy/openstack/gnocchi.yml b/nginx/server/proxy/openstack/gnocchi.yml
index 2f6d0e5..6169648 100644
--- a/nginx/server/proxy/openstack/gnocchi.yml
+++ b/nginx/server/proxy/openstack/gnocchi.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_gnocchi_host: ${_param:gnocchi_service_host}
+    nginx_proxy_openstack_gnocchi_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -15,7 +16,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_gnocchi_host}
             port: 8041
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_gnocchi_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8041
diff --git a/nginx/server/proxy/openstack/ironic.yml b/nginx/server/proxy/openstack/ironic.yml
index 95eb1bd..6ccedb3 100644
--- a/nginx/server/proxy/openstack/ironic.yml
+++ b/nginx/server/proxy/openstack/ironic.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_ironic_host: ${_param:ironic_service_host}
+    nginx_proxy_openstack_ironic_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -14,7 +15,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_ironic_host}
             port: 6385
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_ironic_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 6385
diff --git a/nginx/server/proxy/openstack/manila.yml b/nginx/server/proxy/openstack/manila.yml
index 050d0de..8157dd8 100644
--- a/nginx/server/proxy/openstack/manila.yml
+++ b/nginx/server/proxy/openstack/manila.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_manila_host: ${_param:manila_service_host}
+    nginx_proxy_openstack_manila_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -14,7 +15,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_manila_host}
             port: 8786
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_manila_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8786
diff --git a/nginx/server/proxy/openstack/panko.yml b/nginx/server/proxy/openstack/panko.yml
index 6081dd1..45d389b 100644
--- a/nginx/server/proxy/openstack/panko.yml
+++ b/nginx/server/proxy/openstack/panko.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_panko_host: ${_param:panko_service_host}
+    nginx_proxy_openstack_panko_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -15,7 +16,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_panko_host}
             port: 8977
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_panko_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8977
diff --git a/nginx/server/proxy/openstack/placement.yml b/nginx/server/proxy/openstack/placement.yml
index eda272c..9e8b08c 100644
--- a/nginx/server/proxy/openstack/placement.yml
+++ b/nginx/server/proxy/openstack/placement.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
     nginx_proxy_openstack_placement_host: ${_param:placement_service_host}
+    nginx_proxy_openstack_placement_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -14,7 +15,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_placement_host}
             port: 8778
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_placement_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8778
diff --git a/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
index 4f6073d..26a25da 100644
--- a/nginx/server/proxy/openstack_api.yml
+++ b/nginx/server/proxy/openstack_api.yml
@@ -8,6 +8,12 @@
     nginx_proxy_openstack_glance_host: ${_param:glance_service_host}
     nginx_proxy_openstack_neutron_host: ${_param:neutron_service_host}
     nginx_proxy_openstack_heat_host: ${_param:heat_service_host}
+    nginx_proxy_openstack_keystone_protocol: 'http'
+    nginx_proxy_openstack_nova_protocol: 'http'
+    nginx_proxy_openstack_cinder_protocol: 'http'
+    nginx_proxy_openstack_glance_protocol: 'http'
+    nginx_proxy_openstack_neutron_protocol: 'http'
+    nginx_proxy_openstack_heat_protocol: 'http'
   nginx:
     server:
       enabled: true
@@ -20,7 +26,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_keystone_host}
             port: 5000
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_keystone_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 5000
@@ -34,7 +40,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_keystone_host}
             port: 35357
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_keystone_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 35357
@@ -48,7 +54,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_nova_host}
             port: 8774
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_nova_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8774
@@ -62,7 +68,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_cinder_host}
             port: 8776
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_cinder_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8776
@@ -77,7 +83,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_glance_host}
             port: 9292
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_glance_protocol}
             size: 30000m
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
@@ -92,7 +98,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_neutron_host}
             port: 9696
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_neutron_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 9696
@@ -105,7 +111,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_heat_host}
             port: 8003
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_heat_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8003
@@ -118,7 +124,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_heat_host}
             port: 8000
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_heat_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8000
@@ -132,7 +138,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_heat_host}
             port: 8004
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_heat_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8004
@@ -146,7 +152,7 @@
           proxy:
             host: ${_param:nginx_proxy_openstack_nova_host}
             port: 8773
-            protocol: http
+            protocol: ${_param:nginx_proxy_openstack_nova_protocol}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 8773
diff --git a/zookeeper/backup/client/single.yml b/zookeeper/backup/client/single.yml
index 0085b79..d8eaaac 100644
--- a/zookeeper/backup/client/single.yml
+++ b/zookeeper/backup/client/single.yml
@@ -1,4 +1,5 @@
 classes:
+- service.zookeeper.backup.client
 - system.openssh.client.root
 parameters:
   _param:
diff --git a/zookeeper/backup/server/single.yml b/zookeeper/backup/server/single.yml
index aaa877b..6796d8a 100644
--- a/zookeeper/backup/server/single.yml
+++ b/zookeeper/backup/server/single.yml
@@ -1,3 +1,5 @@
+classes:
+- service.zookeeper.backup.server
 parameters:
   _param:
     zookeeper_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN