diff --git a/gerrit/acls/stackforge/anchor.config b/gerrit/acls/openstack/anchor.config
similarity index 100%
rename from gerrit/acls/stackforge/anchor.config
rename to gerrit/acls/openstack/anchor.config
diff --git a/gerrit/acls/stackforge/bandit.config b/gerrit/acls/openstack/bandit.config
similarity index 100%
rename from gerrit/acls/stackforge/bandit.config
rename to gerrit/acls/openstack/bandit.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index c8ea249eb8..bb1b639af4 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -693,6 +693,9 @@
   groups:
     - openstack-ci
   description: Zuul packaging
+- project: openstack/anchor
+  description: An Ephemeral PKI system that can act as a trust anchor for OpenStack
+    PKI operations
 - project: openstack/aodh
   description: OpenStack Telemetry (Ceilometer) Alarming
 - project: openstack/api-site
@@ -709,6 +712,8 @@
   description: Friendly state machines for python.
   groups:
     - oslo
+- project: openstack/bandit
+  description: Python AST-based static analyzer from OpenStack Security Group
 - project: openstack/barbican
   description: Barbican is a ReST API designed for the secure storage, provisioning
     and management of secrets, including in OpenStack environments.
@@ -1622,9 +1627,6 @@
   acl-config: /home/gerrit2/acls/stackforge/akanda.config
   groups:
     - akanda
-- project: stackforge/anchor
-  description: An Ephemeral PKI system that can act as a trust anchor for OpenStack
-    PKI operations
 - project: stackforge/anvil
   description: A set of python scripts and utilities to forge raw OpenStack into a
     productive tool!
@@ -1632,8 +1634,6 @@
   description: Application catalog for OpenStack
 - project: stackforge/aviator
   description: An OpenStack client library for Ruby
-- project: stackforge/bandit
-  description: Python AST-based static analyzer from OpenStack Security Group
 - project: stackforge/bansho
   description: Web interface for Surveil
   acl-config: /home/gerrit2/acls/stackforge/surveil.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 77bbe6d34c..593e78793d 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1241,10 +1241,10 @@ openstack-security:
       - change-merged
       - x-vrif-minus-2
     projects:
+      - openstack/anchor
+      - openstack/bandit
       - openstack/security-doc
       - openstack/security-specs
-      - stackforge/anchor
-      - stackforge/bandit
     branches:
       - master
 
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index eec311a353..cca56859e0 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1989,6 +1989,16 @@
 # Section: Other OpenStack projects
 ########################################################################
 
+- project:
+    name: anchor
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - 'gate-{name}-tox-{envlist}':
+          envlist: bandit
+
 - project:
     name: api-wg
     node: 'bare-precise || bare-trusty'
@@ -1996,6 +2006,15 @@
     jobs:
       - specs-jobs
 
+- project:
+    name: bandit
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: castellan
     node: 'bare-precise || bare-trusty'
@@ -4256,16 +4275,6 @@
           branch-designator: ''
           branch-override: default
 
-- project:
-    name: anchor
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - python-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: bandit
-
 - project:
     name: anvil
     node: 'bare-precise || bare-trusty'
@@ -4291,15 +4300,6 @@
     jobs:
       - 'gate-aviator-tests'
 
-- project:
-    name: bandit
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - python-jobs
-      - pypi-jobs
-
 - project:
     name: billingstack
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 533874765d..89f698d099 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3483,6 +3483,19 @@ projects:
 # Section: Other OpenStack projects
 ########################################################################
 
+
+  - name: openstack/anchor
+    template:
+      - name: merge-check
+    check:
+      - gate-anchor-pep8
+      - gate-anchor-python27
+    gate:
+      - gate-anchor-pep8
+      - gate-anchor-python27
+    experimental:
+      - gate-anchor-tox-bandit
+
   - name: openstack/api-wg
     template:
       - name: merge-check
@@ -3492,6 +3505,19 @@ projects:
     gate:
       - gate-api-wg-python27
 
+  - name: openstack/bandit
+    template:
+      - name: merge-check
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+    check:
+      - gate-bandit-pep8
+      - gate-bandit-python27
+    gate:
+      - gate-bandit-pep8
+      - gate-bandit-python27
+
   - name: openstack/castellan
     template:
       - name: merge-check
@@ -5926,18 +5952,6 @@ projects:
       - gate-akanda-rug-python27
       - gate-functional-dsvm-akanda
 
-  - name: stackforge/anchor
-    template:
-      - name: merge-check
-    check:
-      - gate-anchor-pep8
-      - gate-anchor-python27
-    gate:
-      - gate-anchor-pep8
-      - gate-anchor-python27
-    experimental:
-      - gate-anchor-tox-bandit
-
   - name: stackforge/anvil
     template:
       - name: merge-check
@@ -5964,19 +5978,6 @@ projects:
     gate:
       - gate-aviator-tests
 
-  - name: stackforge/bandit
-    template:
-      - name: merge-check
-      - name: python3-jobs
-      - name: check-requirements
-      - name: publish-to-pypi
-    check:
-      - gate-bandit-pep8
-      - gate-bandit-python27
-    gate:
-      - gate-bandit-pep8
-      - gate-bandit-python27
-
   - name: stackforge/bansho
     template:
       - name: merge-check