diff --git a/project.config b/project.config
index fe4b46d..b1a2cc0 100644
--- a/project.config
+++ b/project.config
@@ -72,20 +72,19 @@
 [label "Code-Review"]
 	function = MaxWithBlock
 	defaultValue = 0
-	copyMinScore = true
-	copyAllScoresOnTrivialRebase = true
 	value = -2 This shall not be merged
 	value = -1 I would prefer this is not merged as is
 	value = 0 No score
 	value = +1 Looks good to me, but someone else must approve
 	value = +2 Looks good to me, approved
+	copyCondition = changekind:NO_CHANGE OR changekind:TRIVIAL_REBASE OR is:MIN
 [label "Presubmit"]
 	function = AnyWithBlock
 	value = -1 Fails
 	value = 0 No score
 	value = +1 Verified
-	copyAllScoresIfNoCodeChange = true
 	defaultValue = 0
+	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE
 [access "refs/for/*"]
 	addPatchSet = group Allowed-Developers
 	addPatchSet = group Google-Developer