diff --git a/Android.bp b/Android.bp
index eae7672..0ecef29 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,12 +51,12 @@ android_app_import {
 android_app_import {
 	name: "PowerOffAlarm",
 	owner: "xiaomi",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
+	apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
deleted file mode 100644
index 65bd917..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 03d72c9..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
new file mode 100755
index 0000000..fc93048
Binary files /dev/null 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 fc9a6fd..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 a124dbf..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/sdm660-common-vendor.mk b/sdm660-common-vendor.mk
index 2a05c1d..6dfe416 100644
--- a/sdm660-common-vendor.mk
+++ b/sdm660-common-vendor.mk
@@ -60,6 +60,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/qrtr-cfg:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-cfg \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/qrtr-lookup:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-lookup \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \