diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3409a34..749a61b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,6 +22,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
 # Properties
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
-# SPL
-VENDOR_SECURITY_PATCH := 2021-06-01
+# Security
+BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
+VENDOR_SECURITY_PATCH := $(BOOT_SECURITY_PATCH)
 
diff --git a/crdroid.dependencies b/lineage.dependencies
similarity index 83%
rename from crdroid.dependencies
rename to lineage.dependencies
index 1ebe7e6..0fd1dcc 100644
--- a/crdroid.dependencies
+++ b/lineage.dependencies
@@ -1,10 +1,10 @@
 [
   {
-    "repository": "crdroidandroid/android_vendor_samsung_a20",
+    "repository": "CharaROMAndroid/android_vendor_samsung_a20",
     "target_path": "vendor/samsung/a20"
   },
   {
-    "repository": "crdroidandroid/android_vendor_samsung_universal7885-common",
+    "repository": "CharaROMAndroid/android_vendor_samsung_universal7885-common",
     "target_path": "vendor/samsung/universal7885-common"
   },
   {
@@ -20,11 +20,11 @@
     "target_path": "prebuilts/clang/host/linux-x86/clang-vortex"
   },
   {
-    "repository": "crdroidandroid/android_device_samsung_universal7885-common",
+    "repository": "CharaROMAndroid/android_device_samsung_universal7885-common",
     "target_path": "device/samsung/universal7885-common"
   },
   {
-    "repository": "crdroidandroid/android_kernel_samsung_exynos7885",
+    "repository": "CharaROMAndroid/android_kernel_samsung_exynos7885",
     "target_path": "kernel/samsung/exynos7885"
   },
   {
@@ -44,9 +44,9 @@
     "target_path": "device/samsung_slsi/sepolicy"
   },
   {
-    "repository": "crdroidandroid/android_hardware_samsung",
+    "repository": "CharaROMAndroid/android_hardware_samsung",
     "target_path": "hardware/samsung",
-    "branch": "15.0-a20"
+    "branch": "hershey-a20"
   },
   {
     "repository": "crdroidandroid/android_hardware_samsung_slsi-linaro_graphics",
diff --git a/lineage_a20.mk b/lineage_a20.mk
index 6162a94..34a7d0f 100644
--- a/lineage_a20.mk
+++ b/lineage_a20.mk
@@ -29,7 +29,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildDesc="a20cis-user 11 RP1A.200720.012 A205FNXXSBCWC3 release-keys" \
     BuildFingerprint=samsung/a20cis/a20:11/RP1A.200720.012/A205FNXXSBCWC3:user/release-keys
 
-# crDroid build flags
+# CharaROM build flags
 TARGET_BOOT_ANIMATION_RES := 720
 TARGET_ENABLE_BLUR := false
 TARGET_SUPPORTS_GOOGLE_RECORDER := false
diff --git a/vendor.prop b/vendor.prop
index fcec9b6..9dd7788 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -4,3 +4,6 @@ bluetooth.device.default_name=Galaxy A20
 # Fingerprint
 ro.vendor.fingerprint.type=rear
 ro.vendor.fingerprint.supports_gestures=true
+
+# CharaROM Unencryptable Flag
+ro.chararom.encryption=unsupported
\ No newline at end of file