diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index 324bee602..e9fe44b14 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -97,18 +97,6 @@ ifndef(`distro_redhat',`
 		cron_role(staff_r, staff_t)
 	')
 
-	optional_policy(`
-		gnome_role_template(staff, staff_r, staff_t)
-	')
-
-	optional_policy(`
-		telepathy_role_template(staff, staff_r, staff_t)
-	')
-
-	optional_policy(`
-		wm_role_template(staff, staff_r, staff_t)
-	')
-
 	optional_policy(`
 		dirmngr_role(staff_r, staff_t)
 	')
@@ -121,6 +109,10 @@ ifndef(`distro_redhat',`
 		games_role(staff_r, staff_t)
 	')
 
+	optional_policy(`
+		gnome_role_template(staff, staff_r, staff_t)
+	')
+
 	optional_policy(`
 		gpg_role(staff_r, staff_t)
 	')
@@ -185,6 +177,10 @@ ifndef(`distro_redhat',`
 		su_role_template(staff, staff_r, staff_t)
 	')
 
+	optional_policy(`
+		telepathy_role_template(staff, staff_r, staff_t)
+	')
+
 	optional_policy(`
 		thunderbird_role(staff_r, staff_t)
 	')
@@ -208,6 +204,10 @@ ifndef(`distro_redhat',`
 	optional_policy(`
 		wireshark_role(staff_r, staff_t)
 	')
+
+	optional_policy(`
+		wm_role_template(staff, staff_r, staff_t)
+	')
 ')
 
 ifdef(`distro_gentoo',`
diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index b869d772a..f87d97ab0 100644
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -1221,14 +1221,6 @@ ifndef(`distro_redhat',`
 		cryfs_role(sysadm_r, sysadm_t)
 	')
 
-	optional_policy(`
-		gnome_role_template(sysadm, sysadm_r, sysadm_t)
-	')
-
-	optional_policy(`
-		wm_role_template(sysadm, sysadm_r, sysadm_t)
-	')
-
 	optional_policy(`
 		dirmngr_role(sysadm_r, sysadm_t)
 	')
@@ -1241,6 +1233,10 @@ ifndef(`distro_redhat',`
 		games_role(sysadm_r, sysadm_t)
 	')
 
+	optional_policy(`
+		gnome_role_template(sysadm, sysadm_r, sysadm_t)
+	')
+
 	optional_policy(`
 		gpg_role(sysadm_r, sysadm_t)
 	')
@@ -1256,6 +1252,10 @@ ifndef(`distro_redhat',`
 	optional_policy(`
 		java_role(sysadm_r, sysadm_t)
 	')
+
+	optional_policy(`
+		wm_role_template(sysadm, sysadm_r, sysadm_t)
+	')
 ')
 
 ifdef(`distro_gentoo',`
diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index 52651f765..2069e9f08 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -61,18 +61,6 @@ ifndef(`distro_redhat',`
 		cron_role(user_r, user_t)
 	')
 
-	optional_policy(`
-		gnome_role_template(user, user_r, user_t)
-	')
-
-	optional_policy(`
-		telepathy_role_template(user, user_r, user_t)
-	')
-
-	optional_policy(`
-		wm_role_template(user, user_r, user_t)
-	')
-
 	optional_policy(`
 		dirmngr_role(user_r, user_t)
 	')
@@ -85,6 +73,10 @@ ifndef(`distro_redhat',`
 		games_role(user_r, user_t)
 	')
 
+	optional_policy(`
+		gnome_role_template(user, user_r, user_t)
+	')
+
 	optional_policy(`
 		gpg_role(user_r, user_t)
 	')
@@ -169,6 +161,10 @@ ifndef(`distro_redhat',`
 		syncthing_role(user_r, user_t)
 	')
 
+	optional_policy(`
+		telepathy_role_template(user, user_r, user_t)
+	')
+
 	optional_policy(`
 		thunderbird_role(user_r, user_t)
 	')
@@ -192,6 +188,10 @@ ifndef(`distro_redhat',`
 	optional_policy(`
 		wireshark_role(user_r, user_t)
 	')
+
+	optional_policy(`
+		wm_role_template(user, user_r, user_t)
+	')
 ')
 
 ifdef(`distro_gentoo',`