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'
 
-