diff --git a/gerrit/acls/openstack/cyborg.config b/gerrit/acls/openstack/cyborg.config
new file mode 100644
index 0000000000..9da8b71725
--- /dev/null
+++ b/gerrit/acls/openstack/cyborg.config
@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group cyborg-core
+create = group cyborg-release
+label-Code-Review = -2..+2 group cyborg-core
+label-Workflow = -1..+1 group cyborg-core
+
+[access "refs/tags/*"]
+pushSignedTag = group cyborg-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/acls/openstack/nomad.config b/gerrit/acls/openstack/nomad.config
deleted file mode 100644
index ed69de02f6..0000000000
--- a/gerrit/acls/openstack/nomad.config
+++ /dev/null
@@ -1,15 +0,0 @@
-[access "refs/heads/*"]
-abandon = group nomad-core
-create = group nomad-release
-label-Code-Review = -2..+2 group nomad-core
-label-Workflow = -1..+1 group nomad-core
-
-[access "refs/tags/*"]
-pushSignedTag = group nomad-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index fb7252e6f0..1a6fe9d5d4 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1555,6 +1555,8 @@
   acl-config: /home/gerrit2/acls/openstack/cue.config
 - project: openstack/cursive
   description: Library for validation of digital signatures.
+- project: openstack/cyborg
+  description: Acceleration Management
 - project: openstack/daisycloud-core
   description: The core API implementation for Daisycloud OpenStack installer.
 - project: openstack/dash-stack
@@ -5122,8 +5124,6 @@
 - project: openstack/nimble-specs
   description: Baremetal Compute (Nimble) Specifications
   acl-config: /home/gerrit2/acls/openstack/nimble.config
-- project: openstack/nomad
-  description: Distributed Acceleration Management
 - project: openstack/nova
   description: OpenStack Compute (Nova)
   options:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6cd5d4d133..ef3ef96fea 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1474,6 +1474,13 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: cyborg
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: deb-alembic
 
@@ -7888,12 +7895,6 @@
           suffix: '-nv'
           branch-override: 'default'
 
-- project:
-    name: nomad
-
-    jobs:
-      - python-jobs
-
 - project:
     name: nose-html-output
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5e750d13ab..8c13242ae1 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6603,6 +6603,12 @@ projects:
       - name: publish-to-pypi
       - name: check-requirements
 
+  - name: openstack/cyborg
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: check-requirements
+
   - name: openstack/daisycloud-core
     template:
       - name: merge-check
@@ -12420,12 +12426,6 @@ projects:
     gate:
       - gate-nimble-specs-python27-ubuntu-xenial
 
-  - name: openstack/nomad
-    template:
-      - name: merge-check
-      - name: python-jobs
-      - name: check-requirements
-
   - name: openstack/nova
     template:
       - name: merge-check