diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
deleted file mode 100644
index 97f0874ce..000000000
--- a/jjb/aai/aai-oom.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: aai-oom-project-view
-    project-name: aai-oom
-    views:
-      - project-view
-
-- project:
-    name: aai-oom
-    helm-module: 'aai'
-    project-name: 'aai-oom'
-    project: 'aai/oom'
-    jobs:
-      - '{project-name}-{stream}-verify-external-helm'
-      - '{project-name}-{stream}-merge-external-helm':
-          build_script: '{oom_build_script}'
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: '**'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-
-    mvn-settings: 'aai-oom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-helm-2c-1g
-    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
-    oom_build_script: |
-        #!/bin/bash
-        set -e -o pipefail
-        cd kubernetes/
-        make HELM_BIN=helm3.3 all
-    build_script: |
-        #!/bin/bash
-        cd kubernetes/
-        make HELM_BIN=helm3.3 common
-        make HELM_BIN=helm3.3 {helm-module}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
deleted file mode 100644
index 66410d41c..000000000
--- a/jjb/aai/aai-router-core-service.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: aai-router-project-view
-    project-name: aai-router
-    views:
-      - project-view
-
-- project:
-    name: aai-router-core-master
-    project-name: 'aai-router-core'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/router-core'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-router-core-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-router-core-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/router-core'
-    project-name: 'aai-router-core'
-    branch: 'master'
-    mvn-settings: 'aai-router-core-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-router-core-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/router-core'
-    project-name: 'aai-router-core'
-    stream:
-        - 'master':
-              branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
-    mvn-settings: 'aai-router-core-settings'
-
-- project:
-    name: aai-router-core-info
-    project-name: aai-router-core
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/router-core
-    branch: master
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
deleted file mode 100644
index 85b8afe4d..000000000
--- a/jjb/aai/aai-validation.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- project:
-    name: aai-validation-project-view
-    project-name: aai-validation
-    views:
-      - project-view
-
-- project:
-    name: aai-validation
-    project-name: 'aai-validation'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: 'docker:build -B -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/validation'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-validation-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: aai-validation-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/validation'
-    project-name: 'aai-validation'
-    branch: 'master'
-    mvn-settings: 'aai-validation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-validation-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/validation'
-    project-name: 'aai-validation'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-validation-settings'
-
-
-- project:
-    name: aai-validation-info
-    project-name: aai-validation
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/validation
-    branch: master