diff --git a/Mbed-TLS.yaml b/Mbed-TLS.yaml
deleted file mode 100644
index 6cd18ff..0000000
--- a/Mbed-TLS.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-#-------------------------------------------------------------------------------
-
-- view:
-    name: Mbed-TLS
-    view-type: list
-    regex: mbed.*
-    columns:
-     - status
-     - weather
-     - job
-     - last-success
-     - last-failure
-     - last-duration
-     - build-button
diff --git a/arthur-mbed-tls-nightly-tests.yaml b/arthur-mbed-tls-nightly-tests.yaml
deleted file mode 100644
index 4118ba3..0000000
--- a/arthur-mbed-tls-nightly-tests.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS Nightly Tests with AWS EC2 agent nodes
-    disabled: true
-    name: arthur-mbed-tls-nightly-tests
-    parameters:
-    - string:
-        default: https://github.com/Mbed-TLS/mbedtls.git
-        description: Enter mbed TLS repo/fork
-        name: MBED_TLS_REPO
-        trim: 'false'
-    - string:
-        default: development
-        description: Enter branch or commit to test
-        name: MBED_TLS_BRANCH
-        trim: 'false'
-    - bool:
-        default: true
-        description: |-
-          Run basic-build-test.sh
-
-          (Note, this does not work on mbedtls-2.1).
-        name: RUN_BASIC_BUILD_TEST
-    - bool:
-        default: true
-        description: Run all.sh
-        name: RUN_ALL_SH
-    - bool:
-        default: true
-        description: Run Windows tests
-        name: RUN_WINDOWS_TEST
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS authcrypt
-          example.
-        name: TEST_MBED_OS_AUTHCRYPT_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS benchmark
-          example.
-        name: TEST_MBED_OS_BENCHMARK_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS hashing
-          example.
-        name: TEST_MBED_OS_HASHING_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS tls-client
-          example.
-        name: TEST_MBED_OS_TLS_CLIENT_EXAMPLE
-    - string:
-        default: https://github.com/ARMmbed/mbed-os.git
-        description: Enter the Mbed OS repo or fork
-        name: MBED_OS_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          By default we test with the HEAD of the master branch, which is NOT a fixed release.
-        name: MBED_OS_BRANCH
-        trim: 'false'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os-example-tls.git
-        description: |-
-          Enter the Mbed OS examples repo or fork.
-
-          This defaults to the main repository the examples are held in.
-        name: MBED_OS_TLS_EXAMPLES_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          This defaults to the HEAD of the master branch.
-        name: MBED_OS_TLS_EXAMPLES_BRANCH
-        trim: 'false'
-    - choice:
-        choices:
-        - Pull Request
-        - Mbed OS Gold Boards
-        - Mbed OS Silver Boards
-        - Mbed OS Gold Boards + Mbed OS Silver Boards
-        description: |-
-          Pull Request - Boards tested in the Pull Request job<br>
-
-          For the list of Mbed OS Gold and Silver boards, see <a href="https://confluence.arm.com/display/IoTBU/ISG+Device+SW+SUT+list">here</a>
-        name: PLATFORMS_TO_TEST
-    - string:
-        default: arthur.she@linaro.org
-        description: ''
-        name: TEST_PASS_EMAIL_ADDRESS
-        trim: 'false'
-    - string:
-        default: arthur.she@linaro.org
-        description: ''
-        name: TEST_FAIL_EMAIL_ADDRESS
-        trim: 'false'
-    - bool:
-        default: false
-        description: Push head to coverity branch, triggering a scan (development only)
-        name: PUSH_COVERITY
-    - git-parameter:
-        name: TEST_BRANCH
-        description: Branch or tag in https://github.com/arthur-she/mbedtls-test.git (forks are not supported)
-        type: PT_BRANCH_TAG
-        quickFilterEnabled: True
-        defaultValue: master
-
-
-    pipeline-scm:
-      lightweight-checkout: false
-      scm:
-      - git:
-          branches:
-          - ${TEST_BRANCH}
-          url: https://github.com/arthur-she/mbedtls-test.git
-      script-path: vars/mbedtls-release-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 100
-    - inject:
-        enabled: true
-        keep-build-variables: true
-        keep-system-variables: true
-        load-from-master: false
-        override-build-parameters: false
-        properties-content: GIT_CREDENTIALS_ID=mbedtls-github-ssh
-#    triggers:
-#    - parameterized-timer:
-#        cron: "H(0-29) 20 * * * %MBED_TLS_BRANCH=development \nH(0-29) 20 * * * %MBED_TLS_BRANCH=development_2.x \nH(0-29) 20 * * * %MBED_TLS_BRANCH=mbedtls-2.16"
diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
deleted file mode 100644
index 733e941..0000000
--- a/mbed-tls-nightly-tests.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS Nightly Tests
-    disabled: true
-    name: mbed-tls-nightly-tests
-    parameters:
-    - string:
-        default: https://github.com/Mbed-TLS/mbedtls.git
-        description: Enter mbed TLS repo/fork
-        name: MBED_TLS_REPO
-        trim: 'false'
-    - string:
-        default: development
-        description: Enter branch or commit to test
-        name: MBED_TLS_BRANCH
-        trim: 'false'
-    - bool:
-        default: true
-        description: |-
-          Run basic-build-test.sh
-
-          (Note, this does not work on mbedtls-2.1).
-        name: RUN_BASIC_BUILD_TEST
-    - bool:
-        default: true
-        description: Run all.sh
-        name: RUN_ALL_SH
-    - bool:
-        default: true
-        description: Run a selection of all.sh on FreeBSD
-        name: RUN_FREEBSD
-    - bool:
-        default: true
-        description: Run Windows tests
-        name: RUN_WINDOWS_TEST
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS authcrypt
-          example.
-        name: TEST_MBED_OS_AUTHCRYPT_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS benchmark
-          example.
-        name: TEST_MBED_OS_BENCHMARK_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS hashing
-          example.
-        name: TEST_MBED_OS_HASHING_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS tls-client
-          example.
-        name: TEST_MBED_OS_TLS_CLIENT_EXAMPLE
-    - string:
-        default: https://github.com/ARMmbed/mbed-os.git
-        description: Enter the Mbed OS repo or fork
-        name: MBED_OS_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          By default we test with the HEAD of the master branch, which is NOT a fixed release.
-        name: MBED_OS_BRANCH
-        trim: 'false'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os-example-tls.git
-        description: |-
-          Enter the Mbed OS examples repo or fork.
-
-          This defaults to the main repository the examples are held in.
-        name: MBED_OS_TLS_EXAMPLES_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          This defaults to the HEAD of the master branch.
-        name: MBED_OS_TLS_EXAMPLES_BRANCH
-        trim: 'false'
-    - choice:
-        choices:
-        - Pull Request
-        - Mbed OS Gold Boards
-        - Mbed OS Silver Boards
-        - Mbed OS Gold Boards + Mbed OS Silver Boards
-        description: |-
-          Pull Request - Boards tested in the Pull Request job<br>
-
-          For the list of Mbed OS Gold and Silver boards, see <a href="https://confluence.arm.com/display/IoTBU/ISG+Device+SW+SUT+list">here</a>
-        name: PLATFORMS_TO_TEST
-    - string:
-        default: arthur.she@linaro.org,kelley.spoon@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
-        description: ''
-        name: TEST_PASS_EMAIL_ADDRESS
-        trim: 'false'
-    - string:
-        default: arthur.she@linaro.org,kelley.spoon@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
-        description: ''
-        name: TEST_FAIL_EMAIL_ADDRESS
-        trim: 'false'
-    - bool:
-        default: false
-        description: Push head to coverity branch, triggering a scan (development only)
-        name: PUSH_COVERITY
-    pipeline-scm:
-      lightweight-checkout: true
-      scm:
-      - git:
-          branches:
-          - 'master'
-          url: https://github.com/Mbed-TLS/mbedtls-test.git
-      script-path: vars/mbedtls-release-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 100
-    - inject:
-        enabled: true
-        keep-build-variables: true
-        keep-system-variables: true
-        load-from-master: false
-        override-build-parameters: false
-        properties-content: GIT_CREDENTIALS_ID=mbedtls-github-token
-    triggers:
-    - parameterized-timer:
-        cron: "H(0-29) 0 * * * %MBED_TLS_BRANCH=development \nH(0-29) 2 * * * %MBED_TLS_BRANCH=mbedtls-2.28"
diff --git a/mbed-tls-pr-head.yaml b/mbed-tls-pr-head.yaml
deleted file mode 100644
index 1af2dd7..0000000
--- a/mbed-tls-pr-head.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: mbed-tls-pr-head
-    description: 'Job for testing mbed tls PR heads'
-    project-type: multibranch
-    disabled: true
-    prune-dead-branches: true
-    days-to-keep: 60
-    num-to-keep: 1000
-    script-path: tests/.jenkins/Jenkinsfile
-    properties:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
-              <libraries>
-                <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-                  <name>mbedtls-test</name>
-                  <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-                    <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
-                      <repoOwner>Mbed-TLS</repoOwner>
-                      <repository>mbedtls-test</repository>
-                      <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
-                    </scm>
-                  </retriever>
-                  <defaultVersion>master</defaultVersion>
-                  <implicit>true</implicit>
-                  <allowVersionOverride>true</allowVersionOverride>
-                  <includeInChangesets>true</includeInChangesets>
-                </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-              </libraries>
-            </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    scm:
-    - github:
-        api-uri: https://api.github.com
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls
-        branch-discovery: no-pr
-        discover-pr-forks-strategy: both
-        discover-pr-forks-trust: permission
-        discover-pr-origin: both
-        head-filter-regex: '(?!^PR-(7958|7959)-(head)$)(PR-\d+-head)'
-        property-strategies:
-          all-branches:
-          - pipeline-branch-durability-override: performance-optimized
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
diff --git a/mbed-tls-pr-merge.yaml b/mbed-tls-pr-merge.yaml
deleted file mode 100644
index e0541fc..0000000
--- a/mbed-tls-pr-merge.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: mbed-tls-pr-merge
-    description: 'Job for testing PRs merged with the target branch head'
-    project-type: multibranch
-    disabled: true
-    prune-dead-branches: true
-    days-to-keep: 60
-    num-to-keep: 1000
-    script-path: tests/.jenkins/Jenkinsfile
-    properties:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
-              <libraries>
-                <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-                  <name>mbedtls-test</name>
-                  <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-                    <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
-                      <repoOwner>Mbed-TLS</repoOwner>
-                      <repository>mbedtls-test</repository>
-                      <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
-                    </scm>
-                  </retriever>
-                  <defaultVersion>master</defaultVersion>
-                  <implicit>true</implicit>
-                  <allowVersionOverride>true</allowVersionOverride>
-                  <includeInChangesets>true</includeInChangesets>
-                </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-              </libraries>
-            </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    scm:
-    - github:
-        api-uri: https://api.github.com
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls
-        branch-discovery: no-pr
-        discover-pr-forks-strategy: both
-        discover-pr-forks-trust: permission
-        discover-pr-origin: both
-        head-filter-regex: '(?!^PR-(7958|7959)-(merge|head)$)(PR-\d+-merge)'
-        property-strategies:
-          all-branches:
-          - pipeline-branch-durability-override: performance-optimized
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
diff --git a/mbed-tls-restricted-pr-ci-testing.yaml b/mbed-tls-restricted-pr-ci-testing.yaml
deleted file mode 100644
index 1254596..0000000
--- a/mbed-tls-restricted-pr-ci-testing.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- job:
-    name: mbed-tls-restricted-pr-ci-testing
-    description: 'mbedtls CI testing job'
-    project-type: multibranch
-    disabled: true
-    prune-dead-branches: true
-    script-path: tests/.jenkins/Jenkinsfile
-    properties:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
-              <libraries>
-                <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-                  <name>mbedtls-test</name>
-                  <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-                    <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
-                      <repoOwner>Mbed-TLS</repoOwner>
-                      <repository>mbedtls-test</repository>
-                      <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
-                      <traits>
-                        <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-                          <strategyId>1</strategyId>
-                        </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-                        <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
-                          <strategyId>2</strategyId>
-                        </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
-                        <org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
-                          <strategyId>2</strategyId>
-                          <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"/>
-                        </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
-                      </traits>
-                    </scm>
-                  </retriever>
-                  <defaultVersion>staging/pr-ci-testing</defaultVersion>
-                  <implicit>true</implicit>
-                  <allowVersionOverride>true</allowVersionOverride>
-                  <includeInChangesets>true</includeInChangesets>
-                </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-              </libraries>
-            </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    scm:
-    - github:
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls-restricted
-        branch-discovery: no-pr
-        discover-pr-origin: both
-        head-filter-regex: 'PR-(758|759|850|906|916|919)-.*'
-        property-strategies:
-          all-branches:
-          - pipeline-branch-durability-override: performance-optimized
-          - suppress-scm-triggering: true
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
-        ssh-checkout:
-          credentials: mbedtls-github-ssh
-    - github:
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls
-        branch-discovery: all
-        discover-pr-origin: both
-        discover-pr-forks-strategy: both
-        discover-pr-forks-trust: permission
-        head-filter-regex: 'gh-readonly-queue/.*|PR-(7958|7959)-(head|merge)'
-        property-strategies:
-          all-branches:
-          - pipeline-branch-durability-override: performance-optimized
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
-        ssh-checkout:
-          credentials: mbedtls-github-ssh
diff --git a/mbed-tls-restricted-pr-test-parametrized.yaml b/mbed-tls-restricted-pr-test-parametrized.yaml
deleted file mode 100644
index e0a75e8..0000000
--- a/mbed-tls-restricted-pr-test-parametrized.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS parametrized test PR job
-    disabled: true
-    name: mbed-tls-restricted-pr-test-parametrized
-    parameters:
-    - string:
-        default: development
-        description: Set this to the branch you would be targeting for a PR
-        name: CHANGE_TARGET
-        trim: 'false'
-    - string:
-        default: ssh://git@github.com/Mbed-TLS/mbedtls-restricted.git
-        description: Enter mbed TLS repo/fork
-        name: MBED_TLS_REPO
-        trim: 'true'
-    - string:
-        default: development-restricted
-        description: Enter branch or commit to test
-        name: MBED_TLS_BRANCH
-        trim: 'false'
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto repo/fork. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_REPO
-        trim: 'false'
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto branch. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_BRANCH
-        trim: 'false'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os.git
-        description: Enter the Mbed OS repo or fork
-        name: MBED_OS_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          By default we test with the HEAD of the master branch, which is NOT a fixed release.
-        name: MBED_OS_BRANCH
-        trim: 'false'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os-example-tls.git
-        description: |-
-          Enter the Mbed OS examples repo or fork.
-
-          This defaults to the main repository the examples are held in.
-        name: MBED_OS_TLS_EXAMPLES_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          This defaults to the HEAD of the master branch.
-        name: MBED_OS_TLS_EXAMPLES_BRANCH
-        trim: 'false'
-    - bool:
-        default: false
-        description: Run the basic linux PR job scripts.
-        name: RUN_LINUX_SCRIPTS
-    - bool:
-        default: false
-        description: Run the basic FreeBSD PR job scripts
-        name: RUN_FREEBSD
-    - bool:
-        default: false
-        description: Run Windows tests
-        name: RUN_WINDOWS_TEST
-    - bool:
-        default: false
-        description: Run all.sh tests
-        name: RUN_ALL_SH
-    - bool:
-        default: false
-        description: Run the ABI checking test
-        name: RUN_ABI_CHECK
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS authcrypt
-          example.
-        name: TEST_MBED_OS_AUTHCRYPT_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS benchmark
-          example.
-        name: TEST_MBED_OS_BENCHMARK_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS hashing
-          example.
-        name: TEST_MBED_OS_HASHING_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS tls-client
-          example.
-        name: TEST_MBED_OS_TLS_CLIENT_EXAMPLE
-    - git-parameter:
-        name: TEST_BRANCH
-        description: Branch or tag in https://github.com/Mbed-TLS/mbedtls-test.git (forks are not supported)
-        type: PT_BRANCH_TAG
-        quickFilterEnabled: True
-        defaultValue: master
-    pipeline-scm:
-      lightweight-checkout: false
-      scm:
-      - git:
-          branches:
-          - ${TEST_BRANCH}
-          url: https://github.com/Mbed-TLS/mbedtls-test.git
-      script-path: vars/mbedtls-pr-test-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 100
-    - github:
-        url: https://github.com/Mbed-TLS/mbedtls
-    - inject:
-        enabled: true
-        keep-build-variables: true
-        keep-system-variables: true
-        load-from-master: false
-        override-build-parameters: false
-        properties-content: GIT_CREDENTIALS_ID=mbedtls-github-ssh
-    triggers: []
diff --git a/mbed-tls-restricted-pr.yaml b/mbed-tls-restricted-pr.yaml
deleted file mode 100644
index fd9e527..0000000
--- a/mbed-tls-restricted-pr.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: mbed-tls-restricted-pr
-    description: 'mbedtls restricted PR job'
-    project-type: multibranch
-    disabled: true
-    prune-dead-branches: true
-    days-to-keep: -1
-    num-to-keep: -1
-    script-path: tests/.jenkins/Jenkinsfile
-    properties:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
-              <libraries>
-                <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-                  <name>mbedtls-test</name>
-                  <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-                    <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
-                      <repoOwner>Mbed-TLS</repoOwner>
-                      <repository>mbedtls-test</repository>
-                      <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
-                    </scm>
-                  </retriever>
-                  <defaultVersion>master</defaultVersion>
-                  <implicit>true</implicit>
-                  <allowVersionOverride>true</allowVersionOverride>
-                  <includeInChangesets>true</includeInChangesets>
-                </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-              </libraries>
-            </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    scm:
-    - github:
-        api-uri: https://api.github.com
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls-restricted
-        branch-discovery: no-pr
-        discover-pr-forks-strategy: both
-        discover-pr-forks-trust: permission
-        discover-pr-origin: both
-        head-filter-regex: '(?!^PR-(758|759|850|906|916|919)-(merge|head)$)(PR-\d+-(merge|head))'
-        property-strategies:
-          all-branches:
-          - pipeline-branch-durability-override: performance-optimized
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
-        ssh-checkout:
-          credentials: mbedtls-github-ssh
diff --git a/mbedtls-dockerfile-builder.yaml b/mbedtls-dockerfile-builder.yaml
deleted file mode 100644
index bc69a9b..0000000
--- a/mbedtls-dockerfile-builder.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-- job:
-    concurrent: true
-    description: Dockerfile building job.
-    disabled: true
-    dsl: |-
-      timestamps {
-          stage('build-dockerfiles') {
-              node('dockerfile-builder') {
-                  dir('src') {
-                      deleteDir()
-                      checkout([
-                          scm: [
-                              $class: 'GitSCM',
-                              userRemoteConfigs: [
-                                  [url: MBED_TLS_TEST_REPO]
-                              ],
-                              branches: [[name: MBED_TLS_TEST_BRANCH]],
-                              extensions: [
-                                  [$class: 'CloneOption', timeout: 60],
-                                  [$class: 'SubmoduleOption', recursiveSubmodules: true],
-                                  [$class: 'LocalBranch', localBranch: MBED_TLS_TEST_BRANCH],
-                              ],
-                          ]
-                      ])
-                      dir('resources') {
-                          dir('docker_files') {
-                              withCredentials([string(credentialsId: 'DOCKER_AUTH', variable: 'TOKEN')]) {
-                              sh """\
-      mkdir -p ${env.HOME}/.docker
-      cat > ${env.HOME}/.docker/config.json << EOF
-      {
-              "auths": {
-                      "https://index.docker.io/v1/": {
-                              "auth": "\${TOKEN}"
-                      }
-              }
-      }
-      EOF
-      chmod 0600 ${env.HOME}/.docker/config.json
-      """
-                              }
-                              if (BUILD_16_04_DOCKERFILE == "true") {
-                                  dir('ubuntu-16.04') {
-                                      sh """\
-      docker build --build-arg ARMLMD_LICENSE_FILE=27000@flexnet.trustedfirmware.org -t trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_16_04_DOCKERFILE} .
-      docker push trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_16_04_DOCKERFILE}
-      """
-                                  }
-                              }
-                              if (BUILD_18_04_DOCKERFILE == "true") {
-                                  dir('ubuntu-18.04') {
-                                      sh """\
-      docker build --build-arg ARMLMD_LICENSE_FILE=27000@flexnet.trustedfirmware.org -t trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_18_04_DOCKERFILE} .
-      docker push trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_18_04_DOCKERFILE}
-      """
-                                  }
-                              }
-                              if (BUILD_20_04_DOCKERFILE == "true") {
-                                  dir('ubuntu-20.04') {
-                                      sh """\
-      docker build --build-arg ARMLMD_LICENSE_FILE=27000@flexnet.trustedfirmware.org -t trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_20_04_DOCKERFILE} .
-      docker push trustedfirmware/ci-amd64-mbed-tls-ubuntu:${TAG_FOR_20_04_DOCKERFILE}
-      """
-                                  }
-                              }
-                          }
-                      }
-                  }
-              }
-          }
-      }
-    name: mbedtls-dockerfile-builder
-    parameters:
-    - string:
-        default: https://github.com/Mbed-TLS/mbedtls-test.git
-        description: Enter mbed TLS test repo/fork
-        name: MBED_TLS_TEST_REPO
-        trim: 'false'
-    - string:
-        default: master
-        description: Enter branch or commit to build dockerfile from
-        name: MBED_TLS_TEST_BRANCH
-        trim: 'false'
-    - bool:
-        default: false
-        description: Build the Ubuntu 16.04 Docker image
-        name: BUILD_16_04_DOCKERFILE
-    - string:
-        default: ubuntu-16.04-testing
-        description: Enter tag for Ubuntu 16.04 Docker image being built
-        name: TAG_FOR_16_04_DOCKERFILE
-        trim: 'false'
-    - bool:
-        default: false
-        description: Build the Ubuntu 18.04 Docker image
-        name: BUILD_18_04_DOCKERFILE
-    - string:
-        default: ubuntu-18.04-testing
-        description: Enter tag for Ubuntu 18.04 Docker image being built
-        name: TAG_FOR_18_04_DOCKERFILE
-        trim: 'false'
-    - bool:
-        default: false
-        description: Build the Ubuntu 20.04 Docker image
-        name: BUILD_20_04_DOCKERFILE
-    - string:
-        default: ubuntu-20.04-testing
-        description: Enter tag for Ubuntu 20.04 Docker image being built
-        name: TAG_FOR_20_04_DOCKERFILE
-        trim: 'false'
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 100
-    sandbox: true
-    triggers: []
diff --git a/mbedtls-gather-timestamps.yaml b/mbedtls-gather-timestamps.yaml
deleted file mode 100644
index ffc31c5..0000000
--- a/mbedtls-gather-timestamps.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS job to gather timestamps from various jobs' runs
-    name: mbedtls-gather-timestamps
-    disabled: true
-    pipeline-scm:
-      lightweight-checkout: true
-      scm:
-      - git:
-          branches:
-          - master
-          url: https://github.com/Mbed-TLS/mbedtls-test.git
-      script-path: vars/mbedtls-gather-timestamps-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 120
-        num-to-keep: 120
-    triggers:
-    - timed: 0 8 * * *
diff --git a/mbedtls-pr-multibranch.yaml b/mbedtls-pr-multibranch.yaml
deleted file mode 100644
index 29ae652..0000000
--- a/mbedtls-pr-multibranch.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: mbedtls-pr-multibranch
-    description: 'mbedtls PR job'
-    project-type: multibranch
-    disabled: true
-    prune-dead-branches: true
-    script-path: tests/.jenkins/Jenkinsfile
-    properties:
-      - raw:
-          xml: |
-            <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
-              <libraries>
-                <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-                  <name>mbedtls-test</name>
-                  <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
-                    <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
-                      <repoOwner>Mbed-TLS</repoOwner>
-                      <repository>mbedtls-test</repository>
-                      <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
-                      <traits>
-                        <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-                          <strategyId>1</strategyId>
-                        </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
-                        <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
-                          <strategyId>2</strategyId>
-                        </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
-                        <org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
-                          <strategyId>2</strategyId>
-                          <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"/>
-                        </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
-                      </traits>
-                    </scm>
-                  </retriever>
-                  <defaultVersion>master</defaultVersion>
-                  <implicit>true</implicit>
-                  <allowVersionOverride>true</allowVersionOverride>
-                  <includeInChangesets>true</includeInChangesets>
-                </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
-              </libraries>
-            </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
-    scm:
-    - github:
-        api-uri: https://api.github.com
-        credentials-id: mbedtls-github-token
-        repo-owner: Mbed-TLS
-        repo: mbedtls
-        branch-discovery: no-pr
-        discover-pr-origin: both
-        discover-pr-forks-strategy: both
-        discover-pr-forks-trust: permission
-        head-filter-regex: '(?!^PR-(1824)-(merge|head)$)(PR-\d+-(merge|head))'
-        property-strategies:
-            all-branches:
-                - suppress-scm-triggering: true
-        submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: false
diff --git a/mbedtls-release-ci-testing.yaml b/mbedtls-release-ci-testing.yaml
deleted file mode 100644
index 12038bc..0000000
--- a/mbedtls-release-ci-testing.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS Release job (new)
-    disabled: true
-    name: mbedtls-release-ci-testing
-    parameters:
-    - string:
-        default: https://github.com/Mbed-TLS/mbedtls.git
-        description: Enter mbed TLS repo/fork
-        name: MBED_TLS_REPO
-        trim: 'true'
-    - string:
-        default: development
-        description: Enter branch or commit to test
-        name: MBED_TLS_BRANCH
-        trim: 'true'
-    - bool:
-        default: false
-        description: Run basic-build-test.sh (test coverage measurement)
-        name: RUN_BASIC_BUILD_TEST
-    - bool:
-        default: false
-        description: Run all.sh on Linux
-        name: RUN_ALL_SH
-    - bool:
-        default: false
-        description: Run a selection of all.sh on FreeBSD
-        name: RUN_FREEBSD
-    - bool:
-        default: false
-        description: Run Windows tests
-        name: RUN_WINDOWS_TEST
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS authcrypt
-          example.
-        name: TEST_MBED_OS_AUTHCRYPT_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS benchmark
-          example.
-        name: TEST_MBED_OS_BENCHMARK_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS hashing
-          example.
-        name: TEST_MBED_OS_HASHING_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS tls-client
-          example.
-        name: TEST_MBED_OS_TLS_CLIENT_EXAMPLE
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto repo/fork. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_REPO
-        trim: 'true'
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto branch. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_BRANCH
-        trim: 'true'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os.git
-        description: Enter the Mbed OS repo or fork
-        name: MBED_OS_REPO
-        trim: 'true'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          By default we test with the HEAD of the master branch, which is NOT a fixed release.
-        name: MBED_OS_BRANCH
-        trim: 'true'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os-example-tls.git
-        description: |-
-          Enter the Mbed OS examples repo or fork.
-
-          This defaults to the main repository the examples are held in.
-        name: MBED_OS_TLS_EXAMPLES_REPO
-        trim: 'true'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          This defaults to the HEAD of the master branch.
-        name: MBED_OS_TLS_EXAMPLES_BRANCH
-        trim: 'true'
-    - choice:
-        choices:
-        - Pull Request
-        - Mbed OS Gold Boards
-        - Mbed OS Silver Boards
-        - Mbed OS Gold Boards + Mbed OS Silver Boards
-        description: |-
-          Pull Request - Boards tested in the Pull Request job<br>
-
-          For the list of Mbed OS Gold and Silver boards, see <a href="https://confluence.arm.com/display/IoTBU/ISG+Device+SW+SUT+list">here</a>
-        name: PLATFORMS_TO_TEST
-    - bool:
-        default: false
-        description: Push head to coverity branch, triggering a scan (development only)
-        name: PUSH_COVERITY
-    - git-parameter:
-        name: TEST_BRANCH
-        description: Branch or tag in https://github.com/Mbed-TLS/mbedtls-test.git (forks are not supported)
-        type: PT_BRANCH_TAG
-        quickFilterEnabled: True
-        defaultValue: master
-    pipeline-scm:
-      lightweight-checkout: false
-      scm:
-      - git:
-          branches:
-          - ${TEST_BRANCH}
-          url: https://github.com/Mbed-TLS/mbedtls-test.git
-      script-path: vars/mbedtls-release-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 30
-    - github:
-        url: https://github.com/Mbed-TLS/mbedtls
-    - inject:
-        enabled: true
-        keep-build-variables: true
-        keep-system-variables: true
-        load-from-master: false
-        override-build-parameters: false
-        properties-content: |-
-          GIT_CREDENTIALS_ID=mbedtls-github-ssh
-          TEST_PASS_EMAIL_ADDRESS=arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
-          TEST_FAIL_EMAIL_ADDRESS=arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
-
diff --git a/mbedtls-repo-scan-scheduler.yaml b/mbedtls-repo-scan-scheduler.yaml
deleted file mode 100644
index 34db6dc..0000000
--- a/mbedtls-repo-scan-scheduler.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-- job:
-    concurrent: true
-    description: |-
-      This job exists to schedule the nightly repository scans.
-      There appears to be an issue with automatically scanning if there are more than one multibranch pipelines on the same repo.
-    disabled: true
-    dsl: |-
-      build job: "mbed-tls-pr-merge", wait: false, propagate: false
-      build job: "mbed-tls-pr-head", wait: false, propagate: false
-      build job: "mbed-tls-restricted-pr", wait: false, propagate: false
-    name: mbedtls-repo-scan-scheduler
-    project-type: pipeline
-    sandbox: true
-    triggers:
-    - timed: 0 20 * * *
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
diff --git a/mbedtls-restricted-release-new.yaml b/mbedtls-restricted-release-new.yaml
deleted file mode 100644
index 288b9a1..0000000
--- a/mbedtls-restricted-release-new.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-- job:
-    concurrent: true
-    description: Mbed TLS Release job (new)
-    disabled: true
-    name: mbedtls-restricted-release-new
-    parameters:
-    - string:
-        default: ssh://git@github.com/Mbed-TLS/mbedtls-restricted.git
-        description: Enter mbed TLS repo/fork
-        name: MBED_TLS_REPO
-        trim: 'true'
-    - string:
-        default: development-restricted
-        description: Enter branch or commit to test
-        name: MBED_TLS_BRANCH
-        trim: 'true'
-    - bool:
-        default: true
-        description: Run basic-build-test.sh
-        name: RUN_BASIC_BUILD_TEST
-    - bool:
-        default: true
-        description: Run all.sh on Linux
-        name: RUN_ALL_SH
-    - bool:
-        default: false
-        description: Run Windows tests
-        name: RUN_WINDOWS_TEST
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS authcrypt
-          example.
-        name: TEST_MBED_OS_AUTHCRYPT_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS benchmark
-          example.
-        name: TEST_MBED_OS_BENCHMARK_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS hashing
-          example.
-        name: TEST_MBED_OS_HASHING_EXAMPLE
-    - bool:
-        default: false
-        description: Import mbed TLS into mbed-os master and test mbed TLS tls-client
-          example.
-        name: TEST_MBED_OS_TLS_CLIENT_EXAMPLE
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto repo/fork. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_REPO
-        trim: 'true'
-    - string:
-        default: ''
-        description: |-
-          Enter Mbed Crypto branch. Note this *ONLY* influences the Mbed OS tests at this time.
-
-          Optional - if omitted will use what's embedded in the Mbed TLS submodule.
-        name: MBED_CRYPTO_BRANCH
-        trim: 'true'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os.git
-        description: Enter the Mbed OS repo or fork
-        name: MBED_OS_REPO
-        trim: 'true'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          By default we test with the HEAD of the master branch, which is NOT a fixed release.
-        name: MBED_OS_BRANCH
-        trim: 'true'
-    - string:
-        default: https://github.com/ARMmbed/mbed-os-example-tls.git
-        description: |-
-          Enter the Mbed OS examples repo or fork.
-
-          This defaults to the main repository the examples are held in.
-        name: MBED_OS_TLS_EXAMPLES_REPO
-        trim: 'true'
-    - string:
-        default: master
-        description: |-
-          Enter branch or commit to test.
-
-          This defaults to the HEAD of the master branch.
-        name: MBED_OS_TLS_EXAMPLES_BRANCH
-        trim: 'true'
-    - choice:
-        choices:
-        - Pull Request
-        - Mbed OS Gold Boards
-        - Mbed OS Silver Boards
-        - Mbed OS Gold Boards + Mbed OS Silver Boards
-        description: |-
-          Pull Request - Boards tested in the Pull Request job<br>
-
-          For the list of Mbed OS Gold and Silver boards, see <a href="https://confluence.arm.com/display/IoTBU/ISG+Device+SW+SUT+list">here</a>
-        name: PLATFORMS_TO_TEST
-    pipeline-scm:
-      lightweight-checkout: true
-      scm:
-      - git:
-          branches:
-          - 'master'
-          url: https://github.com/Mbed-TLS/mbedtls-test.git
-      script-path: vars/mbedtls-release-Jenkinsfile
-    project-type: pipeline
-    properties:
-    - speed-durability:
-        hint: performance-optimized
-    - build-blocker:
-        block-level: GLOBAL
-        blocking-jobs: []
-        queue-scanning: DISABLED
-        use-build-blocker: false
-    - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-        days-to-keep: 60
-        num-to-keep: 100
-    - github:
-        url: https://github.com/Mbed-TLS/mbedtls
-    - inject:
-        enabled: true
-        keep-build-variables: true
-        keep-system-variables: true
-        load-from-master: false
-        override-build-parameters: false
-        properties-content: |-
-          GIT_CREDENTIALS_ID=mbedtls-github-ssh
-          TEST_PASS_EMAIL_ADDRESS=mbed-tls-eng@arm.com;jaeden.amero@arm.com;arthur.she@linaro.org
-          TEST_FAIL_EMAIL_ADDRESS=mbed-tls-eng@arm.com;jaeden.amero@arm.com;arthur.she@linaro.org
-    triggers: []