diff --git a/groups b/groups
index 7b29ed8..05ef93c 100644
--- a/groups
+++ b/groups
@@ -1,11 +1,11 @@
 # UUID                                  	Group Name
 #
 1460e4915a33df532edbda5a19c6c025a67c67ef	trusted-firmware-a-ci-users
-8eea0c20ff14f6b3e93e9e687af2159d45793212	trusted-firmware-a-legacy-ci-users
 3c602ebb948eaf2077cc2eb062eb1a3b0367d759	Service Users
 4db8267426bbc5d487c8dbdcf58a1c50202b1c92	trusted-firmware-a-arm-approvers
 5b2667831f42b0a9032405404b813c6082876d90	trusted-firmware-a-approvers
 7c05eb1a9b6d175b7b553af378f380423ff922e4	Bot Users
 8c8d5800e19a926629aefdd27673521578b2a37d	trusted-firmware-a-branch-users
+8eea0c20ff14f6b3e93e9e687af2159d45793212	trusted-firmware-a-legacy-ci-users
 global:Registered-Users                 	Registered Users
 user:ci-bot-user                        	user/TrustedFirmware Code Review (ci-bot-user)
diff --git a/project.config b/project.config
index 4071241..b8bb53c 100644
--- a/project.config
+++ b/project.config
@@ -4,7 +4,7 @@
 	action = merge always
 	rejectEmptyCommit = true
 [receive]
-	requireSignedOffBy = true
+	requireSignedOffBy = false
 	rejectImplicitMerges = true
 [project]
 	description = Gerrit settings common to all projects under the TF-A namespace
@@ -115,3 +115,7 @@
 	push = group trusted-firmware-a-arm-approvers
 	submit = group trusted-firmware-a-arm-approvers
 	label-Code-Review = -2..+2 group trusted-firmware-a-arm-approvers
+	exclusiveGroupPermissions = submit
+	label-Verified = -1..+1 group trusted-firmware-a-arm-approvers
+	label-Code-Owner-Review = -1..+1 group trusted-firmware-a-arm-approvers
+	label-Maintainer-Review = -1..+1 group trusted-firmware-a-arm-approvers