diff --git a/project.config b/project.config
index 967fb75..830de9f 100644
--- a/project.config
+++ b/project.config
@@ -6,11 +6,7 @@
 	enableSignedPush = false
 [submit]
 	mergeContent = true
-	action = rebase if necessary
-[capability]
-	administrateServer = group Administrators
-	priority = batch group Non-Interactive Users
-	streamEvents = group Non-Interactive Users
+	action = rebase always
 [access "refs/*"]
 	read = group Administrators
 	read = group Anonymous Users
@@ -146,6 +142,10 @@
 	abandon = group Administrators
 	abandon = group Bliss-Developers
 	abandon = group Bliss-Team
+[capability]
+	administrateServer = group Administrators
+	priority = batch group Non-Interactive Users
+	streamEvents = group Non-Interactive Users
 [plugin "slack-integration"]
 	channel = blissromsgerrit
 	enabled = true