diff --git a/aptly/server/mirror/ubuntu/trusty/influxdb.yml b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
new file mode 100644
index 0000000..8d30a05
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
@@ -0,0 +1,15 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        influxdb-trusty:
+          source: https://repos.influxdata.com/ubuntu/
+          distribution: trusty
+          components: stable
+          architectures: amd64
+          gpgkeys:
+            - 2582E0C5
+          publisher:
+            component: influxdb
+            distributions:
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
new file mode 100644
index 0000000..1bc4341
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
@@ -0,0 +1,26 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        ceph-mirantis-xenial:
+          source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
+          distribution: jewel-xenial
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 460F3994
+          publisher:
+            component: ceph-mirantis
+            distributions:
+              - xenial/nightly
+        decapod-ceph-mirantis-xenial:
+          source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
+          distribution: jewel-xenial
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 460F3994
+          publisher:
+            component: main
+            distributions:
+              - ubuntu-xenial-decapod-ceph/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/hp.yml b/aptly/server/mirror/ubuntu/xenial/hp.yml
new file mode 100644
index 0000000..5b84417
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/hp.yml
@@ -0,0 +1,18 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        hp-xenial:
+          source: http://downloads.linux.hpe.com/SDR/repo/mcp/Ubuntu
+          distribution: xenial/current
+          components: non-free
+          architectures: amd64
+          gpgkeys:
+            - 26C2B797
+            - B1275EA3
+            - 5CE2D476
+            - 2689B887
+          publisher:
+            component: hp-non-free
+            distributions:
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/maas.yml b/aptly/server/mirror/ubuntu/xenial/maas.yml
new file mode 100644
index 0000000..1382a09
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/maas.yml
@@ -0,0 +1,15 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        maas-xenial:
+          source: http://ppa.launchpad.net/maas/stable/ubuntu
+          distribution: xenial
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 684D4A1C
+          publisher:
+            component: maas
+            distributions:
+              - xenial/nightly
diff --git a/haproxy/proxy/listen/openstack/galera.yml b/haproxy/proxy/listen/openstack/galera.yml
index 56182d6..254dc3b 100644
--- a/haproxy/proxy/listen/openstack/galera.yml
+++ b/haproxy/proxy/listen/openstack/galera.yml
@@ -1,6 +1,12 @@
 parameters:
   haproxy:
     proxy:
+      timeout:
+        queue: '10s'
+        connect: '10s'
+        client: '10s'
+        server: '10s'
+        check: '10s'
       listen:
         mysql_cluster:
           type: mysql
@@ -12,12 +18,12 @@
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
             port: 3306
-            params: check
+            params: check inter 20s fastinter 2s downinter 2s rise 3 fall 3
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
             port: 3306
-            params: backup check
+            params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
             port: 3306
-            params: backup check
\ No newline at end of file
+            params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3
diff --git a/keepalived/cluster/instance/openstack_telemetry_vip.yml b/keepalived/cluster/instance/openstack_telemetry_vip.yml
index 91155e7..41f7dd0 100644
--- a/keepalived/cluster/instance/openstack_telemetry_vip.yml
+++ b/keepalived/cluster/instance/openstack_telemetry_vip.yml
@@ -7,6 +7,7 @@
     keepalived_openstack_telemetry_vip_address: ${_param:cluster_vip_address}
     keepalived_openstack_telemetry_vip_password: password
     keepalived_openstack_telemetry_vip_interface: eth1
+    keepalived_openstack_telemetry_vip_priority: 101
   keepalived:
     cluster:
       enabled: true
@@ -16,4 +17,4 @@
           password: ${_param:keepalived_openstack_telemetry_vip_password}
           interface: ${_param:keepalived_openstack_telemetry_vip_interface}
           virtual_router_id: 230
-          priority: 101
+          priority: ${_param:keepalived_openstack_telemetry_vip_priority}
diff --git a/keepalived/cluster/instance/stacklight_log_vip.yml b/keepalived/cluster/instance/stacklight_log_vip.yml
index caa6754..1a36121 100644
--- a/keepalived/cluster/instance/stacklight_log_vip.yml
+++ b/keepalived/cluster/instance/stacklight_log_vip.yml
@@ -3,6 +3,8 @@
 classes:
 - service.keepalived.support
 parameters:
+  _param:
+    keepalived_stacklight_log_vip_priority: 101
   keepalived:
     cluster:
       enabled: true
@@ -12,4 +14,4 @@
           password: ${_param:keepalived_stacklight_log_vip_password}
           interface: ${_param:keepalived_stacklight_log_vip_interface}
           virtual_router_id: 110
-          priority: 101
+          priority: ${_param:keepalived_stacklight_log_vip_priority}
diff --git a/keepalived/cluster/instance/stacklight_monitor_vip.yml b/keepalived/cluster/instance/stacklight_monitor_vip.yml
index 28a6b69..05eb967 100644
--- a/keepalived/cluster/instance/stacklight_monitor_vip.yml
+++ b/keepalived/cluster/instance/stacklight_monitor_vip.yml
@@ -3,6 +3,8 @@
 classes:
 - service.keepalived.support
 parameters:
+  _param:
+    keepalived_stacklight_monitor_vip_priority: 101
   keepalived:
     cluster:
       enabled: true
