diff --git a/init/init.dm3q.rc b/init/init.dm3q.rc
index 637bbff..43adc76 100644
--- a/init/init.dm3q.rc
+++ b/init/init.dm3q.rc
@@ -207,67 +207,4 @@ on post-fs-data && property:ro.csc.sales_code=DSH
     mount none /system/carrier/DSH /system/carrier bind
     mount none /mnt/temp/priv-app/Opportunistic /system/carrier/priv-app/Opportunistic bind
     umount /mnt/temp
-    rmdir /mnt/temp		
-
-# DCK properties based on target
-# DigitalKey (Supported Country) : KR,US,GB,DE,FR,IT,ES,AE,CH,KZ,SE,VN,ZA,AU,BR,CA,HK,IN,MY,SG,TW,SA
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=KR
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=US
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=GB
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=GB && property:ro.oem.key2=MET
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=GB && property:ro.oem.key2=VDI
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=GB && property:ro.oem.key2=TSI
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=GB && property:ro.oem.key2=3IE
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=DE
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=FR
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=IT
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=ES
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=AE
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=AE && property:ro.oem.key2=AFR
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=CH
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=KZ
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=SE
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=SE && property:ro.oem.key2=TEN
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=VN
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=VN && property:ro.oem.key2=XEV
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=ZA
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=ZA && property:ro.oem.key2=XFE
-    setprop ro.gms.dck.eligible_wcc 0
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=AU
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=BR
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=CA
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=HK
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=IN
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=MY
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=SG
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=TW
-    setprop ro.gms.dck.eligible_wcc 3
-on property:sys.boot_completed=1 && property:ro.csc.countryiso_code=SA
-    setprop ro.gms.dck.eligible_wcc 3
+    rmdir /mnt/temp
diff --git a/lineage_dm3q.mk b/lineage_dm3q.mk
index 00ad556..36ea9b8 100644
--- a/lineage_dm3q.mk
+++ b/lineage_dm3q.mk
@@ -23,6 +23,6 @@ PRODUCT_MANUFACTURER := Samsung
 PRODUCT_GMS_CLIENTID_BASE := android-samsung
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="dm3qxxx-user 14 UP1A.231005.007 S918BXXS6CXG8 release-keys"
+    PRIVATE_BUILD_DESC="dm3qxxx-user 14 UP1A.231005.007 S918BXXU6CXH7 release-keys"
 
-BUILD_FINGERPRINT := samsung/dm3qxxx/dm3q:14/UP1A.231005.007/S918BXXS6CXG8:user/release-keys
+BUILD_FINGERPRINT := samsung/dm3qxxx/dm3q:14/UP1A.231005.007/S918BXXU6CXH7:user/release-keys
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b6597e7..6ef347a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs are extracted from S918BXXS6CXG8
+# All unpinned blobs are extracted from S918BXXU6CXH7
 
 # ACDB
 vendor/etc/audconf/OPEN/acdb_cal.acdb
@@ -177,6 +177,7 @@ vendor/etc/nfc/libnfc-nxp_RF.conf
 vendor/etc/init/init.vendor.onebinary.rc
 vendor/etc/init/init.vendor.rilcommon.rc
 vendor/etc/init/vendor.samsung.rilchip.qcom.rc
+vendor/etc/init/vendor.samsung.rild.rc
 
 # Sensors config
 vendor/etc/sensors/config/kailua_ak991x_1.json