diff --git a/aptly/server/repo/ubuntu/xenial/opencontrail.yml b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
index 7f47577..6e90f75 100644
--- a/aptly/server/repo/ubuntu/xenial/opencontrail.yml
+++ b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
@@ -123,6 +123,17 @@
               - xenial-dev/nightly
             architectures:
               - amd64
+        ubuntu-xenial-oc50:
+          distribution: xenial
+          component: main
+          architectures: amd64
+          comment: "Opencontrail 5.0"
+          publisher:
+            component: oc50
+            distributions:
+              - xenial/nightly
+            architectures:
+              - amd64
         ubuntu-xenial-oc666:
           distribution: xenial
           component: main
diff --git a/haproxy/proxy/listen/openstack/neutron.yml b/haproxy/proxy/listen/openstack/neutron.yml
index 29bd548..ebc3f1a 100644
--- a/haproxy/proxy/listen/openstack/neutron.yml
+++ b/haproxy/proxy/listen/openstack/neutron.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+    haproxy_neutron_port: 9696
   haproxy:
     proxy:
       listen:
@@ -7,17 +10,17 @@
           service_name: neutron
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 9696
+            port: ${_param:haproxy_neutron_port}
           servers:
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
diff --git a/haproxy/proxy/listen/openstack/neutron_large.yml b/haproxy/proxy/listen/openstack/neutron_large.yml
index 8df1243..5039586 100644
--- a/haproxy/proxy/listen/openstack/neutron_large.yml
+++ b/haproxy/proxy/listen/openstack/neutron_large.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+    haproxy_neutron_port: 9696
   haproxy:
     proxy:
       listen:
@@ -7,25 +10,25 @@
           service_name: neutron
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 9696
+            port: ${_param:haproxy_neutron_port}
           servers:
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node04_hostname}
             host: ${_param:cluster_node04_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node05_hostname}
             host: ${_param:cluster_node05_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index d8e9f22..cae768a 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -275,6 +275,9 @@
             - name: openvstorage
               branches: ${_param:salt_formulas_branches}
               notification_recipients: ${_param:salt_formulas_notification_recipients}
+            - name: oslo-templates
+              branches: ${_param:salt_formulas_branches}
+              notification_recipients: ${_param:salt_formulas_notification_recipients}
             - name: owncloud
               branches: ${_param:salt_formulas_branches}
               notification_recipients: ${_param:salt_formulas_notification_recipients}
diff --git a/openssh/server/team/members/dpyzhov.yml b/openssh/server/team/members/dpyzhov.yml
new file mode 100644
index 0000000..2f72fe5
--- /dev/null
+++ b/openssh/server/team/members/dpyzhov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        dpyzhov:
+          enabled: true
+          name: dpyzhov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Dmitry Pyzhov
+          home: /home/dpyzhov
+          email: dpyzhov@mirantis.com
+  openssh:
+    server:
+      user:
+        dpyzhov:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpCEigzaCPNPSuy0GMef/wsyGvBXjbZLxg4eR7oVKmRDsT01sjOFDgabwSBcbkvc7jeWw3RcxC8Upyhq2ADzwFSh+9AXRPbX1R2GxW85SYWg6xz4gFaM8CJ4XUT3S3lnhJ796xUSG9jOIe/pEk9L/4F41uzX8YSwQkGoio2j6za34ZWEVqDNNZt+PVC4woJjuw6r4jBZiEKWuVONeSLJeVwMwc9vwz1kED89OP3zenGknCY5PvM59CrcKHdVzseqHtzMW89nHTTAPTRPWX+07IgNWpI+IRB1KDbtRmeFpuLUwObfxzWqCDc2vpL6UF6uyIVEzLNBSSU4s0lmu0nyEM/uT5hpt/pchl50lfVBrIj+G3wIG+yy/sB4xddVNB5XxwiChxS1pkXgWx6apsOgrixdsVsw5sqRmYwecm3bqL2GFEl1UmLs3fdDyAfsG8uz/OyDl5I48LBZmklriDE6QB+vOG4n1BHPUkwiF2LeXf3JtUrBPhe7oe80xUVxPXjxZqtIHp2Tooj3u9TK5Wd00yOj4uGMyJoQdICSDqt/BATkTQ4a/JMhBGEb5GC6KuuEAIwfV7DnrDW+jyiV7JJ8GUHGbg3KKVPv7jCVcCnww6icywMClnFuAy+yagiq5DxYFkdk9wa1psbxpQKSXFBOO+iWqOYJoiIFwgSiujdM8ZfQ== dpyzhov@mac-pro-2017
+          user: ${linux:system:user:dpyzhov}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 6541e34..9921b5b 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -7,6 +7,7 @@
 - system.openssh.server.team.members.jcach
 - system.openssh.server.team.members.psvimbersky
 - system.openssh.server.team.members.gzimin
+- system.openssh.server.team.members.dpyzhov
 parameters:
   _param:
     linux_system_user_sudo: true