diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index eabf10a901..4f293edfa8 100755
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -144,6 +144,7 @@ channels:
   - name: openstack-iotronic
   - name: openstack-ironic
   - name: openstack-javascript
+  - name: openstack-jjb
   - name: openstack-karbor
   - name: openstack-keystone
   - name: openstack-kiloeyes
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 7dabfd34b7..85db005f22 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -939,7 +939,6 @@ openstack-infra:
     - openstack-infra/infra-specs
     - openstack-infra/irc-meetings
     - openstack-infra/jeepyb
-    - openstack-infra/jenkins-job-builder
     - openstack-infra/lodgeit
     - openstack-infra/log_processor
     - openstack-infra/logstash-filters
@@ -1081,7 +1080,6 @@ openstack-infra:
   branches:
     - master
     - debian/sid #zuul-packaging repo
-    - feature/2.0.x #jenkins-job-builder repo
     - feature/development #askbot-theme repo
     - feature/openid #openstackid repo
     - feature/gearman-zk-shim # nodepool
@@ -1170,6 +1168,17 @@ openstack-javascript:
   branches:
     - master
 
+openstack-jjb:
+  events:
+    - patchset-created
+    - change-merged
+    - x-vrif-minus-2
+  projects:
+    - openstack-infra/jenkins-job-builder
+  branches:
+    - master
+    - stable/1.6
+
 openstack-karbor:
   events:
     - patchset-created