diff --git a/jobs/project.yaml b/jobs/project.yaml
index 83b78ee..7b9597a 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -50,14 +50,12 @@
       - swarm-run-pytest
       # - generate-report - can't moved to JJB, a lot of parameters is not supported like Inject environment variables
       # - mark-reports - can't moved to JJB, a lot of parameters is not supported like Inject environment variables
-      - cookied-cicd-queens-dvr-sl-heat
       # - diff_params_reclass_system - can't moved to JJB, unsupported parameters
-      - environment-template-ci
+      # - diff_params_reclass_system - can't moved to JJB, unsupported parameters
       - self-deploy-jobs
       - self-deploy-virtualenvs
       - cleanup-jenkins-agents
       - tcp-qa-ci
-      - test_cleanup
       # - testrail-reporter-ci - can't moved to JJB, unsupported parameters
       # - testrail-reporter-gerrit-mcp-ci - can't moved to JJB, unsupported parameters
       - release-artifact-checker
diff --git a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml b/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
deleted file mode 100644
index a8bbfd7..0000000
--- a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-- job-template:
-    project-type: pipeline
-    description: '{job-description}'
-    concurrent: true
-    disabled: false
-    name: cookied-cicd-queens-dvr-sl-heat
-    parameters:
-    - string:
-        default: cookied-cicd-queens-dvr-sl-heat
-        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: '12000'
-        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: '12000'
-        description: ''
-        name: PLATFORM_STACK_INSTALL_TIMEOUT
-        trim: 'false'
-    - string:
-        default: 2019.2.0
-        description: ''
-        name: MCP_VERSION
-        trim: 'false'
-    - string:
-        default: cz8133
-        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: test_under_heat
-        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: ''
-        description: reference to patchset in pipeline-library
-        name: PIPELINE_LIBRARY_REF
-        trim: 'false'
-    - string:
-        default: ''
-        description: reference to patchset in mk-pipelines
-        name: MK_PIPELINES_REF
-        trim: 'false'
-    - string:
-        default: ''
-        description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
-          value
-        name: COOKIECUTTER_TEMPLATE_COMMIT
-        trim: 'false'
-    - string:
-        default: ''
-        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: true
-        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_QUEENS]Tempest'
-        description: ''
-        name: TEMPEST_TEST_SUITE_NAME
-        trim: 'false'
-    - string:
-        default: queens
-        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: true
-        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://10.60.0.80:5000/v3
-        description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3
-
-          '
-        name: OS_AUTH_URL
-        trim: 'false'
-    - string:
-        default: admin
-        description: OpenStack project (tenant) name
-        name: OS_PROJECT_NAME
-        trim: 'false'
-    - string:
-        default: admin
-        description: OpenStack user domain name
-        name: OS_USER_DOMAIN_NAME
-        trim: 'false'
-    - string:
-        default: openstack_on_cz8133
-        description: Jenkins credentials ID with username and password to create a
-          heat stack in OpenStack
-        name: OS_CREDENTIALS
-        trim: 'false'
-    - string:
-        default: microcloud-8133.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'
-    pipeline-scm:
-      lightweight-checkout: false
-      scm:
-      - git:
-          branches:
-          - FETCH_HEAD
-          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/environment-template-ci.yml b/jobs/templates/environment-template-ci.yml
deleted file mode 100644
index fd88833..0000000
--- a/jobs/templates/environment-template-ci.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- job-template:
-    project-type: freestyle
-    description: '{job-description}'
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: |-
-        set -e
-        git fetch https://review.gerrithub.io/Mirantis/environment-template ${{GERRIT_REFSPEC}}
-        git checkout FETCH_HEAD
-        tox
-    concurrent: false
-    disabled: false
-    name: environment-template-ci
-    node: gerrithub.io
-    scm:
-    - git:
-        branches:
-        - '**'
-        url: https://review.gerrithub.io/Mirantis/environment-template
-    # wrappers:
-    # - timeout:
-    #     abort: true
-    #     fail: true
-    #     timeout: 10
-    #     type: absolute
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index 4224901..e8c5fb8 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -212,12 +212,13 @@
     name: '{test_scenario}'
     display-name: '{display-name}'
     project-type: pipeline
+    description: '{job-description}'
     concurrent: false
     disabled: '{disabled|false}'
     quiet-period: 2
     node: 'openstack_slave_{deployment}'
     logrotate:
-      daysToKeep: 30
+      daysToKeep: 365
       numToKeep: 60
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
diff --git a/jobs/templates/test_cleanup.yml b/jobs/templates/test_cleanup.yml
deleted file mode 100644
index ddfb4df..0000000
--- a/jobs/templates/test_cleanup.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- job-template:
-    project-type: pipeline
-    description: '{job-description}'
-    concurrent: true
-    disabled: false
-    name: test_cleanup
-    pipeline-scm:
-      lightweight-checkout: true
-      scm:
-      - git:
-          branches:
-          - '*/master'
-          url: https://github.com/sgudz/kaas.git
-      script-path: si_tests/utils/run-cleanup.groovy
-    logrotate:
-      daysToKeep: 365
\ No newline at end of file