diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
new file mode 100644
index 0000000..e4f2ba4
--- /dev/null
+++ b/jenkins/client/job/ceph/init.yml
@@ -0,0 +1,2 @@
+classes:
+- system.jenkins.client.job.ceph.remove-osd
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
new file mode 100644
index 0000000..10b9028
--- /dev/null
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -0,0 +1,42 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        ceph-remove-osd:
+          type: workflow-scm
+          concurrent: true
+          display_name: "Ceph - remove OSD"
+          discard:
+            build:
+              keep_num: 50
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: ceph-remove-osd.groovy
+          param:
+            # general parameters
+            SALT_MASTER_URL:
+              type: string
+              description: URL of Salt master
+              default: "http://${_param:salt_master_host}:6969"
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              description: Credentials for login to Salt API
+              default: salt
+            HOST:
+              type: string
+              description: OSDs on this HOST will be removed from cluster
+            OSD:
+              type: all
+              description: These OSDs at HOST will be removed (comma-separated list)
+            ADMIN_HOST:
+              type: string
+              description: Host with admin keyring and access to cluster management
+            CLUSTER_FLAGS:
+              type: string
+              description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
+            WAIT_FOR_HEALTHY:
+              type: boolean
+              default: 'false'
+              description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
index b0b3af1..f8953b6 100644
--- a/jenkins/client/job/deploy/lab/component/ceph.yml
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -9,3 +9,9 @@
         stack_install: core,ceph
         stack_test: "ceph"
         job_timer: ""
+      - stack_name: ceph_ha
+        stack_env: devcloud
+        stack_type: aws
+        stack_install: core,ceph
+        stack_test: "ceph"
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 27f2184..c8fc663 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -28,8 +28,8 @@
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_aio
-        stack_env: virtual_mcp11_aio/devcloud
-        stack_install: core,openstack
+        stack_env: devcloud
+        stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
         job_timer: ""
diff --git a/jenkins/client/job/docker/cleanup.yml b/jenkins/client/job/docker/cleanup.yml
new file mode 100644
index 0000000..eff5754
--- /dev/null
+++ b/jenkins/client/job/docker/cleanup.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+    jenkins_salt_model_name: "salt"
+  jenkins:
+    client:
+      job:
+        docker-cleanup-pipeline:
+          name: docker-cleanup
+          discard:
+            build:
+              keep_num: 3
+            artifact:
+              keep_num: 3
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: docker-cleanup-pipeline.groovy
+          trigger:
+            timer:
+              spec: "H H * * *"
+          param:
+              SALT_MASTER_URL:
+                type: string
+                default: "${_param:jenkins_salt_api_url}"
+              SALT_MASTER_CREDENTIALS:
+                type: string
+                default: "salt"
+              TEST_DATE_STRING:
+                type: string
+                default: "yesterday"
+                description: "Date string for comparison determining deletion of docker container"
diff --git a/jenkins/client/job/fake_test.yml b/jenkins/client/job/fake_test.yml
deleted file mode 100644
index 079651c..0000000
--- a/jenkins/client/job/fake_test.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        gerrit-fake-test:
-          name: gerrit-fake-test
-          discard:
-            build:
-              keep_num: 25
-            artifact:
-              keep_num: 25
-          type: workflow-scm
-          concurrent: true
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            credentials: "gerrit"
-            script: fake-test-pipeline.groovy
-          trigger:
-            gerrit:
-              project:
-                "salt-formulas/salt-formulas":
-                  branches:
-                    - master
-              event:
-                patchset:
-                  - created:
-                      excludeDrafts: false
-                      excludeTrivialRebase: false
-                      excludeNoCodeChange: false
-                comment:
-                  - addedContains:
-                      commentAddedCommentContains: '(recheck|reverify)'
-          param:
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 0fa0491..e40ac0f 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -62,7 +62,19 @@
               github:
                 url: "https://github.com/Mirantis/{{name}}"
             trigger:
-              github:
+              gerrit:
+                project:
+                  contrail/{{name}}:
+                    branches:
+                      - compare_type: "REG_EXP"
+                        name: "*"
+                message:
+                  build_successful: "Build successful"
+                  build_unstable: "Build unstable"
+                  build_failure: "Build failed"
+                event:
+                  ref:
+                    - updated
             param:
               SOURCE_URL:
                 type: string
diff --git a/linux/system/single.yml b/linux/system/single.yml
index 4c5228f..e2a8502 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -12,7 +12,7 @@
           name: root
           home: /root
       package:
-          python-msgpack:
+        python-msgpack:
           version: latest
         cloud-init:
           version: purged
diff --git a/openssh/server/team/all.yml b/openssh/server/team/all.yml
new file mode 100644
index 0000000..4dcb121
--- /dev/null
+++ b/openssh/server/team/all.yml
@@ -0,0 +1,19 @@
+classes:
+- system.openssh.server.team.lab
+- system.openssh.server.team.cicd
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.mcp_ci
+- system.openssh.server.team.mmo_devops
+- system.openssh.server.team.presales
+- system.openssh.server.team.support
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.networking
+- system.openssh.server.team.oss_team
+- system.openssh.server.team.services_qa
+- system.openssh.server.team.qa_scale
+- system.openssh.server.team.oscore_devops
+- system.openssh.server.team.k8s_team
+- system.openssh.server.team.k8s_apps_team
+parameters:
+  _param:
+    linux_system_user_sudo: true