diff --git a/backupninja/client/single.yml b/backupninja/client/single.yml
new file mode 100644
index 0000000..6eecc33
--- /dev/null
+++ b/backupninja/client/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.backupninja.client.single
diff --git a/backupninja/server/single.yml b/backupninja/server/single.yml
new file mode 100644
index 0000000..9897a6c
--- /dev/null
+++ b/backupninja/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.backupninja.server.single
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index a8b1f90..9758af2 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -1,7 +1,7 @@
 classes:
 - service.ceilometer.server.single
 parameters:
-  ceilometer:	
+  ceilometer:
     server:
       database:
         influxdb:
diff --git a/glusterfs/cluster.yml b/glusterfs/cluster.yml
index e69de29..8a5c595 100644
--- a/glusterfs/cluster.yml
+++ b/glusterfs/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.glusterfs.server
diff --git a/horizon/server/cluster.yml b/horizon/server/cluster.yml
index fbe8df4..8ee48a3 100644
--- a/horizon/server/cluster.yml
+++ b/horizon/server/cluster.yml
@@ -1,5 +1,16 @@
 classes:
 - service.keepalived.cluster.single
-- service.horizon.server.single
+- service.horizon.server.cluster
 - service.haproxy.proxy.single
 - system.haproxy.proxy.listen.openstack.horizon
+- system.memcached.server.single
+parameters:
+  _param:
+    horizon_site_branding: "OpenStack Dashboard"
+  horizon:
+    server:
+      branding: ${_param:horizon_site_branding}
+      plugin: {}
+      session:
+        engine: "cache"
+
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index c20de5a..2b59f52 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -1,8 +1,9 @@
 classes:
 - service.horizon.server.single
+- system.memcached.server.single
 parameters:
   _param:
-    horizon_site_branding: OpenStack Dashboard
+    horizon_site_branding: "OpenStack Dashboard"
   horizon:
     server:
       branding: ${_param:horizon_site_branding}
@@ -10,3 +11,6 @@
         address: 0.0.0.0
         port: 8078
       plugin: {}
+      session:
+        engine: "cache"
+
diff --git a/jenkins/client/job/debian/packages/heat/resources.yml b/jenkins/client/job/debian/packages/heat/resources.yml
index c7fb4d0..d167434 100644
--- a/jenkins/client/job/debian/packages/heat/resources.yml
+++ b/jenkins/client/job/debian/packages/heat/resources.yml
@@ -50,7 +50,7 @@
                 default: "{{branch}}"
               SOURCE_CREDENTIALS:
                 type: string
-                default: ""
+                default: "github-credentials"
               DEBIAN_SNAPSHOT:
                 type: boolean
                 default: 'true'
diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/devops-portal.yml
index 50f72a4..14735b6 100644
--- a/jenkins/client/job/docker/devops-portal.yml
+++ b/jenkins/client/job/docker/devops-portal.yml
@@ -22,6 +22,11 @@
                 "oss/devops-portal":
                   branches:
                     - master
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
               event:
                 patchset:
                   - created:
diff --git a/jenkins/master/config.yml b/jenkins/master/config.yml
index 41e3ffb..795b748 100644
--- a/jenkins/master/config.yml
+++ b/jenkins/master/config.yml
@@ -8,4 +8,11 @@
           pillar:
             jenkins:
               master:
-                home: /srv/volumes/jenkins
\ No newline at end of file
+                home: /srv/volumes/jenkins
+      sudo:
+        users:
+          jenkins:
+            hosts:
+            - ALL
+            commands:
+            - docker
\ No newline at end of file
diff --git a/jenkins/master/single.yml b/jenkins/master/single.yml
index e69de29..9d5a611 100644
--- a/jenkins/master/single.yml
+++ b/jenkins/master/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.jenkins.master.single
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index ef0a030..26c7d2b 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -37,8 +37,7 @@
         location: /var/lib/keystone/fernet-keys
       message_queue:
         engine: rabbitmq
