diff --git a/Android.bp b/Android.bp
index 2173140..2c63213 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,17 +49,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "PowerOffAlarm",
-	owner: "xiaomi",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
 android_app_import {
 	name: "HotwordEnrollmentOKGoogleWCD9340",
 	owner: "xiaomi",
@@ -84,6 +73,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "PowerOffAlarm",
+	owner: "xiaomi",
+	apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "xiaomi",
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
deleted file mode 100644
index 847e520..0000000
Binary files a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk and /dev/null differ
diff --git a/proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk
new file mode 100644
index 0000000..461acfd
Binary files /dev/null and b/proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
index 0b194b4..3ce28d4 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service differ
diff --git a/proprietary/vendor/bin/power_off_alarm b/proprietary/vendor/bin/power_off_alarm
index 367be32..fc93048 100755
Binary files a/proprietary/vendor/bin/power_off_alarm and b/proprietary/vendor/bin/power_off_alarm differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
index 19bbf13..bfe1072 100644
--- a/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
+++ b/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
@@ -3,6 +3,9 @@
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
 service alarm-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
+    interface vendor.qti.hardware.alarm@1.0::IAlarm default
     class hal
     user system
     group system
+    oneshot
+    disabled
\ No newline at end of file
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
index b68189b..e04b087 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so
index 7d5fe4a..979d2b8 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so differ
diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk
index 3eb5469..1242802 100644
--- a/sdm845-common-vendor.mk
+++ b/sdm845-common-vendor.mk
@@ -769,9 +769,9 @@ PRODUCT_PACKAGES += \
     IWlanService \
     SoterService \
     TimeService \
-    PowerOffAlarm \
     HotwordEnrollmentOKGoogleWCD9340 \
     HotwordEnrollmentXGoogleWCD9340 \
+    PowerOffAlarm \
     QtiTelephonyService \
     uceShimService \
     ims \