diff --git a/README.md b/README.md
index 921a1fe..939ce6f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 The best way to work with this repo is to check it out with `repo`, per these
 instructions: [Downloading testing and QA
-repositories](https://guide.opencord.org/getting_the_code.html#downloading-testing-and-qa-repositories)
+repositories](https://guide.opencord.org/developer/getting_the_code.html#testing-and-qa-repositories)
 
 > NOTE: This repo uses git submodules. If you have trouble with the tests or
 > other tasks, please run: `git submodule init && git submodule update` to
@@ -157,9 +157,9 @@
 
 > NOTE: Future builds won't automatically use the new AMI - you have to
 > manually set the instance `AMI ID` on jenkins in [Global
-> Config](https://jenkins-new.opencord.org/configure) > Cloud > Amazon EC2.
+> Config](https://jenkins.opencord.org/configure) > Cloud > Amazon EC2.
 > The new AMI ID can be found near the end of the logs of the run of
-> [ci-management-packer-merge-<ostype>-basebuild](https://jenkins-new.opencord.org/job/ci-management-packer-merge-ubuntu-16.04-basebuild/).
+> [ci-management-packer-merge-<ostype>-basebuild](https://jenkins.opencord.org/job/ci-management-packer-merge-ubuntu-16.04-basebuild/).
 
 ### Adding additional EC2 instance types
 
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 740fbd8..57a01f0 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -28,34 +28,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: '$GERRIT_BRANCH'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: '$GERRIT_BRANCH'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: gerritProject
-         default: '$GERRIT_PROJECT'
-         description: 'Name of the Gerrit project'
+          name: gerritProject
+          default: '$GERRIT_PROJECT'
+          description: 'Name of the Gerrit project'
 
       - string:
-         name: gerritChangeNumber
-         default: '$GERRIT_CHANGE_NUMBER'
-         description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-         name: gerritPatchsetNumber
-         default: '$GERRIT_PATCHSET_NUMBER'
-         description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
     project-type: pipeline
     concurrent: true
diff --git a/jjb/bbsim-validation.yaml b/jjb/bbsim-validation.yaml
index 4ca9fe3..7c75fc3 100644
--- a/jjb/bbsim-validation.yaml
+++ b/jjb/bbsim-validation.yaml
@@ -31,49 +31,49 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'qct-pod2-node1'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'qct-pod2-node1'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: deploymentConfig
-         default: 'bbsim-voltha-1.6.yml'
-         description: 'kubernetes configurations file'
+          name: deploymentConfig
+          default: 'bbsim-voltha-1.6.yml'
+          description: 'kubernetes configurations file'
 
       - string:
-         name: OnuCount
-         default: '16'
-         description: 'Number of ONUs per pon port'
+          name: OnuCount
+          default: '16'
+          description: 'Number of ONUs per pon port'
 
       - string:
-         name: EmulationMode
-         default: '--set emulation_mode=both'
-         description: 'Emulation for BBSIM (both|aaa)'
+          name: EmulationMode
+          default: '--set emulation_mode=both'
+          description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
-         name: TestTags
-         default: ''
-         description: 'Tests to include/exclude. eg "-e serviceinstances"'
+          name: TestTags
+          default: ''
+          description: 'Tests to include/exclude. eg "-e serviceinstances"'
 
       - string:
-         name: TestTimeout
-         default: '300s'
-         description: 'timeout for each test case (increase as you scale up)'
+          name: TestTimeout
+          default: '300s'
+          description: 'timeout for each test case (increase as you scale up)'
 
       - bool:
-         name: ArchiveLogs
-         default: true
-         description: 'Archive all pod logs after test run'
+          name: ArchiveLogs
+          default: true
+          description: 'Archive all pod logs after test run'
 
     project-type: pipeline
     concurrent: false
@@ -101,49 +101,49 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'qct-pod2-node1'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'qct-pod2-node1'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: deploymentConfig
-         default: 'bbsim-voltha-master.yml'
-         description: 'kubernetes configurations file'
+          name: deploymentConfig
+          default: 'bbsim-voltha-master.yml'
+          description: 'kubernetes configurations file'
 
       - string:
-         name: OnuCount
-         default: '16'
-         description: 'Number of ONUs per pon port'
+          name: OnuCount
+          default: '16'
+          description: 'Number of ONUs per pon port'
 
       - string:
-         name: EmulationMode
-         default: '--set emulation_mode=both'
-         description: 'Emulation for BBSIM (both|aaa)'
+          name: EmulationMode
+          default: '--set emulation_mode=both'
+          description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
-         name: TestTags
-         default: ''
-         description: 'Tests to include/exclude. eg "-e serviceinstances"'
+          name: TestTags
+          default: ''
+          description: 'Tests to include/exclude. eg "-e serviceinstances"'
 
       - string:
-         name: TestTimeout
-         default: '300s'
-         description: 'timeout for each test case (increase as you scale up)'
+          name: TestTimeout
+          default: '300s'
+          description: 'timeout for each test case (increase as you scale up)'
 
       - bool:
-         name: ArchiveLogs
-         default: true
-         description: 'Archive all pod logs after test run'
+          name: ArchiveLogs
+          default: true
+          description: 'Archive all pod logs after test run'
 
     project-type: pipeline
     concurrent: false
diff --git a/jjb/build_openolt_deb.yaml b/jjb/build_openolt_deb.yaml
index df4fee9..390c398 100644
--- a/jjb/build_openolt_deb.yaml
+++ b/jjb/build_openolt_deb.yaml
@@ -31,9 +31,9 @@
 
     parameters:
       - string:
-         name: notificationEmail
-         default: 'shad@opennetworking.org kailash@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'shad@opennetworking.org kailash@opennetworking.org'
+          description: ''
 
     node: 'qct-pod3-node2'
 
@@ -44,6 +44,6 @@
       script-path: 'Jenkinsfile-build'
       scm:
         - git:
-           url: '{gerrit-server-url}/openolt'
-           branches:
-             - 'master'
+            url: '{gerrit-server-url}/openolt'
+            branches:
+              - 'master'
diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index 1b82c5c..668c2f7 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -160,5 +160,3 @@
             - file-id: pipconf
               target: '$HOME/.config/pip/pip.conf'
 
-
-
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index bf3d8c2..cca01c2 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -11,48 +11,48 @@
     jobs:
       # onlab pod1 build
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod1 build - cord6.1(voltha 1.6) - seba1.0
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-voltha16'
-         profile: 'att-workflow'
-         branch: 'cord-6.1'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master-voltha16.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-voltha16'
+          profile: 'att-workflow'
+          branch: 'cord-6.1'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master-voltha16.deb'
 
       # flex pod1 test job - using voltha-master branch
       - 'build_pod_test':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-qa'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-qa'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # onlab pod2 build
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master.deb'
 
       # flex OCP pod with olt/onu : using voltha latest(master)
-      #- 'build_pod_timer':
+      # - 'build_pod_timer':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord-voltha-master'
       #   profile: 'att-workflow'
@@ -64,7 +64,7 @@
       #   time: '6'
 
       # flex OCP pod with olt/onu - seba-1.0/cord-6.1 release
-      #- 'build_pod_timer':
+      # - 'build_pod_timer':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord-voltha16'
       #   profile: 'att-workflow'
@@ -77,18 +77,18 @@
 
       # flex OCP test job - using voltha-master branch
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord-voltha-master'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-voltha-master'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex ocp pod test job - seba-1.0/cord-6.1 release
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord-voltha16'
-         profile: 'att-workflow'
-         branch: 'cord-6.1'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-voltha16'
+          profile: 'att-workflow'
+          branch: 'cord-6.1'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
diff --git a/jjb/cord-test/mcord.yaml b/jjb/cord-test/mcord.yaml
index 5fd830a..917d927 100644
--- a/jjb/cord-test/mcord.yaml
+++ b/jjb/cord-test/mcord.yaml
@@ -11,23 +11,23 @@
     jobs:
       # onlab mcord-pod1 build
       - 'build_mcord_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onf-mcord-pod1'
-         profile: 'mcord'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-mcord-local-build'
+          testvm: 'onf-build'
+          config-pod: 'onf-mcord-pod1'
+          profile: 'mcord'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-mcord-local-build'
 
       - 'build_mcord_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onf-mcord-pod2'
-         profile: 'mcord'
-         branch: 'master'
-         configurePod: false
-         Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
+          testvm: 'onf-build'
+          config-pod: 'onf-mcord-pod2'
+          profile: 'mcord'
+          branch: 'master'
+          configurePod: false
+          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
 
       - 'build_mcord_pod_manual':
-         testvm: 'mcord-dt'
-         config-pod: 'mcord-barcellona-remote-dt'
-         profile: 'mcord'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
+          testvm: 'mcord-dt'
+          config-pod: 'mcord-barcellona-remote-dt'
+          profile: 'mcord'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index fda3ee1..3eb0d5f 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -28,63 +28,63 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: installMonitoringAndLogging
@@ -97,9 +97,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -117,9 +117,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{profile}_{config-pod}_{branch}'
@@ -136,58 +136,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - bool:
           name: configurePod
@@ -195,9 +195,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -210,9 +210,9 @@
           description: "Onus per PonPort"
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -220,12 +220,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -243,48 +243,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -292,9 +292,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -315,43 +315,43 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -359,9 +359,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -382,53 +382,53 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -436,9 +436,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -456,9 +456,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{config-pod}_seba_release_{release}'
@@ -474,58 +474,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -533,9 +533,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -553,12 +553,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -576,48 +576,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -625,9 +625,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -649,48 +649,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -698,9 +698,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -722,53 +722,53 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - string:
-         name: notificationEmail
-         default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -786,9 +786,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{config-pod}_voltha_{release}'
@@ -804,58 +804,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -863,9 +863,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
     concurrent: true
 
@@ -873,12 +873,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/voltha-system-tests'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -893,51 +893,50 @@
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
     <<: *test-pipe-job-boiler-plate
-
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -945,9 +944,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/voltha-system-tests'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 381f38c..5b43eb0 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -11,50 +11,50 @@
     jobs:
       # onlab pod1 build 1.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-voltha16'
-         release: '1.0'
-         branch: 'cord-6.1'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master-voltha16.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-voltha16'
+          release: '1.0'
+          branch: 'cord-6.1'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master-voltha16.deb'
 
       # onlab pod1 build 2.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod1 test job - release 2.0 test job
       - 'build_pod_release_test':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # onlab pod2 build
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         release: '1.0'
-         branch: 'cord-6.1'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          release: '1.0'
+          branch: 'cord-6.1'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod2 build 2.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # flex OCP pod with olt/onu - release 2.0 build job
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '1.0'
@@ -64,7 +64,7 @@
       #   time: '3'
 
       # flex OCP pod with olt/onu - release 2.0 build job
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0'
@@ -74,7 +74,7 @@
       #   time: '5'
 
       # flex OCP POD with olt/onu - release 1.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '1.0'
@@ -82,7 +82,7 @@
       #   Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex OCP POD with olt/onu - release 2.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0'
@@ -90,7 +90,7 @@
       #   Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex OCP pod with olt/onu : using voltha latest(master)
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0-microcharts'
@@ -100,7 +100,7 @@
       #   time: '7'
 
       # flex OCP test job - release 2.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0-microcharts'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 8a0b31c..8bbf696 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -11,43 +11,44 @@
     jobs:
       # flex OCP pod with olt/onu - release voltha2.0 build job
       - 'build_pod_manual':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         release: '2.0'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-build'
-         oltDebVersion: 'openolt-seba-2.0.deb'
-         profile: 'multipleGem'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.0'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          profile: 'multipleGem'
 
       # flex pod1 test job - using voltha branch
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         profile: 'multipleGem'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          profile: 'multipleGem'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # flex OCP pod with olt/onu - timer based job
       - 'build_voltha_pod_release':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         release: '2.1'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-build'
-         oltDebVersion: 'openolt-seba-2.0.deb'
-         configurePod: true
-         time: '1'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.1'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          configurePod: true
+          time: '1'
 
      # flex pod1 test job - using voltha branch
       - 'build_voltha_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         profile: 'multipleGem'
-         branch: 'master'
-         release: '2.1'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.1'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          configurePod: true
 
diff --git a/jjb/k8install.yaml b/jjb/k8install.yaml
index 441473a..99cd47b 100644
--- a/jjb/k8install.yaml
+++ b/jjb/k8install.yaml
@@ -40,24 +40,24 @@
           description: 'Name of the repo branch to use'
 
       - string:
-         name: configRepoUrl
-         default: 'https://gerrit.opencord.org/pod-configs'
-         description: 'The URL of the POD configs repository'
+          name: configRepoUrl
+          default: 'https://gerrit.opencord.org/pod-configs'
+          description: 'The URL of the POD configs repository'
 
       - string:
-         name: configRepoBaseDir
-         default: 'pod-configs/'
-         description: 'The directory inside the POD configs repository'
+          name: configRepoBaseDir
+          default: 'pod-configs/'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configRepoFile
-         default: 'kubernetes-configs/flex-onf-pod1.yml'
-         description: 'The deployment config file'
+          name: configRepoFile
+          default: 'kubernetes-configs/flex-onf-pod1.yml'
+          description: 'The deployment config file'
 
       - string:
-         name: podName
-         default: 'flex-onf-pod1'
-         description: 'Name of pod'
+          name: podName
+          default: 'flex-onf-pod1'
+          description: 'Name of pod'
 
     project-type: pipeline
     concurrent: false
@@ -65,6 +65,6 @@
     dsl: !include-raw-escape: pipeline/kubespray-install.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H 10 31/3 * *
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index cc2bc62..21d2249 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -13,9 +13,9 @@
 
     parameters:
       - string:
-         name: jdkDistro
-         default: '{jdk-distribution}'
-         description: 'Distribution of the JDK to use with update-java-alternatives'
+          name: jdkDistro
+          default: '{jdk-distribution}'
+          description: 'Distribution of the JDK to use with update-java-alternatives'
 
     triggers:
       - cord-infra-gerrit-trigger-patchset:
@@ -84,9 +84,9 @@
 
     parameters:
       - string:
-         name: jdkDistro
-         default: '{jdk-distribution}'
-         description: 'Distribution of the JDK to use with update-java-alternatives'
+          name: jdkDistro
+          default: '{jdk-distribution}'
+          description: 'Distribution of the JDK to use with update-java-alternatives'
 
     triggers:
       - cord-infra-gerrit-trigger-merge:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 9d9f8ad..f14219c 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -128,14 +128,14 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{executor_node}'
-         description: 'Name of the Jenkins executor node to run the job on'
+          name: executorNode
+          default: '{executor_node}'
+          description: 'Name of the Jenkins executor node to run the job on'
 
       - string:
-         name: project
-         default: '{project}'
-         description: 'Name of the project'
+          name: project
+          default: '{project}'
+          description: 'Name of the project'
 
     triggers:
       - cord-infra-github-pr-trigger:
@@ -148,9 +148,9 @@
       script-path: '{pipeline-file}'
       scm:
         - git:
-           url: 'https://github.com/{github-organization}/omec-project-ci'
-           branches:
-             - 'master'
+            url: 'https://github.com/{github-organization}/omec-project-ci'
+            branches:
+              - 'master'
 
 
 # install jobs, run for each project
@@ -177,14 +177,14 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{executor_node}'
-         description: 'Name of the Jenkins executor node to run the job on'
+          name: executorNode
+          default: '{executor_node}'
+          description: 'Name of the Jenkins executor node to run the job on'
 
       - string:
-         name: project
-         default: '{project}'
-         description: 'Name of the project'
+          name: project
+          default: '{project}'
+          description: 'Name of the project'
 
     concurrent: false
 
@@ -192,9 +192,9 @@
       script-path: '{pipeline-file}'
       scm:
         - git:
-           url: 'https://github.com/{github-organization}/omec-project-ci'
-           branches:
-             - 'master'
+            url: 'https://github.com/{github-organization}/omec-project-ci'
+            branches:
+              - 'master'
 
 # tests
 - job-template:
@@ -218,9 +218,9 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{executor_node}'
-         description: 'Name of the Jenkins executor node to run the job on'
+          name: executorNode
+          default: '{executor_node}'
+          description: 'Name of the Jenkins executor node to run the job on'
 
     concurrent: false
 
@@ -228,9 +228,9 @@
       script-path: 'Jenkinsfile-omec-test-TC1.groovy'
       scm:
         - git:
-           url: 'https://github.com/omec-project/omec-project-ci'
-           branches:
-             - 'master'
+            url: 'https://github.com/omec-project/omec-project-ci'
+            branches:
+              - 'master'
 
 - job-template:
     id: 'omec-tc2'
@@ -253,9 +253,9 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{executor_node}'
-         description: 'Name of the Jenkins executor node to run the job on'
+          name: executorNode
+          default: '{executor_node}'
+          description: 'Name of the Jenkins executor node to run the job on'
 
     concurrent: false
 
@@ -263,7 +263,7 @@
       script-path: 'Jenkinsfile-omec-test-TC2.groovy'
       scm:
         - git:
-           url: 'https://github.com/omec-project/omec-project-ci'
-           branches:
-             - 'master'
+            url: 'https://github.com/omec-project/omec-project-ci'
+            branches:
+              - 'master'
 
diff --git a/jjb/onos-app-release.yaml b/jjb/onos-app-release.yaml
index 0d780d8..cf34927 100644
--- a/jjb/onos-app-release.yaml
+++ b/jjb/onos-app-release.yaml
@@ -25,34 +25,34 @@
     wrappers:
       - ssh-agent-credentials:
           users:
-              - 'gerrit-jenkins-user'
+            - 'gerrit-jenkins-user'
       - build-user-vars
 
     parameters:
       - string:
-         name: app
-         default: ''
-         description: 'Name of the app repository on the OpenCORD Gerrit server.\n e.g. vtn'
+          name: app
+          default: ''
+          description: 'Name of the app repository on the OpenCORD Gerrit server.\n e.g. vtn'
 
       - string:
-         name: version
-         default: ''
-         description: 'Version to release.\n e.g. 1.0.0'
+          name: version
+          default: ''
+          description: 'Version to release.\n e.g. 1.0.0'
 
       - string:
-         name: nextVersion
-         default: ''
-         description: 'Snapshot version to move the code forward to.\n e.g. 1.1.0'
+          name: nextVersion
+          default: ''
+          description: 'Snapshot version to move the code forward to.\n e.g. 1.1.0'
 
       - string:
-         name: branch
-         default: 'master'
-         description: 'Name of the branch to release on.'
+          name: branch
+          default: 'master'
+          description: 'Name of the branch to release on.'
 
       - string:
-         name: jdkDistro
-         default: '{jdk-distribution}'
-         description: 'Distribution of the JDK to use with update-java-alternatives'
+          name: jdkDistro
+          default: '{jdk-distribution}'
+          description: 'Distribution of the JDK to use with update-java-alternatives'
 
     node: 'ubuntu16.04-basebuild-1c-2g'
     project-type: pipeline
diff --git a/jjb/pypi-publish.yaml b/jjb/pypi-publish.yaml
index 77cbfe6..614ed5e 100644
--- a/jjb/pypi-publish.yaml
+++ b/jjb/pypi-publish.yaml
@@ -48,5 +48,3 @@
 
       - shell: !include-raw-escape: shell/pypi-publish.sh
 
-
-
diff --git a/jjb/siab.yaml b/jjb/siab.yaml
index 5d04080..7844856 100644
--- a/jjb/siab.yaml
+++ b/jjb/siab.yaml
@@ -58,7 +58,7 @@
     dsl: !include-raw-escape: pipeline/siab.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  0 0,3,6,9,12,15,18,21 * * *
 
@@ -108,7 +108,7 @@
     dsl: !include-raw-escape: pipeline/siab.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  0 1,4,7,10,13,16,19,22 * * *
 
@@ -158,7 +158,7 @@
     dsl: !include-raw-escape: pipeline/siab.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  0 2,5,8,11,14,17,20,23 * * *
 
@@ -190,14 +190,14 @@
 
 
       - string:
-            name: gerritChangeNumber
-            default: '$GERRIT_CHANGE_NUMBER'
-            description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-            name: gerritPatchsetNumber
-            default: '$GERRIT_PATCHSET_NUMBER'
-            description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
       - string:
           name: version
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index 72bbb62..f546a79 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -75,10 +75,10 @@
     concurrent: true
 
     builders:
-        - 'cord-infra-sonarqube':
-            project: '{project}'
-            sonar-prep-commands: '{sonar-prep-commands}'
-            sonar-java-binaries: '{sonar-java-binaries}'
+      - 'cord-infra-sonarqube':
+          project: '{project}'
+          sonar-prep-commands: '{sonar-prep-commands}'
+          sonar-java-binaries: '{sonar-java-binaries}'
 
 # run Sonarqube as a verification jobs on individual patchsets
 - job-template:
@@ -119,7 +119,8 @@
     concurrent: true
 
     builders:
-        - 'cord-infra-sonarqube':
-            project: '{project}'
-            sonar-prep-commands: '{sonar-prep-commands}'
-            sonar-java-binaries: '{sonar-java-binaries}'
+      - 'cord-infra-sonarqube':
+          project: '{project}'
+          sonar-prep-commands: '{sonar-prep-commands}'
+          sonar-java-binaries: '{sonar-java-binaries}'
+
diff --git a/jjb/synopsys-check.yaml b/jjb/synopsys-check.yaml
index 4f9145e..9682bca 100644
--- a/jjb/synopsys-check.yaml
+++ b/jjb/synopsys-check.yaml
@@ -23,29 +23,29 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{build-node}'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: branch
-         default: 'master'
-         description: 'branch to check'
+          name: branch
+          default: 'master'
+          description: 'branch to check'
 
       - string:
-         name: git_server_url
-         default: '{git-server-url}'
-         description: 'Git Server URL'
+          name: git_server_url
+          default: '{git-server-url}'
+          description: 'Git Server URL'
 
       - string:
-         name: github_organization
-         default: '{github-organization}'
-         description: 'GitHub Organization (leave blank if using Gerrit)'
+          name: github_organization
+          default: '{github-organization}'
+          description: 'GitHub Organization (leave blank if using Gerrit)'
 
       - string:
-         name: blackduck_project
-         default: '{blackduck-project}'
-         description: 'The project to assign repos to in the BlackDuck dashboard'
+          name: blackduck_project
+          default: '{blackduck-project}'
+          description: 'The project to assign repos to in the BlackDuck dashboard'
 
     project-type: pipeline
     concurrent: true
@@ -53,7 +53,7 @@
     dsl: !include-raw-escape: pipeline/synopsys-check.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H 3 * * *
 
@@ -87,9 +87,9 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: '{build-node}'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
           name: gitUrl
@@ -112,9 +112,9 @@
           description: 'Branch of the project in Gerrit'
 
       - string:
-         name: blackduck_project
-         default: '{blackduck-project}'
-         description: 'The project to assign repos to in the BlackDuck dashboard'
+          name: blackduck_project
+          default: '{blackduck-project}'
+          description: 'The project to assign repos to in the BlackDuck dashboard'
 
     project-type: pipeline
     concurrent: true
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index 08208ee..d014e2b 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -29,19 +29,19 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: '{branch}'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: '{branch}'
+          description: 'Name of the repo branch to use'
 
     project-type: pipeline
     concurrent: true
diff --git a/jjb/verify/cord-workflow-airflow.yaml b/jjb/verify/cord-workflow-airflow.yaml
index 5342af0..8151451 100644
--- a/jjb/verify/cord-workflow-airflow.yaml
+++ b/jjb/verify/cord-workflow-airflow.yaml
@@ -11,7 +11,7 @@
       - 'verify-cord-workflow-airflow-jobs':
           branch-regexp: '{supported-branches-regexp}'
       - 'publish-cord-workflow-airflow-jobs':
-            branch-regexp: '{supported-branches-regexp}'
+          branch-regexp: '{supported-branches-regexp}'
 
 - job-group:
     name: 'verify-cord-workflow-airflow-jobs'
diff --git a/jjb/verify/cord-workflow-controller.yaml b/jjb/verify/cord-workflow-controller.yaml
index 9d43dfc..b769eed 100644
--- a/jjb/verify/cord-workflow-controller.yaml
+++ b/jjb/verify/cord-workflow-controller.yaml
@@ -11,7 +11,7 @@
       - 'verify-cord-workflow-controller-jobs':
           branch-regexp: '{supported-branches-regexp}'
       - 'publish-cord-workflow-controller-jobs':
-            branch-regexp: '{supported-branches-regexp}'
+          branch-regexp: '{supported-branches-regexp}'
 
 - job-group:
     name: 'verify-cord-workflow-controller-jobs'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index ec79bba..0b02aa9 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric-crossconnect_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_fabric-crossconnect-unit-test'
+          dependency-jobs: 'verify_fabric-crossconnect-unit-test'
 - job-group:
     name: 'publish-fabric-crossconnect-jobs'
     jobs:
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 978b931..1f21918 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_fabric-unit-test'
+          dependency-jobs: 'verify_fabric-unit-test'
 
 - job-group:
     name: 'publish-fabric-jobs'
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
index 68b4ddc..fa92f9f 100644
--- a/jjb/verify/kubernetes-service.yaml
+++ b/jjb/verify/kubernetes-service.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_kubernetes-service_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_kubernetes-service-unit-test'
+          dependency-jobs: 'verify_kubernetes-service-unit-test'
 
 - job-group:
     name: 'publish-kubernetes-service-jobs'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 65f86a0..a964f87 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_olt-service_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_olt-service-unit-test'
+          dependency-jobs: 'verify_olt-service-unit-test'
 - job-group:
     name: 'publish-olt-service-jobs'
     jobs:
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index 8cfda63..b582d44 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_onos-service_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_onos-service-unit-test'
+          dependency-jobs: 'verify_onos-service-unit-test'
 
 - job-group:
     name: 'publish-onos-service-jobs'
diff --git a/jjb/verify/openolt.yaml b/jjb/verify/openolt.yaml
index 3576748..edec421 100644
--- a/jjb/verify/openolt.yaml
+++ b/jjb/verify/openolt.yaml
@@ -42,9 +42,9 @@
 
     parameters:
       - string:
-         name: notificationEmail
-         default: '$GERRIT_EVENT_ACCOUNT_EMAIL'
-         description: 'Verification failure of patch $GERRIT_CHANGE_NUMBER to {project} repo'
+          name: notificationEmail
+          default: '$GERRIT_EVENT_ACCOUNT_EMAIL'
+          description: 'Verification failure of patch $GERRIT_CHANGE_NUMBER to {project} repo'
 
     node: 'openolt_deb_onf_agent'
     project-type: pipeline
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index be27a70..aa3e828 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_rcord_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_rcord-unit-test'
+          dependency-jobs: 'verify_rcord-unit-test'
 
 - job-group:
     name: 'publish-rcord-jobs'
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 709aa41..738c0ac 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -21,7 +21,7 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_simpleexampleservice_sonarqube'
       - 'xos-service-upgrade':
-            dependency-jobs: 'verify_simpleexampleservice-unit-test'
+          dependency-jobs: 'verify_simpleexampleservice-unit-test'
 
 - job-group:
     name: 'publish-simpleexampleservice-jobs'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 9d0116c..3a80eca 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -24,7 +24,7 @@
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
       - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index c947e9b..18c0332 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -9,7 +9,7 @@
       - 'verify-voltha-bbsim-jobs':
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-bbsim-jobs':
-            branch-regexp: '{all-branches-regexp}'
+          branch-regexp: '{all-branches-regexp}'
 
 - job-group:
     name: 'verify-voltha-bbsim-jobs'
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index f4b780f..a02f309 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -19,11 +19,11 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-protos_licensed'
-#     - 'verify-sonarqube':
-#         dependency-jobs: 'verify_voltha-protos_tag-collision'
+      #     - 'verify-sonarqube':
+      #         dependency-jobs: 'verify_voltha-protos_tag-collision'
       - 'python-unit-test':
-         dependency-jobs: 'verify_voltha-protos_tag-collision'
-#        dependency-jobs: 'verify_voltha-protos_sonarqube'
+          dependency-jobs: 'verify_voltha-protos_tag-collision'
+#         dependency-jobs: 'verify_voltha-protos_sonarqube'
 
 - job-group:
     name: 'post-merge-voltha-protos-jobs'
diff --git a/jjb/verify/voltha.yaml b/jjb/verify/voltha.yaml
index 7c0da1b..caa8477 100644
--- a/jjb/verify/voltha.yaml
+++ b/jjb/verify/voltha.yaml
@@ -13,9 +13,9 @@
     name: 'verify-voltha-jobs'
     jobs:
       - 'verify-licensed'
-#     - 'verify-sonarqube':
-#         dependency-jobs: 'verify_voltha_licensed'
-#         build-timeout: 20
+      #     - 'verify-sonarqube':
+      #         dependency-jobs: 'verify_voltha_licensed'
+      #         build-timeout: 20
       - 'voltha-unit-test':
           dependency-jobs: 'verify_voltha_licensed'
 #         dependency-jobs: 'verify_voltha_sonarqube'
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
index 88395f9..1314376 100644
--- a/jjb/verify/vsg-hw.yaml
+++ b/jjb/verify/vsg-hw.yaml
@@ -20,4 +20,3 @@
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg-hw_sonarqube'
 
-
diff --git a/jjb/voltha-atest-provisioning.yaml b/jjb/voltha-atest-provisioning.yaml
index 757df3f..7ac4eed 100644
--- a/jjb/voltha-atest-provisioning.yaml
+++ b/jjb/voltha-atest-provisioning.yaml
@@ -51,28 +51,28 @@
           description: 'Name of the repo branch to use'
 
       - string:
-            name: gerritChangeNumber
-            default: '$GERRIT_CHANGE_NUMBER'
-            description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-            name: gerritPatchsetNumber
-            default: '$GERRIT_PATCHSET_NUMBER'
-            description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
       - string:
-            name: adapter
-            default: ''
-            description: 'BLANK for ponsim'
+          name: adapter
+          default: ''
+          description: 'BLANK for ponsim'
       - bool:
-         name: BuildVoltha
-         default: true
-         description: 'Build modified voltha component'
+          name: BuildVoltha
+          default: true
+          description: 'Build modified voltha component'
 
       - bool:
-         name: BuildBbsim
-         default: false
-         description: 'Build modified bbsim component'
+          name: BuildBbsim
+          default: false
+          description: 'Build modified bbsim component'
 
     project-type: pipeline
     concurrent: false
diff --git a/jjb/voltha-automated-build.yaml b/jjb/voltha-automated-build.yaml
index 3150c13..ec477d5 100644
--- a/jjb/voltha-automated-build.yaml
+++ b/jjb/voltha-automated-build.yaml
@@ -16,7 +16,7 @@
       Created by {id} job-template from ci-management/jjb/voltha-automated-build.yaml
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H 2 * * *
 
@@ -32,19 +32,19 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'onf-build'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'onf-build'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
     project-type: pipeline
     concurrent: true
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 3ff9d5f..f7e5716 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -7,11 +7,11 @@
     project-name: '{name}'
 
     jobs:
-    - 'voltha-periodic-test':
+      - 'voltha-periodic-test':
           name: 'voltha-system-tests'
           pipeline: 'voltha-go-tests.groovy'
           default-image-tag: 'voltha-2.1'
-    - 'voltha-periodic-test':
+      - 'voltha-periodic-test':
           name: 'voltha-system-tests-master'
           pipeline: 'voltha-go-tests.groovy'
           default-image-tag: 'master'
@@ -47,9 +47,9 @@
           description: 'Number of onus per pon port'
 
       - string:
-         name: emulationMode
-         default: '--set emulation_mode=both'
-         description: 'Emulation for BBSIM (both|aaa)'
+          name: emulationMode
+          default: '--set emulation_mode=both'
+          description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
           name: testTimeout
@@ -72,7 +72,7 @@
     dsl: !include-raw-escape: pipeline/{pipeline}
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H/30 * * * *
 
@@ -107,24 +107,24 @@
           description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: '$GERRIT_BRANCH'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: '$GERRIT_BRANCH'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: gerritProject
-         default: '$GERRIT_PROJECT'
-         description: 'Name of the Gerrit project'
+          name: gerritProject
+          default: '$GERRIT_PROJECT'
+          description: 'Name of the Gerrit project'
 
       - string:
-         name: gerritChangeNumber
-         default: '$GERRIT_CHANGE_NUMBER'
-         description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-         name: gerritPatchsetNumber
-         default: '$GERRIT_PATCHSET_NUMBER'
-         description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
       - string:
           name: numOnus
@@ -132,9 +132,9 @@
           description: 'Number of onus per pon port'
 
       - string:
-         name: emulationMode
-         default: '--set emulation_mode=both'
-         description: 'Emulation for BBSIM (both|aaa)'
+          name: emulationMode
+          default: '--set emulation_mode=both'
+          description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
           name: testTimeout
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index 140ec77..b8597ab 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -32,34 +32,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: TestDir
-         default: 'xos-scale-tests'
-         description: 'Directory where tests reside'
+          name: TestDir
+          default: 'xos-scale-tests'
+          description: 'Directory where tests reside'
 
       - string:
-         name: TestCommand
-         default: 'robot -d Log -T -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 -v timeout:360s xos-scale-att-workflow.robot'
-         description: 'Exact command to execute the tests including arguments'
+          name: TestCommand
+          default: 'robot -d Log -T -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 -v timeout:360s xos-scale-att-workflow.robot'
+          description: 'Exact command to execute the tests including arguments'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, teo@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, teo@opennetworking.org'
+          description: ''
 
     project-type: pipeline
     concurrent: false
@@ -67,7 +67,7 @@
     dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H 0,12 * * *
 
@@ -91,34 +91,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: TestDir
-         default: 'xos-migration-tests'
-         description: 'Directory where tests reside'
+          name: TestDir
+          default: 'xos-migration-tests'
+          description: 'Directory where tests reside'
 
       - string:
-         name: TestCommand
-         default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
-         description: 'Exact command to execute the tests including arguments'
+          name: TestCommand
+          default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
+          description: 'Exact command to execute the tests including arguments'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
+          description: ''
 
     project-type: pipeline
     concurrent: false
@@ -150,34 +150,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: TestDir
-         default: 'xos-backup-tests'
-         description: 'Directory where tests reside'
+          name: TestDir
+          default: 'xos-backup-tests'
+          description: 'Directory where tests reside'
 
       - string:
-         name: TestCommand
-         default: 'robot -d Log -T xos-backup.robot'
-         description: 'Exact command to execute the tests including arguments'
+          name: TestCommand
+          default: 'robot -d Log -T xos-backup.robot'
+          description: 'Exact command to execute the tests including arguments'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
+          description: ''
 
     project-type: pipeline
     concurrent: false
@@ -209,49 +209,49 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: 'master'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: service
-         default: 'att-workflow-driver'
-         description: 'Name of the service being tested'
+          name: service
+          default: 'att-workflow-driver'
+          description: 'Name of the service being tested'
 
       - string:
-         name: helmChart
-         default: 'workflows/att-workflow'
-         description: 'Directory/name of the service helm-chart'
+          name: helmChart
+          default: 'workflows/att-workflow'
+          description: 'Directory/name of the service helm-chart'
 
       - string:
-         name: TestDir
-         default: 'xos-att-workflow-driver-tests'
-         description: 'Directory where tests reside'
+          name: TestDir
+          default: 'xos-att-workflow-driver-tests'
+          description: 'Directory where tests reside'
 
       - string:
-         name: TestCommand
-         default: 'robot -d Log -T -v server_ip:127.0.0.1 -v server_port:30006 -v cord_kafka:\$CORD_KAFKA_IP ATT_Workflow.robot'
-         description: 'Exact command to execute the tests including arguments'
+          name: TestCommand
+          default: 'robot -d Log -T -v server_ip:127.0.0.1 -v server_port:30006 -v cord_kafka:\$CORD_KAFKA_IP ATT_Workflow.robot'
+          description: 'Exact command to execute the tests including arguments'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, teo@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, teo@opennetworking.org'
+          description: ''
 
       - bool:
-         name: InstallService
-         default: true
-         description: 'Set to true when testing a particular xos-service'
+          name: InstallService
+          default: true
+          description: 'Set to true when testing a particular xos-service'
 
     project-type: pipeline
     concurrent: false
diff --git a/jjb/xos-synchronizer-update.yaml b/jjb/xos-synchronizer-update.yaml
index a395d3c..7b4d519 100644
--- a/jjb/xos-synchronizer-update.yaml
+++ b/jjb/xos-synchronizer-update.yaml
@@ -27,34 +27,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: '$GERRIT_BRANCH'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: '$GERRIT_BRANCH'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: gerritProject
-         default: '$GERRIT_PROJECT'
-         description: 'Name of the Gerrit project'
+          name: gerritProject
+          default: '$GERRIT_PROJECT'
+          description: 'Name of the Gerrit project'
 
       - string:
-         name: gerritChangeNumber
-         default: '$GERRIT_CHANGE_NUMBER'
-         description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-         name: gerritPatchsetNumber
-         default: '$GERRIT_PATCHSET_NUMBER'
-         description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
     project-type: pipeline
     concurrent: true
diff --git a/jjb/xos-upgrade.yaml b/jjb/xos-upgrade.yaml
index 35aba14..a9a9e8e 100644
--- a/jjb/xos-upgrade.yaml
+++ b/jjb/xos-upgrade.yaml
@@ -28,34 +28,34 @@
 
     parameters:
       - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
+          name: executorNode
+          default: 'ubuntu16.04-basebuild-4c-8g'
+          description: 'Name of the Jenkins node to run the job on'
 
       - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
+          name: manifestUrl
+          default: '{gerrit-server-url}/{cord-repo-manifest}'
+          description: 'URL to the repo manifest'
 
       - string:
-         name: manifestBranch
-         default: '$GERRIT_BRANCH'
-         description: 'Name of the repo branch to use'
+          name: manifestBranch
+          default: '$GERRIT_BRANCH'
+          description: 'Name of the repo branch to use'
 
       - string:
-         name: gerritProject
-         default: '$GERRIT_PROJECT'
-         description: 'Name of the Gerrit project'
+          name: gerritProject
+          default: '$GERRIT_PROJECT'
+          description: 'Name of the Gerrit project'
 
       - string:
-         name: gerritChangeNumber
-         default: '$GERRIT_CHANGE_NUMBER'
-         description: 'Changeset number in Gerrit'
+          name: gerritChangeNumber
+          default: '$GERRIT_CHANGE_NUMBER'
+          description: 'Changeset number in Gerrit'
 
       - string:
-         name: gerritPatchsetNumber
-         default: '$GERRIT_PATCHSET_NUMBER'
-         description: 'PatchSet number in Gerrit'
+          name: gerritPatchsetNumber
+          default: '$GERRIT_PATCHSET_NUMBER'
+          description: 'PatchSet number in Gerrit'
 
     project-type: pipeline
     concurrent: true