diff --git a/jjb/onos/onos-buck-gerrit.yaml b/jjb/onos/onos-buck-gerrit.yaml
index 8d7b77e..8ee79cd 100644
--- a/jjb/onos/onos-buck-gerrit.yaml
+++ b/jjb/onos/onos-buck-gerrit.yaml
@@ -20,15 +20,13 @@
     #FIXME figure out how to run this on a slave
     #node: 'ubuntu16.04-basebuild-8c-15g'
     #TODO(BOC) Need build discarding
-    #TODO(BOC) Need build parameters
     concurrent: true
 
     pipeline-scm:
       script-path: tools/build/jenkins/onos-buck-gerrit
       scm:
         - lf-infra-gerrit-scm:
-            # git-url: '{git-url}'
-            git-url: '$GIT_URL/$GERRIT_PROJECT'
+            git-url: '{git-url}'
             refspec: '$GERRIT_REFSPEC'
             branch: '$GERRIT_BRANCH'
             #submodule-recursive: '{submodule-recursive}'
@@ -67,6 +65,8 @@
     project-name: 'onos'
 
     jobs:
-    - 'onos-buck-gerrit'
+    - 'onos-buck-gerrit':
+       templates:
+          - basebuild