diff --git a/gerrit/acls/openstack/giftwrap.config b/gerrit/acls/openstack/giftwrap.config
new file mode 100644
index 0000000000..aa237b30ca
--- /dev/null
+++ b/gerrit/acls/openstack/giftwrap.config
@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group giftwrap-core
+create = group giftwrap-release
+label-Code-Review = -2..+2 group giftwrap-core
+label-Workflow = -1..+1 group giftwrap-core
+
+[access "refs/tags/*"]
+pushSignedTag = group giftwrap-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index a7634584c6..4b29a77295 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1769,6 +1769,11 @@
 - project: openstack/gertty
   description: Console interface to Gerrit Code Review
   use-storyboard: true
+- project: openstack/giftwrap
+  description: A tool for creating bespoke system-native OpenStack artifacts
+  groups:
+    - python-giftwrap
+  upstream: https://github.com/blueboxgroup/giftwrap.git
 - project: openstack/git-repo-manifests
   description: Clone multiple OpenStack repos as a group
 - project: openstack/git-upstream
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 2197d78a6f..3697443cae 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1701,6 +1701,15 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: giftwrap
+    node: bare-trusty
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: git-restack
     node: bare-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 183f01aff8..2ecfb0d587 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5558,6 +5558,13 @@ projects:
       - name: noop-jobs
       - name: publish-to-pypi
 
+  - name: openstack/giftwrap
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: publish-to-pypi
+      - name: python3-jobs
+
   - name: openstack/git-repo-manifests
     template:
       - name: merge-check