diff --git a/device.mk b/device.mk
index 8cddaf5..4f6b4ca 100644
--- a/device.mk
+++ b/device.mk
@@ -155,7 +155,7 @@
 
 # Resume on Reboot support
 PRODUCT_PACKAGES += \
-    android.hardware.rebootescrow-service.default
+    android.hardware.rebootescrow-service.citadel
 
 # Use Sdcardfs
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/init.hardware.rc b/init.hardware.rc
index fd0327e..9d7d5ef 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -260,6 +260,10 @@
     # Setup folder for modem fdr
     mkdir /data/vendor/modem_fdr 0700 root system
 
+    # Resume-on-Reboot after we have the data dir and keymaster
+    mkdir /data/vendor/rebootescrow 0770 hsm hsm
+    start vendor.rebootescrow-citadel
+
     # keep that at the end of on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1