diff --git a/Android.bp b/Android.bp
index fc641df..27498a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -91,17 +91,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "PowerOffAlarm",
-	owner: "motorola",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
 android_app_import {
 	name: "uimgbaservice",
 	owner: "motorola",
@@ -124,6 +113,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "PowerOffAlarm",
+	owner: "motorola",
+	apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephony",
 	owner: "motorola",
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
deleted file mode 100644
index e2cb63e..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..2720548
Binary files /dev/null and b/proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk differ
diff --git a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
index a93afe6..3372129 100644
Binary files a/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar and b/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar differ
diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk
index 8735405..e813cdd 100644
--- a/sm7325-common-vendor.mk
+++ b/sm7325-common-vendor.mk
@@ -1085,9 +1085,9 @@ PRODUCT_PACKAGES += \
     CneApp \
     IWlanService \
     TimeService \
-    PowerOffAlarm \
     uimgbaservice \
     ImsRcsService \
+    PowerOffAlarm \
     QtiTelephony \
     QtiTelephonyService \
     WfdService \