diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 52d982b..5a84c60 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -11,6 +11,7 @@
 def batch_size = env.BATCH_SIZE ?: ''
 def dist_upgrade_nodes = "${env.DIST_UPGRADE_NODES}" != "false" ? true : false
 def upgrade_saltstack = "${env.UPGRADE_SALTSTACK}" != "false" ? true : false
+def run_upgrade_after_job = "${env.RUN_UPGRADE_AFTER_JOB}" != "false" ? true : false
 
 if (env_manager == 'devops') {
     jenkins_slave_node_name = "${NODE_NAME}"
@@ -148,7 +149,19 @@
         deploy(shared, common, steps, env_manager, batch_size, dist_upgrade_nodes, upgrade_saltstack)
         // run test stages
         test(shared, common, steps, env_manager)
-
+        //run upgrade env to proposed
+        if (run_upgrade_after_job) {
+            network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
+            upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
+              def deploy = build job: "${upgrade_job}",
+                  parameters: [
+                      string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
+                      string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
+                      string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
+                  ],
+                  wait: false,
+                  propagate: false
+        }
     } catch (e) {
         common.printMsg("Job is failed: " + e.message, "purple")
         throw e
diff --git a/jobs/project.yaml b/jobs/project.yaml
index cfe8f2a..7aae28c 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -5,13 +5,13 @@
     jobs:
       - heat-cicd-pike-dvr-sl:
           disabled: '{disabled-proposed}'
-          trigger_time: H(5-30) 22 * * 1-7
+          trigger_time: H(5-30) 22 * * 1-5
       - heat-cicd-queens-contrail41-sl:
           disabled: '{disabled-proposed}'
-          trigger_time: H(5-30) 23 * * 1-7
+          trigger_time: H(5-30) 23 * * 1-5
       - heat-cicd-queens-dvr-sl:
           disabled: '{disabled-proposed}'
-          trigger_time: H(5-30) 21 * * 1-7
+          trigger_time: H(5-30) 21 * * 1-5
       # ------- BM jobs -------
       - deploy_bm:
           disabled: false
@@ -26,7 +26,7 @@
       # --- Released envs ------
       - deploy-released:
           disabled: false
-          trigger_time: 0 18 * * 0-4
+          trigger_time: H(5-30) 18 * * 6
       - released-heat-cicd-pike-dvr-sl
       - released-heat-cicd-pike-contrail41-sl
       - released-heat-cicd-queens-dvr-sl
@@ -42,7 +42,6 @@
           disabled: '{disabled-2019-2-0}'
           trigger_time: H(5-30) 21 * * 1-7
       # - show_networks_used_by_libvirt - can't moved to JJB, node parameter is not supported
-      - maintenance-heat-cicd-pike-dvr-sl
       - download-config-drive
       - swarm-deploy-cicd
       - swarm-deploy-platform
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index f4bbdb7..66cd438 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -214,3 +214,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index dee912d..687d47d 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -219,4 +219,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index d70132c..230379f 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -219,3 +219,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/bm-cicd-pike-ovs-maas.yml b/jobs/templates/bm-cicd-pike-ovs-maas.yml
index 8a51c81..d3dfb38 100644
--- a/jobs/templates/bm-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-pike-ovs-maas.yml
@@ -205,4 +205,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index be5b487..2b104f7 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -218,3 +218,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
index 617b5c5..1b21f1c 100644
--- a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -210,4 +210,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index c1dde4a..b0feb54 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -205,4 +205,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml b/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
index ff44cd3..a8bbfd7 100644
--- a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
+++ b/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
@@ -181,3 +181,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://review.gerrithub.io/Mirantis/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index ac17ec2..95f2ff5 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -58,3 +58,5 @@
           clean:
             before: true
       script-path: jobs/pipelines/rotation-released-deployment.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/deploy_bm.yml b/jobs/templates/deploy_bm.yml
index 94a406c..ebdb885 100644
--- a/jobs/templates/deploy_bm.yml
+++ b/jobs/templates/deploy_bm.yml
@@ -52,4 +52,6 @@
             refspec: ${{TCP_QA_REFS}}
             url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/rotation_bm_deployments.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/download-config-drive.yml b/jobs/templates/download-config-drive.yml
index 8e8fc90..74bd001 100644
--- a/jobs/templates/download-config-drive.yml
+++ b/jobs/templates/download-config-drive.yml
@@ -105,6 +105,8 @@
 
       }}
     name: download-config-drive
+    logrotate:
+      daysToKeep: 365
     parameters:
     - string:
         default: ''
diff --git a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
index c52d71e..c55e807 100644
--- a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
@@ -231,3 +231,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index 1d7c0bc..cae7d08 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -232,3 +232,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index 31623fc..0248d9d 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -221,3 +221,5 @@
           clean:
             before: true
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index 3a17c80..a7e8944 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -217,4 +217,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index e138c6e..3ba3d08 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -218,4 +218,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
 
diff --git a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml b/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
deleted file mode 100644
index 7fd3f3b..0000000
--- a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
+++ /dev/null
@@ -1,211 +0,0 @@
-- job-template:
-    project-type: pipeline
-    description: '{job-description}'
-    concurrent: true
-    disabled: false
-    name: maintenance-heat-cicd-pike-dvr-sl
-    parameters:
-    - string:
-        default: heat-cicd-pike-dvr-sl
-        description: ''
-        name: LAB_CONFIG_NAME
-        trim: 'false'
-    - string:
-        default: core,cicd
-        description: Comma-separated list of stacks to deploy the drivetrain (salt
-          cluster and cicd nodes)
-        name: DRIVETRAIN_STACK_INSTALL
-        trim: 'false'
-    - string:
-        default: '18000'
-        description: ''
-        name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
-        trim: 'false'
-    - string:
-        default: openstack,ovs,ceph,stacklight
-        description: Comma-separated list of stacks to deploy the target platform
-          (openstack and additional components)
-        name: PLATFORM_STACK_INSTALL
-        trim: 'false'
-    - string:
-        default: '15000'
-        description: ''
-        name: PLATFORM_STACK_INSTALL_TIMEOUT
-        trim: 'false'
-    - string:
-        default: 2019.2.0
-        description: ''
-        name: MCP_VERSION
-        trim: 'false'
-    - string:
-        default: sre-team-infra
-        description: ''
-        name: NODE_NAME
-        trim: 'false'
-    - string:
-        default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
-        description: ''
-        name: MCP_IMAGE_PATH1604
-        trim: 'false'
-    - string:
-        default: /home/jenkins/images/cfg01-day01.qcow2
-        description: ''
-        name: IMAGE_PATH_CFG01_DAY01
-        trim: 'false'
-    - string:
-        default: cfg01.${{LAB_CONFIG_NAME}}-config-drive.iso
-        description: ISO name that will be generated and downloaded to the /home/jenkins/images/
-        name: CFG01_CONFIG_IMAGE_NAME
-        trim: 'false'
-    - string:
-        default: maintenance-heat-cicd-pike-dvr-sl
-        description: ''
-        name: ENV_NAME
-        trim: 'false'
-    - string:
-        default: ''
-        description: |-
-          Example: refs/changes/89/411189/36
-          (for now - only one reference allowed)
-        name: TCP_QA_REFS
-        trim: 'false'
-    - string:
-        default: refs/heads/release/proposed/2019.2.0
-        description: reference to patchset in pipeline-library
-        name: PIPELINE_LIBRARY_REF
-        trim: 'false'
-    - string:
-        default: refs/heads/release/proposed/2019.2.0
-        description: reference to patchset in mk-pipelines
-        name: MK_PIPELINES_REF
-        trim: 'false'
-    - string:
-        default: release/proposed/2019.2.0
-        description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
-          value
-        name: COOKIECUTTER_TEMPLATE_COMMIT
-        trim: 'false'
-    - string:
-        default: release/proposed/2019.2.0
-        description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
-          value
-        name: SALT_MODELS_SYSTEM_COMMIT
-        trim: 'false'
-    - string:
-        default: -m "run_cvp_func_sanity|run_tempest|run_stacklight"
-        description: |-
-          Pytest option -k or -m, with expression to select necessary tests.
-          Additional pytest options are allowed.
-        name: RUN_TEST_OPTS
-        trim: 'false'
-    - bool:
-        default: false
-        description: ''
-        name: SHUTDOWN_ENV_ON_TEARDOWN
-    - string:
-        default: ''
-        description: ''
-        name: COOKIECUTTER_REF_CHANGE
-        trim: 'false'
-    - string:
-        default: ''
-        description: ''
-        name: ENVIRONMENT_TEMPLATE_REF_CHANGE
-        trim: 'false'
-    - string:
-        default: '[MCP1.1_PIKE]Tempest'
-        description: ''
-        name: TEMPEST_TEST_SUITE_NAME
-        trim: 'false'
-    - string:
-        default: pike
-        description: ''
-        name: TEMPEST_IMAGE_VERSION
-        trim: 'false'
-    - string:
-        default: ''
-        description: ''
-        name: TEMPEST_TARGET
-        trim: 'false'
-    - string:
-        default: proposed
-        description: ''
-        name: UPDATE_REPO_CUSTOM_TAG
-        trim: 'false'
-    - bool:
-        default: false
-        description: If set, reports will be created in TestRail for this build
-        name: REPORT_TO_TESTRAIL
-    - choice:
-        choices:
-        - heat
-        - devops
-        description: ''
-        name: ENV_MANAGER
-    - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
-        description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3
-
-          '
-        name: OS_AUTH_URL
-        trim: 'false'
-    - string:
-        default: maintenance-team
-        description: OpenStack project (tenant) name
-        name: OS_PROJECT_NAME
-        trim: 'false'
-    - string:
-        default: ldap_mirantis
-        description: OpenStack user domain name
-        name: OS_USER_DOMAIN_NAME
-        trim: 'false'
-    - string:
-        default: maintenance-team
-        description: Jenkins credentials ID with username and password to create a
-          heat stack in OpenStack
-        name: OS_CREDENTIALS
-        trim: 'false'
-    - string:
-        default: us-cloud.env
-        description: |-
-          Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
-          , for example: microcloud-8116.env
-        name: LAB_PARAM_DEFAULTS
-        trim: 'false'
-    - string:
-        default: release/proposed/2019.2.0
-        description: ''
-        name: JENKINS_PIPELINE_BRANCH
-        trim: 'false'
-    - string:
-        default: ''
-        description: ''
-        name: TEMPEST_PATTERN
-        trim: 'false'
-    - string:
-        default: refs/heads/release/proposed/2019.2.0
-        description: ''
-        name: MCP_COMMON_SCRIPTS_REFS
-        trim: 'false'
-    - string:
-        default: proposed
-        description: ''
-        name: UPDATE_VERSION
-        trim: 'false'
-    - bool:
-        default: false
-        description: Whether to perform dist-upgrade on virtual nodes during deployment
-        name: DIST_UPGRADE_NODES
-    - bool:
-        default: false
-        description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
-        name: UPGRADE_SALTSTACK
-    pipeline-scm:
-      lightweight-checkout: false
-      scm:
-      - git:
-          branches:
-          - FETCH_HEAD
-          refspec: ${{TCP_QA_REFS}}
-          url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
-      script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
diff --git a/jobs/templates/release-artifact-checker.yml b/jobs/templates/release-artifact-checker.yml
index 726bfd6..b1c9c29 100644
--- a/jobs/templates/release-artifact-checker.yml
+++ b/jobs/templates/release-artifact-checker.yml
@@ -9,3 +9,5 @@
     builders:
     - shell:
         "python3 jobs/scripts/mcp_mu_release_artifact_checker.py"
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index 5daf58b..88cbdef 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -198,3 +198,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index fbd19fd..f0670f0 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -100,18 +100,6 @@
           --keep-duplicates --maxfail=1 \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight \
-             \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain \
-            tcp_tests/tests/system/test_upgrade_contrail.py::TestUpdateContrail \
-            tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
-             \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
 
         description: |-
@@ -220,6 +208,10 @@
         default: true
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
+    - bool:
+        name: RUN_UPGRADE_AFTER_JOB
+        default: true
+        description: "Upgrade and test after deploy?"
     pipeline-scm:
       lightweight-checkout: false
       scm:
@@ -229,4 +221,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index ad28b00..9273793 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -100,17 +100,6 @@
           --keep-duplicates --maxfail=1 \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight \
-             \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain \
-            tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
-             \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
 
         description: |-
@@ -219,6 +208,10 @@
         default: false
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
+    - bool:
+        name: RUN_UPGRADE_AFTER_JOB
+        default: true
+        description: "Upgrade and test after deploy?"
     pipeline-scm:
       lightweight-checkout: false
       scm:
@@ -228,3 +221,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 585b2c9..4ddd929 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -98,19 +98,8 @@
           --keep-duplicates --maxfail=1 \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight \
-             \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain \
-            tcp_tests/tests/system/test_upgrade_contrail.py::TestUpdateContrail \
-            tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
-             \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
+
         description: |-
           Pytest option -k or -m, with expression to select necessary tests.
           Additional pytest options are allowed.
@@ -222,6 +211,10 @@
         default: false
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
+    - bool:
+        name: RUN_UPGRADE_AFTER_JOB
+        default: true
+        description: "Upgrade and test after deploy?"
     pipeline-scm:
       lightweight-checkout: false
       scm:
@@ -231,4 +224,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 6caec65..01921e0 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -100,17 +100,6 @@
           --keep-duplicates --maxfail=1 \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight \
-             \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain \
-            tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
-            tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
-             \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
-            tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
 
         description: |-
@@ -219,6 +208,10 @@
         default: false
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
+    - bool:
+        name: RUN_UPGRADE_AFTER_JOB
+        default: true
+        description: "Upgrade and test after deploy?"
     pipeline-scm:
       lightweight-checkout: false
       scm:
@@ -228,3 +221,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/self-deploy-jobs.yaml b/jobs/templates/self-deploy-jobs.yaml
index e04f62d..cfe3b99 100644
--- a/jobs/templates/self-deploy-jobs.yaml
+++ b/jobs/templates/self-deploy-jobs.yaml
@@ -20,3 +20,5 @@
           refspec: '${{TCP_QA_REFS}}'
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/self-deploy-jobs.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/self-deploy-virtulenvs.yaml b/jobs/templates/self-deploy-virtulenvs.yaml
index eb2c89b..75f6027 100644
--- a/jobs/templates/self-deploy-virtulenvs.yaml
+++ b/jobs/templates/self-deploy-virtulenvs.yaml
@@ -20,5 +20,7 @@
     builders:
       - shell: "chmod +x tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh"
       - shell: "export CHANGE_RIGHTS=false ; ./tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh"
+    logrotate:
+      daysToKeep: 365
 
 
diff --git a/jobs/templates/swarm-deploy-cicd.yml b/jobs/templates/swarm-deploy-cicd.yml
index e999b96..5d24db3 100644
--- a/jobs/templates/swarm-deploy-cicd.yml
+++ b/jobs/templates/swarm-deploy-cicd.yml
@@ -69,3 +69,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-deploy-cicd.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/swarm-deploy-platform.yml b/jobs/templates/swarm-deploy-platform.yml
index 7971c41..f6a2270 100644
--- a/jobs/templates/swarm-deploy-platform.yml
+++ b/jobs/templates/swarm-deploy-platform.yml
@@ -70,3 +70,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-deploy-platform.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index 36d9380..9d22f9d 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -84,3 +84,5 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-run-pytest.groovy
+    logrotate:
+      daysToKeep: 365
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index af90602..67d3880 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -89,6 +89,8 @@
 
     jobs:
       - '{test_scenario}'
+    logrotate:
+      daysToKeep: 365
 
 - job-group:
     name: 'ceph-tests'
@@ -111,6 +113,8 @@
           display-name: Add/Remove MGR node
     jobs:
       - '{test_scenario}'
+    logrotate:
+      daysToKeep: 365
 
 - job-group:
     name: 'update-tests'
@@ -141,7 +145,7 @@
       tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
 
     test_scenario:
-      - mcp-update-pike-sl:
+      - mcp-update-pike-dvr-sl:
           deployment: released-heat-cicd-pike-dvr-sl
           disabled: true
           run-test-opts: '{test-opt}'
@@ -178,6 +182,8 @@
 
     jobs:
       - '{test_scenario}'
+    logrotate:
+      daysToKeep: 365
 
 ###################### JOB TEMPLATE ###################
 - job-template:
diff --git a/jobs/templates/test_cleanup.yml b/jobs/templates/test_cleanup.yml
index 6b6d31a..ddfb4df 100644
--- a/jobs/templates/test_cleanup.yml
+++ b/jobs/templates/test_cleanup.yml
@@ -11,4 +11,6 @@
           branches:
           - '*/master'
           url: https://github.com/sgudz/kaas.git
-      script-path: si_tests/utils/run-cleanup.groovy
\ No newline at end of file
+      script-path: si_tests/utils/run-cleanup.groovy
+    logrotate:
+      daysToKeep: 365
\ No newline at end of file
diff --git a/jobs/view.yaml b/jobs/view.yaml
index fdf9f3c..c922ad9 100644
--- a/jobs/view.yaml
+++ b/jobs/view.yaml
@@ -105,23 +105,6 @@
       - last-duration
       - build-button
 - view:
-    name: maintenance
-    view-type: list
-    description: |
-      Maintenance, managed by JJB
-    filter-executors: true
-    filter-queue: true
-    job-name:
-      - maintenance-heat-cicd-pike-dvr-sl
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-- view:
     name: offline-deployment
     view-type: list
     description: |
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 46d274d..58fdf66 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -372,3 +372,8 @@
     password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
     password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
     change_password_upon_first_use: False
+
+  # Enable Mirantis repo with CVE fixes for xenial
+  updates_mirantis_login: "root"
+  updates_mirantis_password: "r00tme"
+  updates_mirantis_version: "staging"
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index e1ff1fb..b0cf6e8 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -313,4 +313,9 @@
     minimum_password_age: 0
     password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
     password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
-    change_password_upon_first_use: False
\ No newline at end of file
+    change_password_upon_first_use: False
+
+  # Enable Mirantis repo with CVE fixes for xenial
+  updates_mirantis_login: "root"
+  updates_mirantis_password: "r00tme"
+  updates_mirantis_version: "staging"
\ No newline at end of file
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index d938412..c26143e 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -131,7 +131,6 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.4.0/24
   control_vlan: '10'
-
   deploy_network_gateway: 10.167.5.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: 10.167.5.0/24
@@ -250,7 +249,7 @@
   tenant_network_gateway: 10.167.6.1
   tenant_network_netmask: 255.255.255.0
   tenant_network_subnet: 10.167.6.0/24
-  tenant_telemetry_enabled: 'False'
+  tenant_telemetry_enabled: 'True'
   tenant_vlan: '20'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
@@ -379,3 +378,7 @@
     change_password_upon_first_use: False
 
   stacklight_ssl_enabled: 'True'
+  # Enable Mirantis repo with CVE fixes for xenial
+  updates_mirantis_login: "root"
+  updates_mirantis_password: "r00tme"
+  updates_mirantis_version: "staging"
\ No newline at end of file