diff --git a/BoardConfig.mk b/BoardConfig.mk
index 59cceb0..acb8a5b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,6 +7,9 @@
 # Inherit from sm6150-common
 include device/xiaomi/sm6150-common/BoardConfigCommon.mk
 
+# Inherit from Dolby
+-include device/oneplus/dolby/BoardConfig.mk
+
 # MiuiCamera
 -include device/xiaomi/miuicamera-sweet/BoardConfig.mk
 
diff --git a/device.mk b/device.mk
index 0d2d053..b08c559 100644
--- a/device.mk
+++ b/device.mk
@@ -7,6 +7,9 @@
 # Inherit from sm6150-common
 $(call inherit-product, device/xiaomi/sm6150-common/sm6150.mk)
 
+# Inherit from dolby
+$(call inherit-product-if-exists, device/oneplus/dolby/device.mk)
+
 # MiuiCamera
 $(call inherit-product-if-exists, device/xiaomi/miuicamera-sweet/device.mk)
 
@@ -35,6 +38,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     hwcomposer.sweet
 
+# Dolby
+TARGET_USES_DOLBY := true
+
 # Init scripts
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/init.sweet.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.sweet.rc
diff --git a/evolution.dependencies b/evolution.dependencies
index e29fc31..da36579 100644
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -37,8 +37,14 @@
   },
   {
     "remote": "github-non-los",
-    "repository": "SoulEye-sweet/hardware_dolby",
-    "target_path": "hardware/dolby",
+    "repository": "SoulEye-sweet/device_oneplus_dolby",
+    "target_path": "device/oneplus/dolby",
+    "branch": "bka"
+  },
+  {
+    "remote": "codeberg",
+    "repository": "SoulEye-sweet/vendor_oneplus_dolby",
+    "target_path": "vendor/oneplus/dolby",
     "branch": "bka"
   },
   {