diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk
index 5ae0f03..835f6e8 100644
--- a/self-extractors_oriole/google_devices/staging/Android.mk
+++ b/self-extractors_oriole/google_devices/staging/Android.mk
@@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -74,7 +74,7 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_LICENSE_CONDITIONS := PRESIGNED
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk
index f3ad011..d4e1289 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -72,7 +72,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
@@ -88,7 +88,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := qorvo
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE