diff --git a/gerrit/acls/x/whitebox-tempest-plugin.config b/gerrit/acls/openstack/whitebox-tempest-plugin.config
similarity index 90%
rename from gerrit/acls/x/whitebox-tempest-plugin.config
rename to gerrit/acls/openstack/whitebox-tempest-plugin.config
index ac705ad2bc..ba714a1ce0 100644
--- a/gerrit/acls/x/whitebox-tempest-plugin.config
+++ b/gerrit/acls/openstack/whitebox-tempest-plugin.config
@@ -8,6 +8,7 @@ pushSignedTag = group whitebox-tempest-plugin-core
 
 [receive]
 requireChangeId = true
+requireContributorAgreement = true
 
 [submit]
 mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 52d3363a14..9209800b2f 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -5439,6 +5439,10 @@
   acl-config: /home/gerrit2/acls/openstack/oslo-independent.config
   groups:
     - openstack-doc-tools
+- project: openstack/whitebox-tempest-plugin
+  description: Tempest plugin for whitebox testing. For testing things not exposed
+    through the REST APIs.
+  use-storyboard: true
 - project: openstack/workload-ref-archs
   description: OpenStack tenant-level workload reference architectures.
   groups:
@@ -7851,10 +7855,6 @@
   acl-config: /home/gerrit2/acls/x/vmware-nsx.config
 - project: x/vmware-vspc
   description: Virtual Serial Port Concentrator for VMware instances
-- project: x/whitebox-tempest-plugin
-  description: Tempest plugin for whitebox testing. For testing things not exposed
-    through the REST APIs.
-  use-storyboard: true
 - project: x/wsme
   description: Web Service Made Easy (WSME) simplify the writing of REST web services
     by providing simple yet powerful typing which removes the need to directly manipulate
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 7b8159f3f8..9604b9973d 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1314,6 +1314,7 @@ openstack-qa:
     - openstack/tempest-lib
     - openstack/tempest-plugin-cookiecutter
     - openstack/tempest-stress
+    - openstack/whitebox-tempest-plugin
   branches:
     - master
     - ^stable/.*
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 2102b04c2c..a974c499bf 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -1002,6 +1002,7 @@
           - openstack/watcher-specs
           - openstack/watcher-tempest-plugin
           - openstack/whereto
+          - openstack/whitebox-tempest-plugin
           - openstack/workload-ref-archs
           - openstack/xstatic-angular
           - openstack/xstatic-angular-bootstrap
@@ -1460,7 +1461,6 @@
           - x/vmware-nsx-tempest-plugin
           - x/vmware-nsxlib
           - x/vmware-vspc
-          - x/whitebox-tempest-plugin
           - x/wsme
           - x/xenapi-os-testing
           - x/xstatic-angular-cookies