diff --git a/project.config b/project.config
index b3e4c9b..6924847 100644
--- a/project.config
+++ b/project.config
@@ -48,9 +48,8 @@
 	value = -1 I would prefer this is not merged as is
 	value = 0 No score
 	value = +1 Looks good to me
-	copyAllScoresIfNoCodeChange = true
-	copyAllScoresOnTrivialRebase = true
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
 # In addition, define our 2 custom labels for code review.
 # These influence whether a patch is submittable.
@@ -59,18 +58,16 @@
 	value = -1 I would prefer this is not merged as is
 	value = 0 No score
 	value = +1 Looks good to me
-	copyAllScoresIfNoCodeChange = true
-	copyAllScoresOnTrivialRebase = true
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
 [label "Maintainer-Review"]
 	function = MaxWithBlock
 	value = -1 I would prefer this is not merged as is
 	value = 0 No score
 	value = +1 Looks good to me
-	copyAllScoresIfNoCodeChange = true
-	copyAllScoresOnTrivialRebase = true
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
 # The Allow-CI label triggers the Open CI on the patch.
 # It sets the Verified score.
@@ -80,6 +77,7 @@
 	value = +1 Approved for automated testing on Open CI, shallow tests
 	value = +2 Approved for automated testing on Open CI, in-depth tests
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE
 
 # The Legacy-CI label triggers the internal Arm CI on the patch.
 # It sets the Verified score.
@@ -89,15 +87,15 @@
 	value = +1 Approved for automated testing on internal Arm CI, shallow tests
 	value = +2 Approved for automated testing on internal Arm CI, in-depth tests
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE
 
 [label "Verified"]
 	function = MaxWithBlock
 	value = -1 Fails
 	value = 0 No score
 	value = +1 Verified
-	copyAllScoresIfNoCodeChange = true
-	copyAllScoresOnTrivialRebase = true
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
 [access "refs/meta/dashboards/*"]
 	create = group trusted-firmware-a-approvers