diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index f076a78..331bd7e 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -71,7 +71,11 @@
                   mcp/{{oscore-qa-project}}:
                     branches:
                       - master
+                      - queens
                       - pike
+                      - ocata
+                      - newton
+                      - mitaka
                 event:
                   patchset:
                     - created
diff --git a/kubernetes/control/opencontrail.yml b/kubernetes/control/opencontrail.yml
index 6b23781..d72892d 100644
--- a/kubernetes/control/opencontrail.yml
+++ b/kubernetes/control/opencontrail.yml
@@ -26,7 +26,7 @@
           identity:
             auth_user: ${_param:opencontrail_identity_user}
             auth_password: ${_param:opencontrail_identity_password}
-            auth_tenant: ${_param:kubernetes_opencontrail_identity_tenant}
+            auth_tenant: ${_param:opencontrail_identity_tenant}
           message_queue:
             host: ${_param:single_address}
           database:
diff --git a/openssh/server/team/members/degorenko.yaml b/openssh/server/team/members/degorenko.yml
similarity index 100%
rename from openssh/server/team/members/degorenko.yaml
rename to openssh/server/team/members/degorenko.yml
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
new file mode 100644
index 0000000..feb1d4f
--- /dev/null
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+  salt:
+    control:
+      size:
+        openstack.manila:
+          cpu: 1
+          ram: 2048
+          disk_profile: large
+          net_profile: default
+      cluster:
+        internal:
+          domain: ${_param:cluster_domain}
+          engine: virt
+          node:
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: openstack.manila
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: openstack.manila
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: openstack.manila