diff --git a/jjb/voltha-gerrit.yaml b/jjb/voltha-gerrit.yaml
index 042af1a..d80021a 100644
--- a/jjb/voltha-gerrit.yaml
+++ b/jjb/voltha-gerrit.yaml
@@ -36,13 +36,11 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     scm:
-      - lf-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
+      - cord-infra-gerrit-repo-scm:
+          manifest-url: '{gerrit-server-url}/{cord-repo-manifest}'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
-          choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          destination-dir: 'cord'
+
 
     node: 'ubuntu16.04-basebuild-1c-2g'
     project-type: freestyle
@@ -51,14 +49,7 @@
     builders:
       - shell: |
           #/usr/bin/env bash
-
-          # download changeset
-          mkdir cord && cd cord/
-          repo init -u https://gerrit.opencord.org/manifest -b $GERRIT_BRANCH
-          repo sync
-          repo download $GERRIT_PROJECT $GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER
-
-          cd incubator/voltha
+          cd cord/incubator/voltha
           rm -rf venv-linux
           . ./env.sh
           make utest-with-coverage