diff --git a/ironic/conductor/storage/cinder.yml b/ironic/conductor/storage/cinder.yml
new file mode 100644
index 0000000..d3b60b1
--- /dev/null
+++ b/ironic/conductor/storage/cinder.yml
@@ -0,0 +1,12 @@
+parameters:
+  ironic:
+    conductor:
+      cinder:
+        auth_strategy: keystone
+        auth_type: password
+        password: ${_param:keystone_cinder_password}
+        project_domain_id: default
+        project_name: service
+        url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776
+        user_domain_name: Default
+        username: cinder
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index 53d8260..6bb36a7 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -76,9 +76,9 @@
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
                   openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,drivetrain,stacklight,k8s_team,mcp_qa"
-                  cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
+                  cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
-                  shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
+                  shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
                   shared_reclass_branch: 'master'
             STACK_INSTALL:
               type: string
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index 15f0bb6..9ba858c 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -61,9 +61,9 @@
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
                   openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team,drivetrain"
-                  cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
+                  cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
-                  shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
+                  shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
                   shared_reclass_branch: 'master'
             STACK_INSTALL:
               type: string
diff --git a/nginx/server/proxy/openstack/octavia.yml b/nginx/server/proxy/openstack/octavia.yml
new file mode 100644
index 0000000..8d5f6c1
--- /dev/null
+++ b/nginx/server/proxy/openstack/octavia.yml
@@ -0,0 +1,23 @@
+parameters:
+  _param:
+    nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+    nginx_proxy_openstack_api_address: 0.0.0.0
+    nginx_proxy_openstack_octavia_host: ${_param:octavia_service_host}
+    nginx_proxy_openstack_octavia_protocol: 'http'
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_api_octavia:
+          enabled: true
+          type: nginx_proxy
+          name: openstack_api_octavia
+          check: false
+          proxy:
+            host: ${_param:nginx_proxy_openstack_octavia_host}
+            port: 9876
+            protocol: ${_param:nginx_proxy_openstack_octavia_protocol}
+          host:
+            name: ${_param:nginx_proxy_openstack_api_host}
+            port: 9876
+            address: ${_param:nginx_proxy_openstack_api_address}
+          ssl: ${_param:nginx_proxy_ssl}