diff --git a/project.config b/project.config
index 3075bca..a675c81 100644
--- a/project.config
+++ b/project.config
@@ -8,27 +8,24 @@
         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 "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
 
 [label "Validation-Bot-Review"]
         function = NoBlock
         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 internal Arm CI on the patch.
 # It sets the Verified score.
@@ -38,6 +35,7 @@
 	value = +1 Approved for automated testing, shallow tests
 	value = +2 Approved for automated testing, in-depth tests
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE
 
 [access "refs/heads/*"]
 	label-Validation-Bot-Review = -1..+1 group Registered Users