diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fd22692..4f95de8 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2023 The LineageOS Project
+# Copyright (C) 2018-2022 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -70,35 +70,21 @@ TARGET_LMKD_STATS_LOG := true
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67092480
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 57453555712
-
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_PARTITION_SIZE := 872415232
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
 
-BOARD_SUPER_PARTITION_BLOCK_DEVICES := system vendor cust
-BOARD_SUPER_PARTITION_METADATA_DEVICE := system
-BOARD_SUPER_PARTITION_SIZE := 5167382528
-BOARD_SUPER_PARTITION_CUST_DEVICE_SIZE := 872415232
-BOARD_SUPER_PARTITION_SYSTEM_DEVICE_SIZE := 3221225472
-BOARD_SUPER_PARTITION_VENDOR_DEVICE_SIZE := 1073741824
-
-BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
-BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor
-BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 5163188224 # (BOARD_SUPER_PARTITION_SIZE - 4194304) 4MiB overhead
-
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
 
-TARGET_COPY_OUT_ODM := odm
-TARGET_COPY_OUT_PRODUCT := product
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 TARGET_COPY_OUT_VENDOR := vendor
 
diff --git a/sdm845.mk b/sdm845.mk
index e1549a5..a4cdd82 100644
--- a/sdm845.mk
+++ b/sdm845.mk
@@ -292,9 +292,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.neuralnetworks@1.3.vendor
 
-# Partitions
-PRODUCT_USE_DYNAMIC_PARTITIONS := true
-
 # Perfd (dummy)
 PRODUCT_PACKAGES += \
     libqti-perfd-client
diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te
index 54602e1..843d61a 100644
--- a/sepolicy/vendor/device.te
+++ b/sepolicy/vendor/device.te
@@ -1,5 +1,3 @@
-typeattribute system_block_device super_block_device_type;
-
 type fingerprint_device, dev_type;
 
 type gps_device, dev_type;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 6fdab49..0ce67ad 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -1,11 +1,6 @@
 # Audio devices
 /dev/elliptic(.*)?                            u:object_r:sound_device:s0
 
-# Block devices
-/dev/block/platform/soc/1d84000\.ufshc/by-name/cust      u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/system    u:object_r:system_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor    u:object_r:system_block_device:s0
-
 # Camera
 /(vendor|system/vendor)/bin/remosaic_daemon   u:object_r:remosaic_daemon_exec:s0