diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk
index 679dec4..00a5e55 100644
--- a/phhgsi_arm64_a/BoardConfig.mk
+++ b/phhgsi_arm64_a/BoardConfig.mk
@@ -1,3 +1,4 @@
 include build/make/target/board/generic_arm64_a/BoardConfig.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+TARGET_SYSTEM_PROP += device/phh/treble/system.prop
diff --git a/phhgsi_arm64_ab/BoardConfig.mk b/phhgsi_arm64_ab/BoardConfig.mk
index eba9e09..d06763b 100644
--- a/phhgsi_arm64_ab/BoardConfig.mk
+++ b/phhgsi_arm64_ab/BoardConfig.mk
@@ -1,3 +1,4 @@
 include build/make/target/board/generic_arm64_ab/BoardConfig.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+TARGET_SYSTEM_PROP += device/phh/treble/system.prop
diff --git a/system.prop b/system.prop
index 9ea0ae0..c97f2d6 100644
--- a/system.prop
+++ b/system.prop
@@ -1 +1,4 @@
 ro.adb.secure=0
+#Some devices have sdcardfs kernel panicing on 8.0
+#Disable for everyone for the moment
+ro.sys.sdcardfs=0