diff --git a/jjb/build_openolt_deb.yaml b/jjb/build_openolt_deb.yaml
new file mode 100644
index 0000000..1a69c4e
--- /dev/null
+++ b/jjb/build_openolt_deb.yaml
@@ -0,0 +1,49 @@
+---
+# build_openolt_deb
+
+- project:
+    name: build_openolt_deb
+
+    project-name: '{name}'
+
+    jobs:
+      - 'build_openolt_deb'
+
+- job-template:
+    id: build_openolt_deb
+    name: 'build_openolt_deb'
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/olt-voltha.yaml
+
+    triggers:
+      - cord-infra-gerrit-trigger-merge:
+          gerrit-server-name: '{gerrit-server-name}'
+          project-regexp: '^(openolt)$'
+          branch-regexp: '{modern-branches-regexp}'
+          file-include-regexp: '{doc-files-regexp}'
+          dependency-jobs: '{dependency-jobs}'
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    parameters:
+      - string:
+         name: notificationEmail
+         default: 'shad@opennetworking.org'
+         description: ''
+
+    node: 'openolt_deb_onf_agent'
+
+    project-type: pipeline
+    concurrent: true
+
+    pipeline-scm:
+      script-path: 'Jenkinsfile'
+      scm:
+        - git:
+           url: '{gerrit-server-url}/openolt'
+           branches:
+             - 'master'
diff --git a/jjb/olt-voltha.yaml b/jjb/olt-voltha.yaml
deleted file mode 100644
index 70b6b19..0000000
--- a/jjb/olt-voltha.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# olt-voltha-build
-
-- project:
-    name: olt-voltha
-
-    project-name: '{name}'
-
-    jobs:
-      - 'olt-voltha-build'
-
-- job-template:
-    id: olt-voltha-build
-    name: 'olt_voltha_automated_build'
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/olt-voltha.yaml
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    parameters:
-      - string:
-         name: notificationEmail
-         default: 'luca@opennetworking.org, shad@opennetworking.org'
-         description: ''
-
-    node: 'olt-agent-onf'
-
-    project-type: pipeline
-    concurrent: true
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile'
-      scm:
-        - git:
-           url: '{gerrit-server-url}/openolt'
-           branches:
-             - 'master'