diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 4cc23953db..67557a9d6f 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -506,6 +506,7 @@ solum:
       - stackforge/solum
       - stackforge/python-solumclient
       - stackforge/solum-dashboard
+      - stackforge/solum-infra-guestagent
       - stackforge/solum-specs
     branches:
       - master
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/solum-infra-guestagent.config b/modules/openstack_project/files/gerrit/acls/stackforge/solum-infra-guestagent.config
new file mode 100644
index 0000000000..0c28e040ec
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/solum-infra-guestagent.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group solum-core
+label-Code-Review = -2..+2 group solum-core
+label-Workflow = -1..+1 group solum-core
+
+[access "refs/tags/*"]
+pushSignedTag = group solum-ptl
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index bad11e5b5f..d2652477cc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2674,6 +2674,16 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: solum-infra-guestagent
+    github-org: stackforge
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: heat-translator
     github-org: stackforge
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 8a90b4149a..13ca93de41 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -1029,6 +1029,9 @@
 - project: stackforge/solum-dashboard
   description: 'Horizon plugin for Solum. See: https://wiki.openstack.org/wiki/Solum'
   upstream: https://github.com/asalkeld/solum-horizon.git
+- project: stackforge/solum-infra-guestagent
+  description: 'Guest agent for Solum. See: https://wiki.openstack.org/wiki/Solum'
+  upstream: git://github.com/julienvey/solum-guestagent.git
 - project: stackforge/solum-specs
   description: 'Solum Design Specifications'
   upstream: git://github.com/rackerlabs/solum-specs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 3fe9b9332e..6eb1b42753 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4486,6 +4486,18 @@ projects:
     gate:
       - noop
 
+  - name: stackforge/solum-infra-guestagent
+    template:
+      - name: python-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+    check:
+      - gate-solum-infra-guestagent-python33
+      - gate-solum-infra-guestagent-pypy
+    gate:
+      - gate-solum-infra-guestagent-python33
+      - gate-solum-infra-guestagent-pypy
+
   - name: stackforge/rally
     template:
       - name: check-requirements