diff --git a/gerrit/acls/openstack/bifrost.config b/gerrit/acls/openstack/bifrost.config
index d6a7fd3e5d..c389fda6e1 100644
--- a/gerrit/acls/openstack/bifrost.config
+++ b/gerrit/acls/openstack/bifrost.config
@@ -6,6 +6,23 @@ label-Verified = -1..+1 group bifrost-ci
 label-Workflow = -1..+1 group bifrost-core
 label-Workflow = -1..+1 group ironic-core
 
+[access "refs/heads/bugfix/*"]
+abandon = group Change Owner
+abandon = group Project Bootstrappers
+abandon = group ironic-stable-maint
+abandon = group stable-maint-core
+exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
+label-Code-Review = -2..+2 group Project Bootstrappers
+label-Code-Review = -2..+2 group bifrost-core
+label-Code-Review = -2..+2 group ironic-stable-maint
+label-Code-Review = -2..+2 group stable-maint-core
+label-Code-Review = -1..+1 group Registered Users
+label-Workflow = -1..+0 group Change Owner
+label-Workflow = -1..+1 group Project Bootstrappers
+label-Workflow = -1..+1 group bifrost-core
+label-Workflow = -1..+1 group ironic-stable-maint
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/heads/stable/*"]
 abandon = group Change Owner
 abandon = group Project Bootstrappers
diff --git a/gerrit/acls/openstack/ironic-inspector.config b/gerrit/acls/openstack/ironic-inspector.config
index 60257912cc..d3b3129a3b 100644
--- a/gerrit/acls/openstack/ironic-inspector.config
+++ b/gerrit/acls/openstack/ironic-inspector.config
@@ -5,6 +5,21 @@ label-Code-Review = -2..+2 group ironic-inspector-core
 label-Workflow = -1..+1 group ironic-core
 label-Workflow = -1..+1 group ironic-inspector-core
 
+[access "refs/heads/bugfix/*"]
+abandon = group Change Owner
+abandon = group Project Bootstrappers
+abandon = group ironic-stable-maint
+abandon = group stable-maint-core
+exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
+label-Code-Review = -2..+2 group Project Bootstrappers
+label-Code-Review = -2..+2 group ironic-stable-maint
+label-Code-Review = -2..+2 group stable-maint-core
+label-Code-Review = -1..+1 group Registered Users
+label-Workflow = -1..+0 group Change Owner
+label-Workflow = -1..+1 group Project Bootstrappers
+label-Workflow = -1..+1 group ironic-stable-maint
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/heads/stable/*"]
 abandon = group Change Owner
 abandon = group Project Bootstrappers
diff --git a/gerrit/acls/openstack/ironic.config b/gerrit/acls/openstack/ironic.config
index 3a7fb3c96c..af9786b2be 100644
--- a/gerrit/acls/openstack/ironic.config
+++ b/gerrit/acls/openstack/ironic.config
@@ -3,6 +3,21 @@ abandon = group ironic-core
 label-Code-Review = -2..+2 group ironic-core
 label-Workflow = -1..+1 group ironic-core
 
+[access "refs/heads/bugfix/*"]
+abandon = group Change Owner
+abandon = group Project Bootstrappers
+abandon = group ironic-stable-maint
+abandon = group stable-maint-core
+exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
+label-Code-Review = -2..+2 group Project Bootstrappers
+label-Code-Review = -2..+2 group ironic-stable-maint
+label-Code-Review = -2..+2 group stable-maint-core
+label-Code-Review = -1..+1 group Registered Users
+label-Workflow = -1..+0 group Change Owner
+label-Workflow = -1..+1 group Project Bootstrappers
+label-Workflow = -1..+1 group ironic-stable-maint
+label-Workflow = -1..+1 group stable-maint-core
+
 [access "refs/heads/stable/*"]
 abandon = group Change Owner
 abandon = group Project Bootstrappers
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index c24408e275..f31ff8b1df 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -760,6 +760,7 @@ openstack-ironic:
   branches:
     - master
     - ^stable/.*
+    - ^bugfix/.*
 
 openstack-javascript:
   events: