diff --git a/gerrit/acls/opendev/infra-specs.config b/gerrit/acls/opendev/infra-specs.config
index e30921c1a2..5a45730c1d 100644
--- a/gerrit/acls/opendev/infra-specs.config
+++ b/gerrit/acls/opendev/infra-specs.config
@@ -5,7 +5,7 @@ label-Rollcall-Vote = -1..+1 group infra-council
 label-Workflow = -1..+1 group infra-ptl
 
 [label "Code-Review"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -2 Unused -2
@@ -15,7 +15,7 @@ value = +1 Looks good to me
 value = +2 Unused +2
 
 [label "Rollcall-Vote"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = AnyWithBlock
 value = -2 Veto
diff --git a/gerrit/acls/openinfra/transparency-policy.config b/gerrit/acls/openinfra/transparency-policy.config
index 54c70b516e..b985ef7256 100644
--- a/gerrit/acls/openinfra/transparency-policy.config
+++ b/gerrit/acls/openinfra/transparency-policy.config
@@ -12,7 +12,7 @@ label-Workflow = -1..+1 group transparency-committee-chair
 createSignedTag = group transparency-committee-chair
 
 [label "Code-Review"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -2 Unused -2
@@ -22,7 +22,7 @@ value = +1 Looks good to me
 value = +2 Unused +2
 
 [label "Rollcall-Vote"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -1 No
diff --git a/gerrit/acls/openstack/automaton.config b/gerrit/acls/openstack/automaton.config
index 8930759219..da633d0a5d 100644
--- a/gerrit/acls/openstack/automaton.config
+++ b/gerrit/acls/openstack/automaton.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/blazar.config b/gerrit/acls/openstack/blazar.config
index 8dbc72a01b..e35b71fcd6 100644
--- a/gerrit/acls/openstack/blazar.config
+++ b/gerrit/acls/openstack/blazar.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group blazar-core
 label-Workflow = -1..+1 group blazar-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/castellan.config b/gerrit/acls/openstack/castellan.config
index 480b838d85..c7139a78a9 100644
--- a/gerrit/acls/openstack/castellan.config
+++ b/gerrit/acls/openstack/castellan.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/charm-ceph.config b/gerrit/acls/openstack/charm-ceph.config
index 8fa8aed9da..05e4617480 100644
--- a/gerrit/acls/openstack/charm-ceph.config
+++ b/gerrit/acls/openstack/charm-ceph.config
@@ -18,10 +18,7 @@ label-Workflow = -1..+1 group charms-core
 createSignedTag = group charms-release
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/charm-trilio.config b/gerrit/acls/openstack/charm-trilio.config
index 3b24550793..432e1fef7c 100644
--- a/gerrit/acls/openstack/charm-trilio.config
+++ b/gerrit/acls/openstack/charm-trilio.config
@@ -18,10 +18,7 @@ label-Workflow = -1..+1 group charms-trilio-core
 createSignedTag = group charms-release
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/charm-vault.config b/gerrit/acls/openstack/charm-vault.config
index 1182bc2927..b8e27b3c10 100644
--- a/gerrit/acls/openstack/charm-vault.config
+++ b/gerrit/acls/openstack/charm-vault.config
@@ -18,10 +18,7 @@ label-Workflow = -1..+1 group charms-vault-core
 createSignedTag = group charms-release
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/charm.config b/gerrit/acls/openstack/charm.config
index 0cf1568a12..b0323202ed 100644
--- a/gerrit/acls/openstack/charm.config
+++ b/gerrit/acls/openstack/charm.config
@@ -14,10 +14,7 @@ label-Workflow = -1..+1 group charms-core
 createSignedTag = group charms-release
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/cinder-tempest-plugin.config b/gerrit/acls/openstack/cinder-tempest-plugin.config
index a88e4e03c5..85687b4659 100644
--- a/gerrit/acls/openstack/cinder-tempest-plugin.config
+++ b/gerrit/acls/openstack/cinder-tempest-plugin.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group cinder-tempest-plugin-core
 label-Workflow = -1..+1 group cinder-tempest-plugin-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/cinder.config b/gerrit/acls/openstack/cinder.config
index 634c482538..f17b32149a 100644
--- a/gerrit/acls/openstack/cinder.config
+++ b/gerrit/acls/openstack/cinder.config
@@ -23,10 +23,7 @@ label-Workflow = -1..+1 group cinder-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/cloudkitty-dashboard.config b/gerrit/acls/openstack/cloudkitty-dashboard.config
index 3ae6751e07..f6f3b3cf64 100644
--- a/gerrit/acls/openstack/cloudkitty-dashboard.config
+++ b/gerrit/acls/openstack/cloudkitty-dashboard.config
@@ -12,10 +12,7 @@ label-Workflow = -1..+1 group cloudkitty-core
 label-Workflow = -1..+1 group horizon-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/cloudkitty.config b/gerrit/acls/openstack/cloudkitty.config
index 0e322bd593..cbba4338f0 100644
--- a/gerrit/acls/openstack/cloudkitty.config
+++ b/gerrit/acls/openstack/cloudkitty.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group cloudkitty-core
 label-Workflow = -1..+1 group cloudkitty-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/debtcollector.config b/gerrit/acls/openstack/debtcollector.config
index d5a70b4949..ce3ccd2256 100644
--- a/gerrit/acls/openstack/debtcollector.config
+++ b/gerrit/acls/openstack/debtcollector.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/designate-dashboard.config b/gerrit/acls/openstack/designate-dashboard.config
index 9d09021678..4c8e883c1e 100644
--- a/gerrit/acls/openstack/designate-dashboard.config
+++ b/gerrit/acls/openstack/designate-dashboard.config
@@ -30,10 +30,7 @@ label-Workflow = -1..+1 group horizon-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/designate-specs.config b/gerrit/acls/openstack/designate-specs.config
index 3c7c9ed7ab..9bdafa8de5 100644
--- a/gerrit/acls/openstack/designate-specs.config
+++ b/gerrit/acls/openstack/designate-specs.config
@@ -9,10 +9,7 @@ label-Workflow = -1..+1 group designate-core
 toggleWipState = group designate-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/designate-tempest-plugin.config b/gerrit/acls/openstack/designate-tempest-plugin.config
index 2b48e2c079..95e13c0972 100644
--- a/gerrit/acls/openstack/designate-tempest-plugin.config
+++ b/gerrit/acls/openstack/designate-tempest-plugin.config
@@ -10,10 +10,7 @@ label-Workflow = -1..+1 group designate-tempest-plugin-core
 toggleWipState = group designate-tempest-plugin-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/designate.config b/gerrit/acls/openstack/designate.config
index 70b2074b84..a30822398d 100644
--- a/gerrit/acls/openstack/designate.config
+++ b/gerrit/acls/openstack/designate.config
@@ -25,10 +25,7 @@ label-Workflow = -1..+1 group designate-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/devstack.config b/gerrit/acls/openstack/devstack.config
index 083e389e89..52db827777 100644
--- a/gerrit/acls/openstack/devstack.config
+++ b/gerrit/acls/openstack/devstack.config
@@ -9,10 +9,7 @@ label-Verified = -1..+1 group devstack-ci
 label-Workflow = -1..+1 group devstack-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/etcd3gw.config b/gerrit/acls/openstack/etcd3gw.config
index 49b682219d..25e6b5ae2a 100644
--- a/gerrit/acls/openstack/etcd3gw.config
+++ b/gerrit/acls/openstack/etcd3gw.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/futurist.config b/gerrit/acls/openstack/futurist.config
index 5556eb10fa..657717f191 100644
--- a/gerrit/acls/openstack/futurist.config
+++ b/gerrit/acls/openstack/futurist.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/glance-tempest-plugin.config b/gerrit/acls/openstack/glance-tempest-plugin.config
index 703377a725..0d36d10624 100644
--- a/gerrit/acls/openstack/glance-tempest-plugin.config
+++ b/gerrit/acls/openstack/glance-tempest-plugin.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group glance-tempest-plugin-core
 label-Workflow = -1..+1 group glance-tempest-plugin-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/glance.config b/gerrit/acls/openstack/glance.config
index f55fe0ca63..4c186c8349 100644
--- a/gerrit/acls/openstack/glance.config
+++ b/gerrit/acls/openstack/glance.config
@@ -25,7 +25,7 @@ label-Workflow = -1..+1 group glance-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/glance_store.config b/gerrit/acls/openstack/glance_store.config
index 3efe683f07..5f58949a19 100644
--- a/gerrit/acls/openstack/glance_store.config
+++ b/gerrit/acls/openstack/glance_store.config
@@ -28,10 +28,7 @@ label-Workflow = -1..+1 group glance-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/governance.config b/gerrit/acls/openstack/governance.config
index aa67ac2125..8c51558586 100644
--- a/gerrit/acls/openstack/governance.config
+++ b/gerrit/acls/openstack/governance.config
@@ -16,7 +16,7 @@ label-Workflow = -1..+1 group tech-committee-chair
 createSignedTag = group tech-committee-chair
 
 [label "Code-Review"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -2 Unused -2
@@ -26,7 +26,7 @@ value = +1 Looks good to me
 value = +2 Unused +2
 
 [label "Rollcall-Vote"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -1 No
diff --git a/gerrit/acls/openstack/grenade.config b/gerrit/acls/openstack/grenade.config
index 738fbfa48a..6bfe559e3c 100644
--- a/gerrit/acls/openstack/grenade.config
+++ b/gerrit/acls/openstack/grenade.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group greande-core
 label-Workflow = -1..+1 group grenade-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/horizon.config b/gerrit/acls/openstack/horizon.config
index 8f2d263186..5960679af3 100644
--- a/gerrit/acls/openstack/horizon.config
+++ b/gerrit/acls/openstack/horizon.config
@@ -24,10 +24,7 @@ label-Workflow = -1..+1 group horizon-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Release Freeze
diff --git a/gerrit/acls/openstack/ironic.config b/gerrit/acls/openstack/ironic.config
index ebb128c9d4..77c6aac786 100644
--- a/gerrit/acls/openstack/ironic.config
+++ b/gerrit/acls/openstack/ironic.config
@@ -50,10 +50,7 @@ toggleWipState = group stable-maint-core
 createSignedTag = group ironic-release
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -1 Do Not Backport
diff --git a/gerrit/acls/openstack/kayobe.config b/gerrit/acls/openstack/kayobe.config
index 451919152f..72b531ff83 100644
--- a/gerrit/acls/openstack/kayobe.config
+++ b/gerrit/acls/openstack/kayobe.config
@@ -12,7 +12,7 @@ label-Workflow = -1..+1 group kayobe-core
 toggleWipState = group kayobe-core
 
 [label "Backport-Candidate"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
@@ -22,7 +22,7 @@ value = +1 Proposed Backport
 value = +2 Should Backport
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/kolla.config b/gerrit/acls/openstack/kolla.config
index 48a2017f43..2ada656c44 100644
--- a/gerrit/acls/openstack/kolla.config
+++ b/gerrit/acls/openstack/kolla.config
@@ -12,7 +12,7 @@ label-Workflow = -1..+1 group kolla-core
 toggleWipState = group kolla-core
 
 [label "Backport-Candidate"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
@@ -22,7 +22,7 @@ value = +1 Proposed Backport
 value = +2 Should Backport
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/magnum-ui.config b/gerrit/acls/openstack/magnum-ui.config
index 327cb655d5..50b6cbf33f 100644
--- a/gerrit/acls/openstack/magnum-ui.config
+++ b/gerrit/acls/openstack/magnum-ui.config
@@ -9,10 +9,7 @@ label-Code-Review = -2..+2 group magnum-ui-core
 label-Workflow = -1..+1 group magnum-ui-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/magnum.config b/gerrit/acls/openstack/magnum.config
index b9f74a3a80..90b1378294 100644
--- a/gerrit/acls/openstack/magnum.config
+++ b/gerrit/acls/openstack/magnum.config
@@ -9,10 +9,7 @@ label-Code-Review = -2..+2 group magnum-core
 label-Workflow = -1..+1 group magnum-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/monasca-ui.config b/gerrit/acls/openstack/monasca-ui.config
index 10fe6e5ef7..52428157d0 100644
--- a/gerrit/acls/openstack/monasca-ui.config
+++ b/gerrit/acls/openstack/monasca-ui.config
@@ -11,7 +11,7 @@ label-Workflow = -1..+1 group horizon-core
 label-Workflow = -1..+1 group monasca-core
 
 [label "Review-Priority"]
-copyMaxScore = true
+copyCondition = is:MAX
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/monasca.config b/gerrit/acls/openstack/monasca.config
index 461f884e7b..26858603d2 100644
--- a/gerrit/acls/openstack/monasca.config
+++ b/gerrit/acls/openstack/monasca.config
@@ -8,7 +8,7 @@ label-Review-Priority = -1..+2 group monasca-core
 label-Workflow = -1..+1 group monasca-core
 
 [label "Review-Priority"]
-copyMaxScore = true
+copyCondition = is:MAX
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/networking-bagpipe.config b/gerrit/acls/openstack/networking-bagpipe.config
index 99e61a687b..2fad95b24e 100644
--- a/gerrit/acls/openstack/networking-bagpipe.config
+++ b/gerrit/acls/openstack/networking-bagpipe.config
@@ -27,10 +27,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/networking-bgpvpn.config b/gerrit/acls/openstack/networking-bgpvpn.config
index 889778df5c..c41f73de7d 100644
--- a/gerrit/acls/openstack/networking-bgpvpn.config
+++ b/gerrit/acls/openstack/networking-bgpvpn.config
@@ -27,10 +27,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/networking-odl.config b/gerrit/acls/openstack/networking-odl.config
index 0f5d5e364f..e37b3a281c 100644
--- a/gerrit/acls/openstack/networking-odl.config
+++ b/gerrit/acls/openstack/networking-odl.config
@@ -27,10 +27,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/networking-sfc.config b/gerrit/acls/openstack/networking-sfc.config
index b590eacc5b..6af513aadd 100644
--- a/gerrit/acls/openstack/networking-sfc.config
+++ b/gerrit/acls/openstack/networking-sfc.config
@@ -27,10 +27,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-dynamic-routing.config b/gerrit/acls/openstack/neutron-dynamic-routing.config
index f42500b17c..fa5d7e6111 100644
--- a/gerrit/acls/openstack/neutron-dynamic-routing.config
+++ b/gerrit/acls/openstack/neutron-dynamic-routing.config
@@ -31,10 +31,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-fwaas-dashboard.config b/gerrit/acls/openstack/neutron-fwaas-dashboard.config
index f3032fd0e2..da10f1f8ee 100644
--- a/gerrit/acls/openstack/neutron-fwaas-dashboard.config
+++ b/gerrit/acls/openstack/neutron-fwaas-dashboard.config
@@ -24,10 +24,7 @@ label-Workflow = -1..+1 group horizon-stable-maint
 label-Workflow = -1..+1 group neutron-stable-maint
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-fwaas.config b/gerrit/acls/openstack/neutron-fwaas.config
index ec4b95ed88..461075a444 100644
--- a/gerrit/acls/openstack/neutron-fwaas.config
+++ b/gerrit/acls/openstack/neutron-fwaas.config
@@ -28,10 +28,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-lib.config b/gerrit/acls/openstack/neutron-lib.config
index 3104bcfbe6..23b93796ff 100644
--- a/gerrit/acls/openstack/neutron-lib.config
+++ b/gerrit/acls/openstack/neutron-lib.config
@@ -28,10 +28,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-specs.config b/gerrit/acls/openstack/neutron-specs.config
index 3245636834..999cb68622 100644
--- a/gerrit/acls/openstack/neutron-specs.config
+++ b/gerrit/acls/openstack/neutron-specs.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group neutron-specs-core
 label-Workflow = -1..+1 group neutron-drivers-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-vpnaas-dashboard.config b/gerrit/acls/openstack/neutron-vpnaas-dashboard.config
index 4aa31e62e2..619fda5f12 100644
--- a/gerrit/acls/openstack/neutron-vpnaas-dashboard.config
+++ b/gerrit/acls/openstack/neutron-vpnaas-dashboard.config
@@ -24,10 +24,7 @@ label-Workflow = -1..+1 group horizon-stable-maint
 label-Workflow = -1..+1 group neutron-stable-maint
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron-vpnaas.config b/gerrit/acls/openstack/neutron-vpnaas.config
index 7be714435e..0d94770e07 100644
--- a/gerrit/acls/openstack/neutron-vpnaas.config
+++ b/gerrit/acls/openstack/neutron-vpnaas.config
@@ -31,10 +31,7 @@ label-Workflow = -1..+1 group neutron-vpnaas-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/neutron.config b/gerrit/acls/openstack/neutron.config
index c19c0066ef..1ba3976124 100644
--- a/gerrit/acls/openstack/neutron.config
+++ b/gerrit/acls/openstack/neutron.config
@@ -28,10 +28,7 @@ label-Workflow = -1..+1 group neutron-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/nova-specs.config b/gerrit/acls/openstack/nova-specs.config
index f70bff5556..06e1396d87 100644
--- a/gerrit/acls/openstack/nova-specs.config
+++ b/gerrit/acls/openstack/nova-specs.config
@@ -9,7 +9,7 @@ label-Review-Priority = +0..+2 group nova-specs-core
 label-Workflow = -1..+1 group nova-specs-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoOp
 value = 0 Default Priority
diff --git a/gerrit/acls/openstack/nova.config b/gerrit/acls/openstack/nova.config
index 085861bdc0..c566c1004c 100644
--- a/gerrit/acls/openstack/nova.config
+++ b/gerrit/acls/openstack/nova.config
@@ -28,7 +28,7 @@ label-Workflow = -1..+1 group nova-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoOp
 value = 0 Default Priority
diff --git a/gerrit/acls/openstack/octavia-dashboard.config b/gerrit/acls/openstack/octavia-dashboard.config
index fff22cc049..f4d13761a5 100644
--- a/gerrit/acls/openstack/octavia-dashboard.config
+++ b/gerrit/acls/openstack/octavia-dashboard.config
@@ -26,8 +26,7 @@ label-Workflow = -1..+1 group octavia-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/octavia-lib.config b/gerrit/acls/openstack/octavia-lib.config
index 6c9a114572..658089f1a6 100644
--- a/gerrit/acls/openstack/octavia-lib.config
+++ b/gerrit/acls/openstack/octavia-lib.config
@@ -26,8 +26,7 @@ label-Workflow = -1..+1 group octavia-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/octavia.config b/gerrit/acls/openstack/octavia.config
index e0963eb90e..900e429e08 100644
--- a/gerrit/acls/openstack/octavia.config
+++ b/gerrit/acls/openstack/octavia.config
@@ -29,8 +29,7 @@ label-Workflow = -1..+1 group octavia-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/openstack-ansible.config b/gerrit/acls/openstack/openstack-ansible.config
index 5051fdc548..1712245a9a 100644
--- a/gerrit/acls/openstack/openstack-ansible.config
+++ b/gerrit/acls/openstack/openstack-ansible.config
@@ -8,10 +8,7 @@ label-Code-Review = -2..+2 group openstack-ansible-core
 label-Workflow = -1..+1 group openstack-ansible-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -1 Not A Backport Candidate
diff --git a/gerrit/acls/openstack/os-vif.config b/gerrit/acls/openstack/os-vif.config
index 980b6ba832..1ba1a5dc59 100644
--- a/gerrit/acls/openstack/os-vif.config
+++ b/gerrit/acls/openstack/os-vif.config
@@ -30,7 +30,7 @@ label-Workflow = -1..+1 group os-vif-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoOp
 value = 0 Default Priority
diff --git a/gerrit/acls/openstack/oslo.cache.config b/gerrit/acls/openstack/oslo.cache.config
index f64d7b63cf..d1f8352c0b 100644
--- a/gerrit/acls/openstack/oslo.cache.config
+++ b/gerrit/acls/openstack/oslo.cache.config
@@ -12,10 +12,7 @@ label-Code-Review = -2..+2 group oslo-cache-core
 label-Workflow = -1..+1 group oslo-cache-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.concurrency.config b/gerrit/acls/openstack/oslo.concurrency.config
index 0952b09f37..7f0ef36d99 100644
--- a/gerrit/acls/openstack/oslo.concurrency.config
+++ b/gerrit/acls/openstack/oslo.concurrency.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.config b/gerrit/acls/openstack/oslo.config
index 0b85dc9866..93599be142 100644
--- a/gerrit/acls/openstack/oslo.config
+++ b/gerrit/acls/openstack/oslo.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.db.config b/gerrit/acls/openstack/oslo.db.config
index 3e8802799f..b3b3481cce 100644
--- a/gerrit/acls/openstack/oslo.db.config
+++ b/gerrit/acls/openstack/oslo.db.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.i18n.config b/gerrit/acls/openstack/oslo.i18n.config
index f5db5f173b..34da26fd64 100644
--- a/gerrit/acls/openstack/oslo.i18n.config
+++ b/gerrit/acls/openstack/oslo.i18n.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.limit.config b/gerrit/acls/openstack/oslo.limit.config
index 6afbfa00a8..656f180704 100644
--- a/gerrit/acls/openstack/oslo.limit.config
+++ b/gerrit/acls/openstack/oslo.limit.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.messaging.config b/gerrit/acls/openstack/oslo.messaging.config
index 8d8ba5b833..f710087949 100644
--- a/gerrit/acls/openstack/oslo.messaging.config
+++ b/gerrit/acls/openstack/oslo.messaging.config
@@ -20,10 +20,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.middleware.config b/gerrit/acls/openstack/oslo.middleware.config
index 26124e1c22..945e9a382f 100644
--- a/gerrit/acls/openstack/oslo.middleware.config
+++ b/gerrit/acls/openstack/oslo.middleware.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.policy.config b/gerrit/acls/openstack/oslo.policy.config
index 45994c7385..9af0869ae8 100644
--- a/gerrit/acls/openstack/oslo.policy.config
+++ b/gerrit/acls/openstack/oslo.policy.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.privsep.config b/gerrit/acls/openstack/oslo.privsep.config
index d257171be8..2d3b603d0b 100644
--- a/gerrit/acls/openstack/oslo.privsep.config
+++ b/gerrit/acls/openstack/oslo.privsep.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.reports.config b/gerrit/acls/openstack/oslo.reports.config
index 12ee638f07..28af1f3bae 100644
--- a/gerrit/acls/openstack/oslo.reports.config
+++ b/gerrit/acls/openstack/oslo.reports.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.rootwrap.config b/gerrit/acls/openstack/oslo.rootwrap.config
index 86e3a9ec0e..4db5deef90 100644
--- a/gerrit/acls/openstack/oslo.rootwrap.config
+++ b/gerrit/acls/openstack/oslo.rootwrap.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.service.config b/gerrit/acls/openstack/oslo.service.config
index fa007ebb5c..7a160fcf3d 100644
--- a/gerrit/acls/openstack/oslo.service.config
+++ b/gerrit/acls/openstack/oslo.service.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.upgradecheck.config b/gerrit/acls/openstack/oslo.upgradecheck.config
index 7127dd3e67..0de243f1bc 100644
--- a/gerrit/acls/openstack/oslo.upgradecheck.config
+++ b/gerrit/acls/openstack/oslo.upgradecheck.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.versionedobjects.config b/gerrit/acls/openstack/oslo.versionedobjects.config
index 01ff5db162..28734c2619 100644
--- a/gerrit/acls/openstack/oslo.versionedobjects.config
+++ b/gerrit/acls/openstack/oslo.versionedobjects.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/oslo.vmware.config b/gerrit/acls/openstack/oslo.vmware.config
index 82683d27fb..033c167178 100644
--- a/gerrit/acls/openstack/oslo.vmware.config
+++ b/gerrit/acls/openstack/oslo.vmware.config
@@ -15,10 +15,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/osprofiler.config b/gerrit/acls/openstack/osprofiler.config
index 2165126584..838fb38363 100644
--- a/gerrit/acls/openstack/osprofiler.config
+++ b/gerrit/acls/openstack/osprofiler.config
@@ -9,10 +9,7 @@ label-Code-Review = -2..+2 group osprofiler-core
 label-Workflow = -1..+1 group osprofiler-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/ovn-octavia-provider.config b/gerrit/acls/openstack/ovn-octavia-provider.config
index 3546f85122..845bcb4049 100644
--- a/gerrit/acls/openstack/ovn-octavia-provider.config
+++ b/gerrit/acls/openstack/ovn-octavia-provider.config
@@ -25,10 +25,7 @@ label-Workflow = -1..+1 group ovn-octavia-provider-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/patrole.config b/gerrit/acls/openstack/patrole.config
index ffacc01b81..cdac412f92 100644
--- a/gerrit/acls/openstack/patrole.config
+++ b/gerrit/acls/openstack/patrole.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group patrole-core
 label-Workflow = -1..+1 group patrole-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Release Freeze
diff --git a/gerrit/acls/openstack/placement.config b/gerrit/acls/openstack/placement.config
index 7d11b5da12..4f01524d18 100644
--- a/gerrit/acls/openstack/placement.config
+++ b/gerrit/acls/openstack/placement.config
@@ -28,7 +28,7 @@ label-Workflow = -1..+1 group placement-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoOp
 value = 0 Default Priority
diff --git a/gerrit/acls/openstack/python-designateclient.config b/gerrit/acls/openstack/python-designateclient.config
index b1aaaa7ba3..4b5ad219aa 100644
--- a/gerrit/acls/openstack/python-designateclient.config
+++ b/gerrit/acls/openstack/python-designateclient.config
@@ -24,10 +24,7 @@ label-Workflow = -1..+1 group designate-milestone
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/python-novaclient.config b/gerrit/acls/openstack/python-novaclient.config
index ec0522fc89..b2e0af3e00 100644
--- a/gerrit/acls/openstack/python-novaclient.config
+++ b/gerrit/acls/openstack/python-novaclient.config
@@ -27,7 +27,7 @@ label-Workflow = -1..+1 group nova-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Review-Priority"]
-copyAnyScore = true
+copyCondition = is:ANY
 defaultValue = 0
 function = NoOp
 value = 0 Default Priority
diff --git a/gerrit/acls/openstack/python-octaviaclient.config b/gerrit/acls/openstack/python-octaviaclient.config
index 772a343d06..5c8716a0f3 100644
--- a/gerrit/acls/openstack/python-octaviaclient.config
+++ b/gerrit/acls/openstack/python-octaviaclient.config
@@ -26,8 +26,7 @@ label-Workflow = -1..+1 group octavia-stable-maint
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/rbd-iscsi-client.config b/gerrit/acls/openstack/rbd-iscsi-client.config
index fac92da2b8..d6ff546220 100644
--- a/gerrit/acls/openstack/rbd-iscsi-client.config
+++ b/gerrit/acls/openstack/rbd-iscsi-client.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group rbd-iscsi-client-core
 label-Workflow = -1..+1 group rbd-iscsi-client-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/release-test.config b/gerrit/acls/openstack/release-test.config
index 6f9dfe86ad..78007341dd 100644
--- a/gerrit/acls/openstack/release-test.config
+++ b/gerrit/acls/openstack/release-test.config
@@ -8,7 +8,7 @@ label-PTL-Approved = +0..+1 group Continuous Integration Tools
 label-Workflow = -1..+1 group releases-core
 
 [label "PTL-Approved"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = 0 Abstain
diff --git a/gerrit/acls/openstack/releases.config b/gerrit/acls/openstack/releases.config
index be03a20139..5126f46b5a 100644
--- a/gerrit/acls/openstack/releases.config
+++ b/gerrit/acls/openstack/releases.config
@@ -8,7 +8,7 @@ label-PTL-Approved = +0..+1 group Continuous Integration Tools
 label-Workflow = -1..+1 group releases-core
 
 [label "PTL-Approved"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Block
diff --git a/gerrit/acls/openstack/stevedore.config b/gerrit/acls/openstack/stevedore.config
index 248022e93e..e19f805def 100644
--- a/gerrit/acls/openstack/stevedore.config
+++ b/gerrit/acls/openstack/stevedore.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/taskflow.config b/gerrit/acls/openstack/taskflow.config
index 30847dd324..049c810322 100644
--- a/gerrit/acls/openstack/taskflow.config
+++ b/gerrit/acls/openstack/taskflow.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/tempest.config b/gerrit/acls/openstack/tempest.config
index e1ebe9ae8a..ad57609b53 100644
--- a/gerrit/acls/openstack/tempest.config
+++ b/gerrit/acls/openstack/tempest.config
@@ -9,10 +9,7 @@ label-Verified = -1..+1 group tempest-ci
 label-Workflow = -1..+1 group tempest-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Release Freeze
diff --git a/gerrit/acls/openstack/tooz.config b/gerrit/acls/openstack/tooz.config
index 4c5f947bdc..e0962c51a2 100644
--- a/gerrit/acls/openstack/tooz.config
+++ b/gerrit/acls/openstack/tooz.config
@@ -14,10 +14,7 @@ label-Code-Review = -2..+2 group stable-maint-core
 label-Workflow = -1..+1 group stable-maint-core
 
 [label "Backport-Candidate"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = NoBlock
 value = -2 Do Not Backport
diff --git a/gerrit/acls/openstack/tripleo-ci.config b/gerrit/acls/openstack/tripleo-ci.config
index 2661d91739..175d43339e 100644
--- a/gerrit/acls/openstack/tripleo-ci.config
+++ b/gerrit/acls/openstack/tripleo-ci.config
@@ -10,10 +10,7 @@ label-Workflow = -1..+1 group tripleo-ci-core
 toggleWipState = group tripleo-ci-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/zaqar-ui.config b/gerrit/acls/openstack/zaqar-ui.config
index 15d29eacd5..af56039897 100644
--- a/gerrit/acls/openstack/zaqar-ui.config
+++ b/gerrit/acls/openstack/zaqar-ui.config
@@ -8,10 +8,7 @@ label-Review-Priority = -1..+2 group zaqar-ui-core
 label-Workflow = -1..+1 group zaqar-ui-core
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/openstack/zaqar.config b/gerrit/acls/openstack/zaqar.config
index 0bb40ddc87..917fdc68b0 100644
--- a/gerrit/acls/openstack/zaqar.config
+++ b/gerrit/acls/openstack/zaqar.config
@@ -23,10 +23,7 @@ label-Workflow = -1..+1 group stable-maint-core
 label-Workflow = -1..+1 group zaqar-stable-maint
 
 [label "Review-Priority"]
-copyAllScoresIfNoCodeChange = true
-copyAllScoresOnTrivialRebase = true
-copyMaxScore = true
-copyMinScore = true
+copyCondition = changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE OR is:MAX OR is:MIN
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/gerrit/acls/starlingx/governance.config b/gerrit/acls/starlingx/governance.config
index e12e96d88b..64c5401f3f 100644
--- a/gerrit/acls/starlingx/governance.config
+++ b/gerrit/acls/starlingx/governance.config
@@ -12,7 +12,7 @@ label-Workflow = -1..+1 group stx-tech-steering-committee-secretary
 createSignedTag = group stx-tech-steering-committee-secretary
 
 [label "Code-Review"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -2 Unused -2
@@ -22,7 +22,7 @@ value = +1 Looks good to me
 value = +2 Unused +2
 
 [label "Rollcall-Vote"]
-copyAllScoresOnTrivialRebase = true
+copyCondition = changekind:TRIVIAL_REBASE
 defaultValue = 0
 function = NoOp
 value = -1 No
diff --git a/gerrit/acls/x/monasca-vagrant.config b/gerrit/acls/x/monasca-vagrant.config
index ed33b846d9..5e7eb6dbe9 100644
--- a/gerrit/acls/x/monasca-vagrant.config
+++ b/gerrit/acls/x/monasca-vagrant.config
@@ -5,7 +5,7 @@ label-Review-Priority = -1..+2 group monasca-core
 label-Workflow = -1..+1 group monasca-core
 
 [label "Review-Priority"]
-copyMaxScore = true
+copyCondition = is:MAX
 defaultValue = 0
 function = AnyWithBlock
 value = -1 Branch Freeze
diff --git a/tools/normalize_acl.py b/tools/normalize_acl.py
index 0ad661e44e..2c92641162 100755
--- a/tools/normalize_acl.py
+++ b/tools/normalize_acl.py
@@ -58,13 +58,9 @@ out = ''
 
 valid_keys = {'abandon',
               'access',
-              'copyAllScoresIfNoCodeChange',
-              'copyAllScoresOnTrivialRebase',
-              'copyAnyScore',
-              'copyMaxScore',
-              'copyMinScore',
               'create',
               'createSignedTag',
+              'copyCondition',
               'defaultValue',
               'delete',
               'editHashtags',
@@ -114,7 +110,8 @@ for line in aclfd:
         # Check for valid keys
         key = line.split('=')[0].strip()
         if key not in valid_keys:
-            raise Exception('Unrecognized key in line: "%s"' % line)
+            raise Exception('(%s) Unrecognized key "%s" in line: "%s"'
+                            % (aclfile, key, line))
     # WTF
     else:
         raise Exception('Unrecognized line: "%s"' % line)