diff --git a/refpolicy/config/appconfig/default_contexts b/refpolicy/config/appconfig/default_contexts
index ab807b7d6..0160cdd95 100644
--- a/refpolicy/config/appconfig/default_contexts
+++ b/refpolicy/config/appconfig/default_contexts
@@ -1,5 +1,5 @@
-system_r:sulogin_t	sysadm_r:sysadm_t 
-system_r:local_login_t	staff_r:staff_t user_r:user_t sysadm_r:sysadm_t user_r:unconfined_t sysadm_r:unconfined_t
+system_r:sulogin_t	sysadm_r:sysadm_t
+system_r:local_login_t	staff_r:staff_t user_r:user_t sysadm_r:sysadm_t
 system_r:remote_login_t	user_r:user_t staff_r:staff_t
 system_r:sshd_t		user_r:user_t staff_r:staff_t sysadm_r:sysadm_t
 system_r:crond_t	user_r:user_crond_t staff_r:staff_crond_t sysadm_r:sysadm_crond_t system_r:system_crond_t mailman_r:user_crond_t
diff --git a/refpolicy/config/appconfig/root_default_contexts b/refpolicy/config/appconfig/root_default_contexts
index 252f06959..acdcc08eb 100644
--- a/refpolicy/config/appconfig/root_default_contexts
+++ b/refpolicy/config/appconfig/root_default_contexts
@@ -1,8 +1,8 @@
-system_r:local_login_t  sysadm_r:unconfined_t user_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+system_r:local_login_t  sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 system_r:crond_t	sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
-staff_r:staff_su_t	sysadm_r:unconfined_t user_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-sysadm_r:sysadm_su_t	sysadm_r:unconfined_t user_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-user_r:user_su_t	sysadm_r:unconfined_t user_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+staff_r:staff_su_t	sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+sysadm_r:sysadm_su_t	sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+user_r:user_su_t	sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 #
 # Uncomment if you want to automatically login as sysadm_r
 #