diff --git a/docs-site/infra-documents.yaml b/docs-site/infra-documents.yaml
index fa3a73882e..4ed6ce1a07 100644
--- a/docs-site/infra-documents.yaml
+++ b/docs-site/infra-documents.yaml
@@ -3,6 +3,8 @@ documents:
     directory: manual
   - name: Elastic Recheck
     directory: elastic-recheck
+  - name: Grafana Dashboard Builder
+    directory: grafyaml
   - name: Jenkins Job Builder
     directory: jenkins-job-builder
   - name: Nodepool
diff --git a/gerrit/acls/openstack-infra/grafyaml.config b/gerrit/acls/openstack-infra/grafyaml.config
new file mode 100644
index 0000000000..45d7374617
--- /dev/null
+++ b/gerrit/acls/openstack-infra/grafyaml.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group grafyaml-core
+create = group grafyaml-release
+label-Code-Review = -2..+2 group grafyaml-core
+label-Workflow = -1..+1 group grafyaml-core
+
+[access "refs/tags/*"]
+pushSignedTag = group grafyaml-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 4dd323338e..567fb03fdd 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -136,6 +136,12 @@
   description: Simple program to write static config from config-drive
   groups:
     - openstack-ci
+- project: openstack-infra/grafyaml
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Tools to make Grafana dashboards from templates
+  upstream: git://github.com/pabelanger/grafyaml.git
 - project: openstack-infra/groups
   use-storyboard: true
   groups:
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 5334c0201c..3801ad6099 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -494,6 +494,7 @@ openstack-infra:
       - openstack-infra/glean
       - openstack-infra/gitdm
       - openstack-infra/git-review
+      - openstack-infra/grafyaml
       - openstack-infra/groups
       - openstack-infra/groups-static-pages
       - openstack-infra/infra-manual
@@ -755,6 +756,7 @@ openstack-merges:
       - openstack-infra/gerritlib
       - openstack-infra/git-review
       - openstack-infra/gitdm
+      - openstack-infra/grafyaml
       - openstack-infra/groups
       - openstack-infra/jeepyb
       - openstack-infra/jenkins-job-builder
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 7b2016cde1..a88aebcebd 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2318,6 +2318,18 @@
       - pypi-jobs
       - '{name}-infra-docs'
 
+- project:
+    name: grafyaml
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+    doc-publisher-folder: grafyaml
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+      - '{name}-infra-docs'
+
 - project:
     name: groups
     node: 'bare-precise'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 440ea1d832..29cdac9e41 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4044,6 +4044,14 @@ projects:
       - name: python3-jobs
       - name: infra-publish-jobs
 
+  - name: openstack-infra/grafyaml
+    template:
+      - name: merge-check
+      - name: publish-to-pypi
+      - name: python-jobs
+      - name: python3-jobs
+      - name: infra-publish-jobs
+
   - name: openstack-infra/groups
     template:
       - name: merge-check