diff --git a/sepolicy/bluetooth_loader.te b/sepolicy/bluetooth_loader.te
index 35bf139..e831432 100644
--- a/sepolicy/bluetooth_loader.te
+++ b/sepolicy/bluetooth_loader.te
@@ -20,10 +20,8 @@
 allow bluetooth_loader persist_file:dir search;
 r_dir_file(bluetooth_loader, persist_bluetooth_file)
 
-# Talk to init over the property socket
-unix_socket_connect(bluetooth_loader, property, init)
 # Set persist.service.bdroid.* and bluetooth.* property values
-allow bluetooth_loader bluetooth_prop:property_service set;
+set_prop(bluetooth_loader, bluetooth_prop)
 
 # Allow getprop/setprop for init.mako.bt.sh
 allow bluetooth_loader system_file:file execute_no_trans;
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 3393648..37f85f6 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -17,10 +17,9 @@
 allow netmgrd self:packet_socket create_socket_perms;
 
 # set net.rmnet* properties.
-unix_socket_connect(netmgrd, property, init)
-allow netmgrd radio_prop:property_service set;
+set_prop(netmgrd, radio_prop)
 auditallow netmgrd radio_prop:property_service set;
-allow netmgrd net_radio_prop:property_service set;
+set_prop(netmgrd, net_radio_prop)
 
 # Talk to qmuxd (qmux_radio)
 qmux_socket(netmgrd)
diff --git a/sepolicy/rmt.te b/sepolicy/rmt.te
index e76bac9..18dd335 100644
--- a/sepolicy/rmt.te
+++ b/sepolicy/rmt.te
@@ -22,5 +22,4 @@
 wakelock_use(rmt)
 
 # Access property service to set ctl.rmt_storage
-unix_socket_connect(rmt, property, init)
-allow rmt ctl_rmt_prop:property_service set;
+set_prop(rmt, ctl_rmt_prop)