diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/saml-generator.config b/modules/openstack_project/files/gerrit/acls/stackforge/saml-generator.config
new file mode 100644
index 0000000000..95cef4fc8a
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/saml-generator.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group saml-generator-core
+label-Code-Review = -2..+2 group saml-generator-core
+label-Workflow = -1..+1 group saml-generator-core
+
+[access "refs/tags/*"]
+pushSignedTag = group saml-generator-release
+
+[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 ad6b08bd50..bc0b14e25c 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -1162,6 +1162,9 @@
 - project: stackforge/sahara-guestagent
   description: Guest agent for Sahara project
   acl-config: /home/gerrit2/acls/stackforge/sahara-guestagent.config
+- project: stackforge/saml-generator
+  description: Saml generation tool that generates saml responses for federation testing
+  upstream: https://github.com/rackerlabs/saml-generator.git
 - project: stackforge/satori
   description: Configuration Discovery
 - project: stackforge/solum
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f4501b2d42..500f51c3aa 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1821,6 +1821,14 @@ projects:
       - django_openstack_auth-tarball:
         - django_openstack_auth-pypi-both-upload
 
+  - name: stackforge/saml-generator
+    template:
+      - name: merge-check
+    check:
+      - noop
+    gate:
+      - noop
+
   - name: stackforge/gertty
     template:
       - name: merge-check