diff --git a/gerrit/acls/openstack/marshal.config b/gerrit/acls/openstack/marshal.config
new file mode 100644
index 0000000000..ee8d8d0fac
--- /dev/null
+++ b/gerrit/acls/openstack/marshal.config
@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group marshal-core
+create = group marshal-release
+label-Code-Review = -2..+2 group marshal-core
+label-Workflow = -1..+1 group marshal-core
+
+[access "refs/tags/*"]
+pushSignedTag = group marshal-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 4f9f3b1de0..b878283ebb 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1684,6 +1684,8 @@
   acl-config: /home/gerrit2/acls/openstack/manila.config
 - project: openstack/manila-ui
   description: The UI component for Manila
+- project: openstack/marshal
+  description: Key retrieval agent for OpenStack instances.
 - project: openstack/merlin
   description: Framework for building UIs for OpenStack projects dealing with complex
     input data
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 496c534e19..43f7936ec9 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2241,6 +2241,14 @@
       - pypi-jobs
       - openstack-publish-jobs
 
+- project:
+    name: marshal
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: merlin
     node: 'bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6dab1e37a6..0a0fb53e5e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5466,6 +5466,12 @@ projects:
       - name: publish-to-pypi
       - name: python-jobs
 
+  - name: openstack/marshal
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: check-requirements
+
   - name: openstack/merlin
     template:
       - name: merge-check