diff --git a/common/Android.bp b/common/Android.bp
index 3a71994b..4be36193 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -55,7 +55,7 @@ android_app_import {
 	owner: "gms",
 	apk: "proprietary/system/priv-app/GooglePackageInstaller/GooglePackageInstaller.apk",
 	overrides: ["PackageInstaller"],
-	presigned: true,
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
@@ -468,7 +468,7 @@ android_app_import {
 	name: "ConnMO",
 	owner: "gms",
 	apk: "proprietary/product/priv-app/ConnMO/ConnMO.apk",
-	presigned: true,
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
@@ -480,7 +480,7 @@ android_app_import {
 	name: "DCMO",
 	owner: "gms",
 	apk: "proprietary/product/priv-app/DCMO/DCMO.apk",
-	presigned: true,
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
@@ -504,7 +504,7 @@ android_app_import {
 	name: "DeviceIntelligenceNetworkPrebuilt",
 	owner: "gms",
 	apk: "proprietary/product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk",
-	presigned: true,
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
@@ -908,7 +908,7 @@ android_app_import {
 	name: "EmergencyInfoGoogleNoUi",
 	owner: "gms",
 	apk: "proprietary/system_ext/app/EmergencyInfoGoogleNoUi/EmergencyInfoGoogleNoUi.apk",
-	presigned: true,
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0eb2c6a1..9b39f5b1 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -22,8 +22,8 @@ product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 -product/priv-app/CarrierMetrics/CarrierMetrics.apk;PRESIGNED
 -product/priv-app/CarrierServices/CarrierServices.apk;PRESIGNED
 -product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
--product/priv-app/ConnMO/ConnMO.apk;PRESIGNED
--product/priv-app/DCMO/DCMO.apk;PRESIGNED
+-product/priv-app/ConnMO/ConnMO.apk
+-product/priv-app/DCMO/DCMO.apk
 -product/priv-app/OdadPrebuilt/OdadPrebuilt.apk;PRESIGNED
 -product/priv-app/TetheringEntitlement/TetheringEntitlement.apk;PRESIGNED
 system_ext/framework/RadioConfigLib.jar
@@ -84,7 +84,7 @@ product/lib/libdmjavaplugin.so
 -system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
 
 # Intelligence
--product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk;PRESIGNED
+-product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk
 -product/priv-app/SettingsIntelligenceGooglePrebuilt/SettingsIntelligenceGooglePrebuilt.apk;OVERRIDES=SettingsIntelligence;PRESIGNED
 
 # Keyboard
@@ -184,7 +184,7 @@ product/usr/srec/en-US/semantics.pumpkin
 product/etc/sysconfig/nga.xml
 
 # PackageInstaller
--system/priv-app/GooglePackageInstaller/GooglePackageInstaller.apk;OVERRIDES=PackageInstaller;PRESIGNED
+-system/priv-app/GooglePackageInstaller/GooglePackageInstaller.apk;OVERRIDES=PackageInstaller
 
 # Permissions
 product/etc/default-permissions/default-permissions.xml
@@ -213,7 +213,7 @@ system_ext/etc/permissions/privapp-permissions-google-se.xml
 
 # SafetyHub
 -product/priv-app/SafetyHubPrebuilt/SafetyHubPrebuilt.apk;OVERRIDES=EmergencyInfo;PRESIGNED
--system_ext/app/EmergencyInfoGoogleNoUi/EmergencyInfoGoogleNoUi.apk;PRESIGNED
+-system_ext/app/EmergencyInfoGoogleNoUi/EmergencyInfoGoogleNoUi.apk
 
 # Security
 -product/app/DevicePolicyPrebuilt/DevicePolicyPrebuilt.apk;PRESIGNED