diff --git a/jjb/onos/onos-buck-gerrit.yaml b/jjb/onos/onos-buck-gerrit.yaml
index eda15b0..d9f983a 100644
--- a/jjb/onos/onos-buck-gerrit.yaml
+++ b/jjb/onos/onos-buck-gerrit.yaml
@@ -5,12 +5,18 @@
     name: onos-buck-gerrit
     project-type: pipeline
     sandbox: false
+    #TODO(BOC): use the build node from the project
+    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/$PROJECT'
+            # git-url: '{git-url}'
+            git-url: '$GIT_URL/$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branch: '$GERRIT_BRANCH'
             #submodule-recursive: '{submodule-recursive}'
diff --git a/jjb/onos/onos.yaml b/jjb/onos/onos.yaml
deleted file mode 100644
index b82251c..0000000
--- a/jjb/onos/onos.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# ONOS Pipeline jobs
-
-- job:
-    name: onos-gerrit
-    project-type: pipeline
-    sandbox: false
-
-    pipeline-scm:
-      script-path: Jenkinsfile
-      scm:
-        - lf-infra-gerrit-scm:
-            git-url: '{git-url}'
-            refspec: '$GERRIT_REFSPEC'
-            branch: '$GERRIT_BRANCH'
-            submodule-recursive: '{submodule-recursive}'
-            choosing-strategy: gerrit
-            jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-#    triggers:
-#      - gerrit:
-#          server-name: '{gerrit-server-name}'
-#          trigger-on: '{obj:gerrit_verify_triggers}'
-#          projects:
-#            - project-compare-type: ANT
-#              project-pattern: '{project}'
-#              branches:
-#                - branch-compare-type: ANT
-#                  branch-pattern: '**/{branch}'
-#              file-paths: '{obj:gerrit_trigger_file_paths}'
-
-- project:
-    name: onos
-    build-timeout: '1800'
-    build-node: 'ubuntu16.04-basebuild-8c-15g'
-    project: 'onos'
-    project-name: 'onos'
-
-    jobs:
-    - 'onos-gerrit'
-
-