diff --git a/jjb/onf-macros.yaml b/jjb/onf-macros.yaml
index f4e3645..956d99b 100644
--- a/jjb/onf-macros.yaml
+++ b/jjb/onf-macros.yaml
@@ -132,9 +132,9 @@
           credentials-id: '{jenkins-ssh-credential}'
           url: '{git-url}'
           refspec: '{refspec}'
+          honor-refspec: true
           branches:
             - 'refs/heads/{branch}'
-          skip-tag: true
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'
diff --git a/jjb/onos/onos-verify.yaml b/jjb/onos/onos-verify.yaml
index 07b2e76..8bdf73e 100644
--- a/jjb/onos/onos-verify.yaml
+++ b/jjb/onos/onos-verify.yaml
@@ -43,7 +43,7 @@
     concurrent: true
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -52,6 +52,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
     triggers:
       - gerrit:
@@ -80,7 +81,7 @@
     concurrent: true
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -89,6 +90,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
     triggers:
       - timed: '@weekly'
@@ -128,7 +130,7 @@
     concurrent: true
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -137,6 +139,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
     triggers:
       - timed: '@weekly'
@@ -191,7 +194,7 @@
          description: 'Version of ONOS to reset tree to'
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -200,6 +203,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
 - docker_build_boiler_plate: &docker_build_boiler_plate
     name: release_build_boiler_plate
@@ -219,7 +223,7 @@
          description: 'Tag of ONOS to build'
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -228,6 +232,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
 - job-template:
     #default name is global
@@ -319,7 +324,7 @@
          description: 'Version of ONOS Yang tools to reset tree to afterwards'
 
     scm:
-      - lf-infra-gerrit-scm:
+      - onf-infra-gerrit-scm:
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
@@ -328,6 +333,7 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: "$WORKSPACE"
 
     builders:
       - lf-provide-maven-settings: