diff --git a/ParentalControl/Android.bp b/ParentalControl/Android.bp
index e892d7db0964cae081384b66ce371e161634fb0d..a248537f69ca9d7316fc6fc25b4049fb479bc153 100644
--- a/ParentalControl/Android.bp
+++ b/ParentalControl/Android.bp
@@ -3,19 +3,13 @@ android_app_import {
     system_ext_specific: true,
     certificate: "platform",
     required: [
-        "init.parental.rc",
-        "set-device-owner.sh",
+        "init.mdm.rc",
     ],
     apk: "app-release.apk",
 }
 
 prebuilt_etc {
-    name: "init.parental.rc",
-    src: "init.parental.rc",
+    name: "init.mdm.rc",
+    src: "init.mdm.rc",
     relative_install_path: "init",
 }
-
-cc_prebuilt_binary {
-    name: "set-device-owner.sh",
-    srcs: ["set-device-owner.sh"],
-}
diff --git a/ParentalControl/init.mdm.rc b/ParentalControl/init.mdm.rc
new file mode 100644
index 0000000000000000000000000000000000000000..6f43fb85e739d0225b086b0bc2fb204a927da312
--- /dev/null
+++ b/ParentalControl/init.mdm.rc
@@ -0,0 +1,3 @@
+on property:persist.sys.mdm_active=1
+    exec u:r:su:s0 root root -- /system/bin/dpm set-device-owner ${persist.sys.mdm_package}
+    exec u:r:su:s0 root root -- /system/bin/dpm set-profile-owner ${persist.sys.mdm_package}
diff --git a/ParentalControl/init.parental.rc b/ParentalControl/init.parental.rc
deleted file mode 100644
index 4a2559639a014fc29a9a5c6b77e676527da706f0..0000000000000000000000000000000000000000
--- a/ParentalControl/init.parental.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-service set-device-owner /system/bin/set-device-owner.sh
-    class core
-    user shell
-    oneshot
-    seclabel u:r:shell:s0
-    disabled
-
-on property:persist.sys.mdm_active=1
-  start set-device-owner
diff --git a/ParentalControl/sepolicy/file_contexts b/ParentalControl/sepolicy/file_contexts
deleted file mode 100644
index ef2691409831d1eb60621179769488dc5d838d5a..0000000000000000000000000000000000000000
--- a/ParentalControl/sepolicy/file_contexts
+++ /dev/null
@@ -1 +0,0 @@
-/system/bin/set-device-owner\.sh u:object_r:shell_exec:s0
diff --git a/ParentalControl/set-device-owner.sh b/ParentalControl/set-device-owner.sh
deleted file mode 100755
index ea4197f6379380b16e5a4e346402e82432b91150..0000000000000000000000000000000000000000
--- a/ParentalControl/set-device-owner.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/system/bin/sh
-
-dpm set-device-owner foundation.e.parentalcontrol/foundation.e.parentalcontrol.DeviceAdmin
-# If there's multiple users, we won't be able to as device owner, so use profile owner.
-dpm set-profile-owner foundation.e.parentalcontrol/foundation.e.parentalcontrol.DeviceAdmin
diff --git a/config/common.mk b/config/common.mk
index b9ad3b0d6b419ff298fecfd39a294dc12d31c7f8..e8b50bd715cfed70cb3ff2f993a82a4ac8e42eda 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -55,9 +55,6 @@ PRODUCT_PACKAGES += \
     PdfViewer
 endif
 
-# Parental control
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += prebuilts/prebuiltapks/ParentalControl/sepolicy
-
 # BlissLauncher3
 ifeq ($(PLATFORM_SDK_VERSION), 32)
 PRODUCT_PACKAGES += BlissLauncher3_A12