diff --git a/project.config b/project.config
index 77a30fc..375e647 100644
--- a/project.config
+++ b/project.config
@@ -1,9 +1,11 @@
 [access]
 	inheritFrom = All-Projects
 [submit]
-	action = merge always
+	action = rebase if necessary
+	rejectEmptyCommit = true
 [receive]
 	requireSignedOffBy = true
+	rejectImplicitMerges = true
 [project]
 	description = Gerrit settings common to all projects under the TF-A namespace