diff --git a/Picker/Android.mk b/Picker/Android.mk
index f973fc1..09178ff 100644
--- a/Picker/Android.mk
+++ b/Picker/Android.mk
@@ -4,6 +4,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
+LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PACKAGE_NAME := HardwareOverlayPicker
 LOCAL_PROGUARD_ENABLED := disabled
diff --git a/Picker/AndroidManifest.xml b/Picker/AndroidManifest.xml
index 94e5fd4..342dae6 100644
--- a/Picker/AndroidManifest.xml
+++ b/Picker/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlaypicker">
+	package="me.phh.treble.overlaypicker"
+	android:sharedUserId="android.uid.system">
 
 	<uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />