diff --git a/gerrit/acls/openstack/ansible-role-atos-hsm.config b/gerrit/acls/openstack/ansible-role-atos-hsm.config
deleted file mode 100644
index 03b4d614f3..0000000000
--- a/gerrit/acls/openstack/ansible-role-atos-hsm.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group ansible-role-atos-hsm-core
-label-Code-Review = -2..+2 group ansible-role-atos-hsm-core
-label-Workflow = -1..+1 group ansible-role-atos-hsm-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/ansible-role-thales-hsm.config b/gerrit/acls/openstack/ansible-role-thales-hsm.config
deleted file mode 100644
index 3db16d71fa..0000000000
--- a/gerrit/acls/openstack/ansible-role-thales-hsm.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group ansible-role-thales-hsm-core
-label-Code-Review = -2..+2 group ansible-role-thales-hsm-core
-label-Workflow = -1..+1 group ansible-role-thales-hsm-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index ba4a56c0dc..646e8e069f 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -833,6 +833,10 @@
 - project: openstack/ansible-role-atos-hsm
   description: Ansible role to manage ATOS Hardware Security Module (HSM) client
     software
+  use-storyboard: true
+  groups:
+    - barbican
+  acl-config: /home/gerrit2/acls/openstack/barbican.config
 - project: openstack/ansible-role-chrony
   description: Ansible role to manage chrony
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
@@ -874,7 +878,7 @@
   use-storyboard: true
   groups:
     - barbican
-  acl-config: /home/gerrit2/acls/openstack/barbican-specs.config
+  acl-config: /home/gerrit2/acls/openstack/barbican.config
 - project: openstack/ansible-role-openstack-operations
   description: Ansible role to perform common tasks to manage OpenStack clouds
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
@@ -910,6 +914,10 @@
 - project: openstack/ansible-role-thales-hsm
   description: Ansible role to manage Thales Hardware Security Module (HSM) client
     software
+  use-storyboard: true
+  groups:
+    - barbican
+  acl-config: /home/gerrit2/acls/openstack/barbican.config
 - project: openstack/ansible-role-tripleo-aodh
   description: RETIRED, TripleO related Ansible role for Aodh
   acl-config: /home/gerrit2/acls/openstack/retired.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 7b8ec69233..2e0cb51406 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -223,12 +223,10 @@ openstack-ansible:
     - ^openstack/openstack-ansible.*
     - openstack/ansible-config_template
     - openstack/ansible-hardening
-    - openstack/ansible-role-atos-hsm
     - openstack/ansible-role-python_venv_build
     - openstack/ansible-role-systemd_mount
     - openstack/ansible-role-systemd_networkd
     - openstack/ansible-role-systemd_service
-    - openstack/ansible-role-thales-hsm
     - openstack/ansible-role-uwsgi
     - x/monitorstack
   branches: