diff --git a/Android.bp b/Android.bp
index c60bfe0..ee8a999 100644
--- a/Android.bp
+++ b/Android.bp
@@ -141,12 +141,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 {
@@ -289,13 +289,6 @@ dex_import {
 	product_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.alarm-V1.0-java",
-	owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar"],
-	product_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.cne.internal.api-V1.0-java",
 	owner: "xiaomi",
diff --git a/msm8953-common-vendor.mk b/msm8953-common-vendor.mk
index f56d83d..be9b92a 100644
--- a/msm8953-common-vendor.mk
+++ b/msm8953-common-vendor.mk
@@ -594,7 +594,6 @@ PRODUCT_PACKAGES += \
     com.quicinc.cne.constants-V2.1-java \
     vendor.qti.data.factory-V1.0-java \
     vendor.qti.data.factory-V2.0-java \
-    vendor.qti.hardware.alarm-V1.0-java \
     vendor.qti.hardware.data.cne.internal.api-V1.0-java \
     vendor.qti.hardware.data.cne.internal.constants-V1.0-java \
     vendor.qti.hardware.data.connection-V1.0-java \
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/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar
deleted file mode 100644
index 56d7ea1..0000000
Binary files a/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar 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 9afac14..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 f3be134..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 43e79e7..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 2bc47a4..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