diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index c901db2a4e..c138cb4057 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -529,6 +529,18 @@ storyboard:
     branches:
       - master
 
+surveil:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/surveil
+      - stackforge/python-surveilclient
+      - stackforge/surveil-specs
+    branches:
+      - master
+
 milk-dev:
     events:
       - patchset-created
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-surveilclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-surveilclient.config
new file mode 100644
index 0000000000..ceb62160de
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/python-surveilclient.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group surveil-core
+        label-Workflow = -1..+1 group surveil-core
+        abandon = group surveil-core
+[access "refs/tags/*"]
+        pushSignedTag = group surveil-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/surveil-specs.config b/modules/openstack_project/files/gerrit/acls/stackforge/surveil-specs.config
new file mode 100644
index 0000000000..ceb62160de
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/surveil-specs.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group surveil-core
+        label-Workflow = -1..+1 group surveil-core
+        abandon = group surveil-core
+[access "refs/tags/*"]
+        pushSignedTag = group surveil-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/surveil.config b/modules/openstack_project/files/gerrit/acls/stackforge/surveil.config
new file mode 100644
index 0000000000..ceb62160de
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/surveil.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group surveil-core
+        label-Workflow = -1..+1 group surveil-core
+        abandon = group surveil-core
+[access "refs/tags/*"]
+        pushSignedTag = group surveil-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 2d1eb4c42f..3dbec24936 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -981,6 +981,7 @@
 - project: stackforge/python-solumclient
   description: 'Client library to Solum API. See: https://wiki.openstack.org/wiki/Solum'
   upstream: https://github.com/noorul/python-solumclient.git
+- project: stackforge/python-surveilclient
 - project: stackforge/rally
   description: Benchmark System for OpenStack
   upstream: git://github.com/pboris/rally.git
@@ -1023,6 +1024,9 @@
 - project: stackforge/stacktach
   description: Event-based Debugging, Monitoring and Billing solution for OpenStack.
   upstream: https://github.com/rackerlabs/stacktach.git
+- project: stackforge/surveil
+  description: Monitoring as a Service for OpenStack
+- project: stackforge/surveil-specs
 - project: stackforge/swift-ceph-backend
   description: Ceph backend for Swift
   upstream: git://github.com/enovance/swift-ceph-backend.git
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 8b74d14605..ebdddd4d02 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4400,6 +4400,12 @@ projects:
     gate:
       - gate-solum-dashboard-pypy
 
+  - name: stackforge/python-surveilclient
+    check:
+      - noop
+    gate:
+      - noop
+
   - name: stackforge/rally
     template:
       - name: check-requirements
@@ -4666,6 +4672,18 @@ projects:
       - gate-stacktach-pep8
       - gate-stacktach-python27
 
+  - name: stackforge/surveil
+    check:
+      - noop
+    gate:
+      - noop
+
+  - name: stackforge/surveil-specs
+    check:
+      - noop
+    gate:
+      - noop
+
   - name: stackforge/xenapi-os-testing
     check:
       - noop