diff --git a/telephony/pktrouter/device.te b/telephony/pktrouter/device.te
new file mode 100644
index 00000000..3225bac6
--- /dev/null
+++ b/telephony/pktrouter/device.te
@@ -0,0 +1 @@
+type pktrouter_device, dev_type;
diff --git a/telephony/pktrouter/file_contexts b/telephony/pktrouter/file_contexts
new file mode 100644
index 00000000..f6e73dbf
--- /dev/null
+++ b/telephony/pktrouter/file_contexts
@@ -0,0 +1,4 @@
+# WFC
+/vendor/bin/wfc-pkt-router     u:object_r:pktrouter_exec:s0
+
+/dev/umts_wfc[01]              u:object_r:pktrouter_device:s0
diff --git a/whitechapel/vendor/google/netutils_wrapper.te b/telephony/pktrouter/netutils_wrapper.te
similarity index 100%
rename from whitechapel/vendor/google/netutils_wrapper.te
rename to telephony/pktrouter/netutils_wrapper.te
diff --git a/whitechapel/vendor/google/pktrouter.te b/telephony/pktrouter/pktrouter.te
similarity index 100%
rename from whitechapel/vendor/google/pktrouter.te
rename to telephony/pktrouter/pktrouter.te
diff --git a/telephony/pktrouter/property.te b/telephony/pktrouter/property.te
new file mode 100644
index 00000000..a3d6a392
--- /dev/null
+++ b/telephony/pktrouter/property.te
@@ -0,0 +1 @@
+vendor_internal_prop(vendor_ims_prop)
diff --git a/telephony/pktrouter/property_contexts b/telephony/pktrouter/property_contexts
new file mode 100644
index 00000000..4165d92c
--- /dev/null
+++ b/telephony/pktrouter/property_contexts
@@ -0,0 +1,3 @@
+# for ims service
+vendor.pktrouter              u:object_r:vendor_ims_prop:s0
+
diff --git a/telephony/pktrouter/vendor_init.te b/telephony/pktrouter/vendor_init.te
new file mode 100644
index 00000000..3a867815
--- /dev/null
+++ b/telephony/pktrouter/vendor_init.te
@@ -0,0 +1 @@
+set_prop(vendor_init, vendor_ims_prop)
diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index f0e8d8d0..54327dfa 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -12,7 +12,6 @@ type vendor_m2m1shot_device, dev_type;
 type vendor_gnss_device, dev_type;
 type vendor_nanohub_device, dev_type;
 type vendor_secmem_device, dev_type;
-type pktrouter_device, dev_type;
 type vendor_toe_device, dev_type;
 type custom_ab_block_device, dev_type;
 type devinfo_block_device, dev_type;
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index 4b8ac2dd..451ae38d 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -123,7 +123,6 @@
 # GPU device
 /dev/mali0                     u:object_r:gpu_device:s0
 /dev/s5p-smem                  u:object_r:vendor_secmem_device:s0
-/dev/umts_wfc[01]                 u:object_r:pktrouter_device:s0
 
 #
 # Exynos Daemon Exec
@@ -138,9 +137,6 @@
 /(vendor|system/vendor)/bin/sced               u:object_r:sced_exec:s0
 /(vendor|system/vendor)/bin/bipchmgr           u:object_r:bipchmgr_exec:s0
 
-# WFC
-/(vendor|system/vendor)/bin/wfc-pkt-router     u:object_r:pktrouter_exec:s0
-
 #
 # Exynos Data Files
 #
diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te
index bc62032b..254e9ac7 100644
--- a/whitechapel/vendor/google/property.te
+++ b/whitechapel/vendor/google/property.te
@@ -1,6 +1,5 @@
 # For Exynos Properties
 vendor_internal_prop(vendor_prop)
-vendor_internal_prop(vendor_ims_prop)
 vendor_internal_prop(vendor_rcs_prop)
 vendor_internal_prop(vendor_slog_prop)
 vendor_internal_prop(sensors_prop)
diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts
index 94d4065f..1e43044b 100644
--- a/whitechapel/vendor/google/property_contexts
+++ b/whitechapel/vendor/google/property_contexts
@@ -7,10 +7,6 @@ vendor.sys.rild_reset            u:object_r:vendor_rild_prop:s0
 vendor.ril.                      u:object_r:vendor_rild_prop:s0
 ro.vendor.build.svn              u:object_r:vendor_rild_prop:s0
 
-# for ims service
-vendor.charon.                u:object_r:vendor_ims_prop:s0
-vendor.pktrouter              u:object_r:vendor_ims_prop:s0
-
 # Ramdump
 persist.vendor.sys.crash_rcu    u:object_r:vendor_ramdump_prop:s0
 
diff --git a/whitechapel/vendor/google/vendor_init.te b/whitechapel/vendor/google/vendor_init.te
index 8e3e369c..58551577 100644
--- a/whitechapel/vendor/google/vendor_init.te
+++ b/whitechapel/vendor/google/vendor_init.te
@@ -5,7 +5,6 @@ set_prop(vendor_init, vendor_rild_prop)
 set_prop(vendor_init, vendor_usb_config_prop)
 set_prop(vendor_init, vendor_slog_prop)
 set_prop(vendor_init, vendor_sys_default_prop)
-set_prop(vendor_init, vendor_ims_prop)
 set_prop(vendor_init, vendor_rcs_prop)
 set_prop(vendor_init, vendor_ssrdump_prop)
 set_prop(vendor_init, vendor_ro_config_default_prop)