diff --git a/device.mk b/device.mk
index 5ca99748..fc185c81 100755
--- a/device.mk
+++ b/device.mk
@@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init.qcom.ipastart.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.ipastart.sh \
     $(LOCAL_PATH)/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh \
     $(LOCAL_PATH)/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
-    $(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/init.ramoops.sh \
+    $(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh \
     frameworks/native/services/vr/virtual_touchpad/idc/vr-virtual-touchpad-0.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/vr-virtual-touchpad-0.idc \
     frameworks/native/services/vr/virtual_touchpad/idc/vr-virtual-touchpad-1.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/vr-virtual-touchpad-1.idc
 
diff --git a/init.hardware.rc b/init.hardware.rc
index c9936d39..d5e59a17 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -232,20 +232,6 @@ on post-fs
     # Wait qseecomd started
     wait_for_prop sys.listeners.registered true
 
-on property:sys.user.0.ce_available=true
-    mkdir /data/misc_ce/0/ramoops
-    start vendor.ramoops_sh
-
-on property:sys.ramoops.decrypted=true
-    mount pstore pstore /sys/fs/pstore
-    chown system log /sys/fs/pstore
-    chown system log /sys/fs/pstore/console-ramoops
-    chmod 0440 /sys/fs/pstore/console-ramoops
-    chown system log /sys/fs/pstore/console-ramoops-0
-    chmod 0440 /sys/fs/pstore/console-ramoops-0
-    chown system log /sys/fs/pstore/pmsg-ramoops-0
-    chmod 0440 /sys/fs/pstore/pmsg-ramoops-0
-
 on property:sys.listeners.registered=true
     # load IPA FWs
     start vendor.ipastart_sh
@@ -489,13 +475,6 @@ on boot
     # default country code
     setprop ro.boot.wificountrycode 00
 
-    # Encrypted ramoops
-    umount /sys/fs/pstore
-    chmod 770 /dev/access-ramoops
-    chown system system /dev/access-ramoops
-    chmod 770 /dev/access-metadata
-    chown system system /dev/access-metadata
-
     # Make the ftm4 command node writeable from dumpstate
     chown system system /sys/devices/virtual/input/ftm4_touch/cmd
 
@@ -861,13 +840,6 @@ service vendor.insmod_sh /vendor/bin/init.insmod.sh
     disabled
     oneshot
 
-service vendor.ramoops_sh /system/bin/init.ramoops.sh
-    class main
-    user root
-    group root system
-    disabled
-    oneshot
-
 # b/70518189 vDSO experiments
 on property:sys.vdso=*
    write /sys/module/vdso/parameters/enable_32 1
diff --git a/init.ramoops.sh b/init.ramoops.sh
index 4c57a1a1..37b69e54 100644
--- a/init.ramoops.sh
+++ b/init.ramoops.sh
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/vendor/bin/sh
 
 # Decrypt the keys and write them to the kernel
 ramoops -D
@@ -7,11 +7,11 @@ if [ $? -eq 0 ]; then
     # Pivot (and decrypt)
     echo 1 > /sys/devices/virtual/ramoops/pstore/use_alt
 else
-    setprop sys.ramoops.decryption.error $?
+    setprop vendor.ramoops.decryption.error $?
 fi
 
 # Trigger remount of pstore regardless of decryption state
-setprop sys.ramoops.decrypted true
+setprop vendor.ramoops.decrypted true
 
 # Generate keys (if none exist), and load the keys to carveout
 if [[ $(getprop ro.hardware) == "walleye" ]]; then