@@ -12,4 +14,4 @@
           password: ${_param:keepalived_stacklight_monitor_vip_password}
           interface: ${_param:keepalived_stacklight_monitor_vip_interface}
           virtual_router_id: 100
-          priority: 101
+          priority: ${_param:keepalived_stacklight_monitor_vip_priority}
diff --git a/keepalived/cluster/instance/stacklight_telemetry_vip.yml b/keepalived/cluster/instance/stacklight_telemetry_vip.yml
index e7d31a5..160a02e 100644
--- a/keepalived/cluster/instance/stacklight_telemetry_vip.yml
+++ b/keepalived/cluster/instance/stacklight_telemetry_vip.yml
@@ -3,6 +3,8 @@
 classes:
 - service.keepalived.support
 parameters:
+  _param:
+    keepalived_stacklight_telemetry_vip_priority: 101
   keepalived:
     cluster:
       enabled: true
@@ -12,4 +14,4 @@
           password: ${_param:keepalived_stacklight_telemetry_vip_password}
           interface: ${_param:keepalived_stacklight_telemetry_vip_interface}
           virtual_router_id: 120
-          priority: 101
+          priority: ${_param:keepalived_stacklight_telemetry_vip_priority}
diff --git a/linux/system/single.yml b/linux/system/single.yml
index 24f7048..fad25ae 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -45,14 +45,14 @@
           limits:
             - type: hard
               item: nofile
-              value: 102400
+              value: 307200
             - type: soft
               item: nofile
-              value: 102400
+              value: 307200
             - type: soft
               item: noproc
-              value: 102400
+              value: 307200
             - type: hard
               item: noproc
-              value: 102400
+              value: 307200
 
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index d184fc9..986ed61 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -15,7 +15,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:openstack_telemetry_node01_address}
-            keepalived_vip_priority: 103
+            keepalived_openstack_telemetry_vip_priority: 103
         openstack_telemetry_node02:
           name: ${_param:openstack_telemetry_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -25,7 +25,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:openstack_telemetry_node02_address}
-            keepalived_vip_priority: 102
+            keepalived_openstack_telemetry_vip_priority: 102
         openstack_telemetry_node03:
           name: ${_param:openstack_telemetry_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -35,4 +35,4 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:openstack_telemetry_node03_address}
-            keepalived_vip_priority: 101
+            keepalived_openstack_telemetry_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_monitor_cluster.yml b/reclass/storage/system/stacklight_monitor_cluster.yml
index f95cf81..80f57cf 100644
--- a/reclass/storage/system/stacklight_monitor_cluster.yml
+++ b/reclass/storage/system/stacklight_monitor_cluster.yml
@@ -17,7 +17,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node01_address}
-            keepalived_vip_priority: 103
+            keepalived_stacklight_monitor_vip_priority: 103
         stacklight_monitor_node02:
           name: ${_param:stacklight_monitor_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -29,7 +29,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node02_address}
-            keepalived_vip_priority: 102
+            keepalived_stacklight_monitor_vip_priority: 102
         stacklight_monitor_node03:
           name: ${_param:stacklight_monitor_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -41,4 +41,4 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node03_address}
-            keepalived_vip_priority: 101
+            keepalived_stacklight_monitor_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
index 26b9ebe..818e732 100644
--- a/reclass/storage/system/stacklight_server_cluster.yml
+++ b/reclass/storage/system/stacklight_server_cluster.yml
@@ -20,7 +20,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node01_address}
-            keepalived_vip_priority: 103
+            keepalived_stacklight_monitor_vip_priority: 103
             rabbitmq_cluster_role: master
         stacklight_server_node02:
           name: ${_param:stacklight_monitor_node02_hostname}
@@ -33,7 +33,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node02_address}
-            keepalived_vip_priority: 102
+            keepalived_stacklight_monitor_vip_priority: 102
             rabbitmq_cluster_role: slave
         stacklight_server_node03:
           name: ${_param:stacklight_monitor_node03_hostname}
@@ -46,5 +46,5 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node03_address}
-            keepalived_vip_priority: 101
+            keepalived_stacklight_monitor_vip_priority: 101
             rabbitmq_cluster_role: slave
diff --git a/reclass/storage/system/stacklight_telemetry_cluster.yml b/reclass/storage/system/stacklight_telemetry_cluster.yml
index 12b1dae..c75d93d 100644
--- a/reclass/storage/system/stacklight_telemetry_cluster.yml
+++ b/reclass/storage/system/stacklight_telemetry_cluster.yml
@@ -15,7 +15,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_telemetry_node01_address}
-            keepalived_vip_priority: 103
+            keepalived_stacklight_telemetry_vip_priority: 103
         stacklight_telemetry_node02:
           name: ${_param:stacklight_telemetry_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -25,7 +25,7 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_telemetry_node02_address}
-            keepalived_vip_priority: 102
+            keepalived_stacklight_telemetry_vip_priority: 102
         stacklight_telemetry_node03:
           name: ${_param:stacklight_telemetry_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -35,4 +35,4 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_telemetry_node03_address}
-            keepalived_vip_priority: 101
+            keepalived_stacklight_telemetry_vip_priority: 101