diff --git a/private/cppreopts.te b/private/cppreopts.te
index 43340e0..1a8fa0b 100644
--- a/private/cppreopts.te
+++ b/private/cppreopts.te
@@ -4,11 +4,9 @@
 # partition. This domain ensures that we are only copying into specific
 # directories.
 
-type cppreopts, domain, mlstrustedsubject;
+type cppreopts, domain, mlstrustedsubject, coredomain;
 type cppreopts_exec, system_file_type, exec_type, file_type;
 
-typeattribute cppreopts coredomain;
-
 # Technically not a daemon but we do want the transition from init domain to
 # cppreopts to occur.
 init_daemon_domain(cppreopts)
diff --git a/private/otapreopt_slot.te b/private/otapreopt_slot.te
index a0b1b32..27a3b0e 100644
--- a/private/otapreopt_slot.te
+++ b/private/otapreopt_slot.te
@@ -1,11 +1,9 @@
 # This command set moves the artifact corresponding to the current slot
 # from /data/ota to /data/dalvik-cache.
 
-type otapreopt_slot, domain, mlstrustedsubject;
+type otapreopt_slot, domain, mlstrustedsubject, coredomain;
 type otapreopt_slot_exec, system_file_type, exec_type, file_type;
 
-typeattribute otapreopt_slot coredomain;
-
 # Technically not a daemon but we do want the transition from init domain to
 # cppreopts to occur.
 init_daemon_domain(otapreopt_slot)
diff --git a/private/preopt2cachename.te b/private/preopt2cachename.te
index 7c85a9f..dcfba14 100644
--- a/private/preopt2cachename.te
+++ b/private/preopt2cachename.te
@@ -2,10 +2,9 @@
 #
 # This executable translates names from the preopted versions the build system
 # creates to the names the runtime expects in the data directory.
-type preopt2cachename, domain;
-type preopt2cachename_exec, system_file_type, exec_type, file_type;
 
-typeattribute preopt2cachename coredomain;
+type preopt2cachename, domain, coredomain;
+type preopt2cachename_exec, system_file_type, exec_type, file_type;
 
 # Allow write to stdout.
 allow preopt2cachename cppreopts:fd use;