-        members:
-          - host: ${_param:single_address}
+        host: ${_param:single_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/linux/network/interface/bond_ovs_dvr.yml b/linux/network/interface/bond_ovs_dvr.yml
deleted file mode 100644
index e69de29..0000000
--- a/linux/network/interface/bond_ovs_dvr.yml
+++ /dev/null
diff --git a/linux/network/interface/bond_vlan_dvr.yml b/linux/network/interface/bond_vlan_dvr.yml
deleted file mode 100644
index e69de29..0000000
--- a/linux/network/interface/bond_vlan_dvr.yml
+++ /dev/null
diff --git a/mysql/client/database_init/aodh.yml b/mysql/client/database_init/aodh.yml
new file mode 100644
index 0000000..5a88169
--- /dev/null
+++ b/mysql/client/database_init/aodh.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.aodh
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            aodh:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: aodh
diff --git a/mysql/client/database_init/ceilometer.yml b/mysql/client/database_init/ceilometer.yml
new file mode 100644
index 0000000..7f13c6d
--- /dev/null
+++ b/mysql/client/database_init/ceilometer.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.ceilometer
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            ceilometer:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: ceilometer
diff --git a/mysql/client/database_init/cinder.yml b/mysql/client/database_init/cinder.yml
new file mode 100644
index 0000000..9614aad
--- /dev/null
+++ b/mysql/client/database_init/cinder.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.cinder
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            cinder:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: cinder
diff --git a/mysql/client/database_init/designate.yml b/mysql/client/database_init/designate.yml
new file mode 100644
index 0000000..99d0036
--- /dev/null
+++ b/mysql/client/database_init/designate.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.designate
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            designate:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: designate
diff --git a/mysql/client/database_init/designate_pool_manager.yml b/mysql/client/database_init/designate_pool_manager.yml
new file mode 100644
index 0000000..6a5b385
--- /dev/null
+++ b/mysql/client/database_init/designate_pool_manager.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.designate_pool_manager
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            designate_pool_manager:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: designate_pool_manager
diff --git a/mysql/client/database_init/glance.yml b/mysql/client/database_init/glance.yml
new file mode 100644
index 0000000..703c603
--- /dev/null
+++ b/mysql/client/database_init/glance.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.glance
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            glance:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: glance
diff --git a/mysql/client/database_init/grafana.yml b/mysql/client/database_init/grafana.yml
new file mode 100644
index 0000000..aeb2e26
--- /dev/null
+++ b/mysql/client/database_init/grafana.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.grafana
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            grafana:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: grafana
diff --git a/mysql/client/database_init/heat.yml b/mysql/client/database_init/heat.yml
new file mode 100644
index 0000000..c7a0f00
--- /dev/null
+++ b/mysql/client/database_init/heat.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.heat
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            heat:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: heat
diff --git a/mysql/client/database_init/keystone.yml b/mysql/client/database_init/keystone.yml
new file mode 100644
index 0000000..555cae6
--- /dev/null
+++ b/mysql/client/database_init/keystone.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.keystone
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            keystone:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: keystone
diff --git a/mysql/client/database_init/murano.yml b/mysql/client/database_init/murano.yml
new file mode 100644
index 0000000..13515e7
--- /dev/null
+++ b/mysql/client/database_init/murano.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.murano
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            murano:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: murano
diff --git a/mysql/client/database_init/neutron.yml b/mysql/client/database_init/neutron.yml
new file mode 100644
index 0000000..405f3e6
--- /dev/null
+++ b/mysql/client/database_init/neutron.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.neutron
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            neutron:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: neutron
diff --git a/mysql/client/database_init/nova.yml b/mysql/client/database_init/nova.yml
new file mode 100644
index 0000000..f1ee6cf
--- /dev/null
+++ b/mysql/client/database_init/nova.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.nova
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            nova:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: nova
diff --git a/mysql/client/database_init/nova_api.yml b/mysql/client/database_init/nova_api.yml
new file mode 100644
index 0000000..2fa8630
--- /dev/null
+++ b/mysql/client/database_init/nova_api.yml
@@ -0,0 +1,21 @@
+classes:
+- system.mysql.client.database.nova_api
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            nova_api:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: nova_api
+            nova_cell0:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: nova_cell0
diff --git a/mysql/client/database_init/sahara.yml b/mysql/client/database_init/sahara.yml
new file mode 100644
index 0000000..ef3d981
--- /dev/null
+++ b/mysql/client/database_init/sahara.yml
@@ -0,0 +1,15 @@
+classes:
+- system.mysql.client.database.sahara
+parameters:
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          database:
+            sahara:
+              initial_data:
+                engine: backupninja
+                source: ${_param:backupninja_backup_host}
+                host: ${linux:network:fqdn}
+                database: sahara
diff --git a/mysql/client/single_init.yml b/mysql/client/single_init.yml
new file mode 100644
index 0000000..0c20049
--- /dev/null
+++ b/mysql/client/single_init.yml
@@ -0,0 +1,24 @@
+classes:
+- system.mysql.client.database_init.aodh
+- system.mysql.client.database_init.ceilometer
+- system.mysql.client.database_init.cinder
+- system.mysql.client.database_init.glance
+- system.mysql.client.database_init.heat
+- system.mysql.client.database_init.keystone
+- system.mysql.client.database_init.nova
+- system.mysql.client.database_init.nova_api
+- system.mysql.client.database_init.neutron
+parameters:
+  _param:
+    mysql_client_host: localhost
+  mysql:
+    client:
+      enabled: true
+      server:
+        database:
+          admin:
+            host: ${_param:mysql_client_host}
+            port: 3306
+            user: ${_param:mysql_admin_user}
+            password: ${_param:mysql_admin_password}
+            encoding: utf8
diff --git a/mysql/client/single_upgrade.yml b/mysql/client/single_upgrade.yml
index 3bfe65e..595d3f7 100644
--- a/mysql/client/single_upgrade.yml
+++ b/mysql/client/single_upgrade.yml
@@ -12,7 +12,6 @@
 parameters:
   _param:
     mysql_client_host: localhost
-    backupninja_backup_host: localhost
   mysql:
     client:
       enabled: true
diff --git a/nginx/server/proxy/openstack/designate.yml b/nginx/server/proxy/openstack/designate.yml
index 2b8ffce..29bc390 100644
--- a/nginx/server/proxy/openstack/designate.yml
+++ b/nginx/server/proxy/openstack/designate.yml
@@ -1,4 +1,4 @@
-  parameters:
+parameters:
   _param:
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
   nginx:
diff --git a/nginx/server/proxy/openstack/murano.yml b/nginx/server/proxy/openstack/murano.yml
index a93b07e..06b8c1a 100644
--- a/nginx/server/proxy/openstack/murano.yml
+++ b/nginx/server/proxy/openstack/murano.yml
@@ -1,4 +1,4 @@
-  parameters:
+parameters:
   _param:
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
   nginx:
diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index 1faea32..5537b75 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,4 +1,4 @@
-paramaters:
+parameters:
   telegraf:
     agent:
       output: