diff --git a/policy/modules/roles/auditadm.te b/policy/modules/roles/auditadm.te
index 12a6ea1a3..e2eb6dc87 100644
--- a/policy/modules/roles/auditadm.te
+++ b/policy/modules/roles/auditadm.te
@@ -39,10 +39,6 @@ optional_policy(`
 	dmesg_exec(auditadm_t)
 ')
 
-optional_policy(`
-	dbus_role_template(auditadm, auditadm_r, auditadm_t)
-')
-
 optional_policy(`
 	screen_role_template(auditadm, auditadm_r, auditadm_t)
 ')
diff --git a/policy/modules/roles/secadm.te b/policy/modules/roles/secadm.te
index f114d05eb..d2c06426c 100644
--- a/policy/modules/roles/secadm.te
+++ b/policy/modules/roles/secadm.te
@@ -48,10 +48,6 @@ optional_policy(`
 	auditadm_role_change(secadm_r)
 ')
 
-optional_policy(`
-	dbus_role_template(secadm, secadm_r, secadm_t)
-')
-
 optional_policy(`
 	dmesg_exec(secadm_t)
 ')
diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index f6500ab86..a3c9705f3 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -98,19 +98,15 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		dbus_role_template(staff, staff_r, staff_t)
+		gnome_role_template(staff, 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(`
-			telepathy_role_template(staff, staff_r, staff_t)
-		')
-
-		optional_policy(`
-			wm_role_template(staff, staff_r, staff_t)
-		')
+	optional_policy(`
+		wm_role_template(staff, staff_r, staff_t)
 	')
 
 	optional_policy(`
diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index d6481f275..f6c7ecea3 100644
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -1226,15 +1226,11 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		dbus_role_template(sysadm, sysadm_r, sysadm_t)
+		gnome_role_template(sysadm, 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(`
+		wm_role_template(sysadm, sysadm_r, sysadm_t)
 	')
 
 	optional_policy(`
diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index cbb2cad4d..3a119982c 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -62,19 +62,15 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		dbus_role_template(user, user_r, user_t)
+		gnome_role_template(user, 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(`
-			telepathy_role_template(user, user_r, user_t)
-		')
-
-		optional_policy(`
-			wm_role_template(user, user_r, user_t)
-		')
+	optional_policy(`
+		wm_role_template(user, user_r, user_t)
 	')
 
 	optional_policy(`
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 978c1b875..ce68b29af 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -722,6 +722,7 @@ template(`userdom_common_user_template',`
 	')
 
 	optional_policy(`
+		dbus_role_template($1, $1_r, $1_t)
 		dbus_system_bus_client($1_t)
 
 		optional_policy(`
@@ -760,6 +761,10 @@ template(`userdom_common_user_template',`
 		optional_policy(`
 			xserver_dbus_chat_xdm($1_t)
 		')
+
+		optional_policy(`
+			systemd_role_template($1, $1_r, $1_t)
+		')
 	')
 
 	optional_policy(`
@@ -861,10 +866,6 @@ template(`userdom_common_user_template',`
 		slrnpull_search_spool($1_t)
 	')
 
-	optional_policy(`
-		systemd_role_template($1, $1_r, $1_t)
-	')
-
 	optional_policy(`
 		udev_read_runtime_files($1_t)
 	')