diff --git a/gerrit/acls/openstack/openstackdocstheme.config b/gerrit/acls/openstack/openstackdocstheme.config
deleted file mode 100644
index ca8b114abf..0000000000
--- a/gerrit/acls/openstack/openstackdocstheme.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group openstack-doc-core
-label-Code-Review = -2..+2 group openstack-doc-core
-label-Workflow = -1..+1 group openstack-doc-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/whereto.config b/gerrit/acls/openstack/whereto.config
deleted file mode 100644
index cb5ce38891..0000000000
--- a/gerrit/acls/openstack/whereto.config
+++ /dev/null
@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group whereto-core
-label-Code-Review = -2..+2 group whereto-core
-label-Workflow = -1..+1 group whereto-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index e6b2651679..add8beef05 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -4156,7 +4156,7 @@
   acl-config: /home/gerrit2/acls/openstack/openstack-chef.config
 - project: openstack/openstack-doc-tools
   description: Tools used by OpenStack Documentation
-  acl-config: /home/gerrit2/acls/openstack/openstackdocstheme.config
+  acl-config: /home/gerrit2/acls/openstack/oslo-independent.config
 - project: openstack/openstack-health
   description: OpenStack Health Dashboard
 - project: openstack/openstack-helm
@@ -4223,9 +4223,10 @@
   groups:
     - openstackclient
 - project: openstack/openstackdocstheme
+  description: Sphinx theme for RST-sourced documentation published to docs.openstack.org
+  acl-config: /home/gerrit2/acls/openstack/oslo-independent.config
   groups:
     - openstack-doc-tools
-  description: Sphinx theme for RST-sourced documentation published to docs.openstack.org
 - project: openstack/openstacksdk
   description: Unified SDK for OpenStack
   use-storyboard: true
@@ -5445,9 +5446,9 @@
   acl-config: /home/gerrit2/acls/openstack/watcher.config
 - project: openstack/whereto
   description: Test Apache redirect rules.
+  acl-config: /home/gerrit2/acls/openstack/oslo-independent.config
   groups:
-    - documentation
-  use-storyboard: true
+    - openstack-doc-tools
 - project: openstack/workload-ref-archs
   description: OpenStack tenant-level workload reference architectures.
   groups: