diff --git a/jjb/siab-e2e.yaml b/jjb/siab-e2e.yaml
index 6eb554c..76ccbb4 100644
--- a/jjb/siab-e2e.yaml
+++ b/jjb/siab-e2e.yaml
@@ -4,12 +4,35 @@
     project: '{name}'
     build-node: 'qct-pod4-node2'
     git-url: 'https://gerrit.opencord.org'
-    refspec: '+refs/heads/master:refs/remotes/origin/master'
     branch: 'master'
     timed-trigger: '{every-four-hours}'
     jobs:
       - 'siab-e2e-att':
 
+- scm:
+    name: automation-tools
+    scm:
+      - git:
+          url: '{git-url}/automation-tools'
+          branches:
+            - '{branch}'
+          basedir: 'cord/automation-tools'
+
+- scm:
+    name: helm-charts
+    scm:
+      - git:
+          url: '{git-url}/helm-charts'
+          branches:
+            - '{branch}'
+          basedir: 'cord/helm-charts'
+
+- scm:
+    name: tools-and-charts
+    scm:
+      - automation-tools
+      - helm-charts
+
 - job-template:
     id: 'siab-e2e-att'
     name: 'verify_automation-tools_{project}'
@@ -30,23 +53,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     scm:
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/automation-tools'
-          refspec: '{refspec}'
-          branch: '{branch}'
-          submodule-recursive: 'false'
-          choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: 'cord/automation-tools'
-
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/helm-charts'
-          refspec: '{refspec}'
-          branch: '{branch}'
-          submodule-recursive: 'false'
-          choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: 'cord/helm-charts'
+      - tools-and-charts
 
     node: '{build-node}'
     project-type: freestyle