diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index bb81701..066f820 100755
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -90,10 +90,10 @@
                 <mixPort name="primary input" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_AMBISONIC,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_AMBISONIC,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
                 </mixPort>
                 <mixPort name="scc input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/sku_yupik/audio_platform_info.xml b/audio/sku_yupik/audio_platform_info.xml
index 542af86..8e75d0d 100755
--- a/audio/sku_yupik/audio_platform_info.xml
+++ b/audio/sku_yupik/audio_platform_info.xml
@@ -109,7 +109,7 @@
         <param key="hifi_filter" value="false"/>
         <param key="native_audio_mode" value="multiple_mix_dsp"/>
         <param key="hfp_pcm_dev_id" value="39"/>
-        <param key="input_mic_max_count" value="3"/>
+        <param key="input_mic_max_count" value="2"/>
     </config_params>
     <gain_db_to_level_mapping>
         <gain_level_map db="-59" level="5"/>
diff --git a/lineage_dubai.mk b/lineage_dubai.mk
index 72dbc6e..9253ccc 100644
--- a/lineage_dubai.mk
+++ b/lineage_dubai.mk
@@ -1,17 +1,7 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # Inherit from those products. Most specific first.
@@ -34,6 +24,6 @@ PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     TARGET_PRODUCT=dubai_g \
-    PRIVATE_BUILD_DESC="dubai_g-user 12 S1RDS32.55-106-4 b635a-d573f release-keys"
+    PRIVATE_BUILD_DESC="dubai_g-user 13 T1RD33.116-33-3 f829db-a0c97 release-keys"
 
-BUILD_FINGERPRINT := motorola/dubai_g/dubai:12/S1RDS32.55-106-4/b635a-d573f:user/release-keys
+BUILD_FINGERPRINT := motorola/dubai_g/dubai:13/T1RD33.116-33-3/f829db-a0c97:user/release-keys
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 5edfa36..84a56ef 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from dubai_g-user 12 S1RDS32.55-106-4 b635a-d573f release-keys.
+# All unpinned blobs below are extracted from dubai_g-user 13 T1RD33.116-33-3 f829db-a0c97 release-keys.
 
 # ACDB Data
 vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd
@@ -472,73 +472,24 @@ vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so
 vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
 
 # HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk
--product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
 # MotCamera4
--product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED
+product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED
 product/etc/init/init.motcamera3.lens.rc
--product/priv-app/MotCamera4/MotCamera4.apk;OVERRIDES=Aperture|8bddc6ce07554ca3f04edb92a16378925a9f72f2
-system_ext/etc/public.libraries-motocamera.txt
-system_ext/framework/com.motorola.androidx.camera.extensions.jar
-system_ext/lib/libmcf_native_window_helper.motocamera.so
-system_ext/lib64/libmcf_native_window_helper.motocamera.so
-
-# MotCamera4 - Libs
-product/lib64/libFNVfbEngineHAL.so|a7365d9e7d728df8d4ad6ecfba07961fcf924d75
-product/lib64/libNvBeautyEffect.so|cd80f5049b2f668379f1d3ecbf6e6206de20a46d
-product/lib64/libSNPE.so|ddcec410b42f85808bb8b0d8359c7a6490a934de
-product/lib64/libSuperSensorCPU_v05052021.so|22378fd888fc13dac8f46a250f101dbcdb6d44bc
-product/lib64/libSuperSensorProcessorCWrapper_v2.so|7e66994ee9b8c7d637afb58e0e341e5c94cf23a2
-product/lib64/libSuperSensorProcessor_v05052021.so|2c9204b230bddd089070e5b9238c85b9fe6d94f8
-product/lib64/libSuperSensor_v05052021.so|dfbfc247087c8f9dfc86401918c8026b06eaf4a5
-product/lib64/libarcsoft_dualcam_refocus.so|901b7aa334b13dc2ae3a31f2fb42f3f4b2f4a63a
-product/lib64/libarcsoft_dualcam_refocus_Adreno730.so|901b7aa334b13dc2ae3a31f2fb42f3f4b2f4a63a
-product/lib64/libarcsoft_frc.so|dab92e6bd066b44bb557f24c9cb2c587df2aab46
-product/lib64/libarcsoft_hdr_detection.so|b6ddc0c9189439c9cceb14e47f387d62f959026d
-product/lib64/libarcsoft_hdr_scbokeh_image.so|fa8bec89246f3e9e7aa1cfeb79b60199b8d0daaa
-product/lib64/libarcsoft_high_dynamic_range.so|ffda26c1012d7b638235d5e1441173c997c9dbaa
-product/lib64/libarcsoft_multiframe_bokeh_image.so|83dbf82c1b472faf5630dd6dbbc7e43be3a4f6fc
-product/lib64/libarcsoft_scbokeh_Generic.so|11e3482bbedb363b2c2a687934a7df9eee3d3bae
-product/lib64/libarcsoft_supernight.so|e511b76bda44f55e97c94a8f0ea35a9c4e2e3cbc
-product/lib64/libarcsoft_superportrait.so|920206471220f5e9abc4f62941f8bbce9c303b60
-product/lib64/libas-super-slow-motion.so|f8405a2ed321236fe07e84130cff924aeefbbd94
-product/lib64/libbarhopper_v3.so|01401953109a122c281f7e625cd6099433b34bb7
-product/lib64/libbg-postproc-jni.so|7454ef84010b2adcabbd90a2f8058020dbefd326
-product/lib64/libc++.so|e8707820517ab7713b8ca6ac4462361e00629c26
-product/lib64/libc++_shared.so|dbbd9e4d06e2566c31bdc744dd7391536a780cc6
-product/lib64/libcamerax_extension_jni.so|bd75a62e3a09fdc8340578718c056d9236e0f49b
-product/lib64/libcolorseg.so|470a2c074f252be7d9cb9f4dfe5237c55802704e
-product/lib64/libdoc-util.so|9741eae3b03919b1bf3305086343bcd7b26322dd
-product/lib64/libdynamic_depth.so|515f03132a086f15c565dd89b192ede5eeca7e29
-product/lib64/libfn-beauty-vfb-base.so|2116a9a2f2ff5e49e575e00985c3e18d295cdfbc
-product/lib64/libfoundation.so|e72e585973f06d83fb9c2608daf50a20b65c4b80
-product/lib64/libgg-dynamic_depth.so|16acd810ca1787a534ea3054839049d03ad1843f
-product/lib64/libgg-tensorflow-lite.so|58330e568802be231b74fed1461d6ea68a88fee3
-product/lib64/libgif.so|310d708f0c9b60c065514c1e3f1534c8ba347c7d
-product/lib64/libjpeg.so|a51f6dde2a6d7eb11378a2575a5e6bf625a15bbb
-product/lib64/liblenovo_panorama.so|31cc6042e0cdd661fa9ccd6472058d90dfde00d8
-product/lib64/libmcf-base.so|40fc0e39dd293b88185381fd7c7bfe3b22e329b5
-product/lib64/libmcf-jni.so|b7bf8344d350638ebb63e2d391fce5a2aa8e3981
-product/lib64/libmcf-qc-fd-offline_local.so|99d2dbab152e22d6ae3d552cee3a172fc886ba24
-product/lib64/libmcf-stand-alone-sm.so|3554a93bdf54079e54ec2292d5880bc0b7b7b42b
-product/lib64/libmeishe-nv-effects-thumbnails.so|0fa0e52431296bc34a9b9b652d8ea6b32c591e8d
-product/lib64/libmmcamera_faceproc2.so|1c732d58bf24c939f568cda340318e5b873dce3b
-product/lib64/libmorpho_cinema_graph.so|c689a3734f6963b6ad4be3a9ddfae00c1c82acb0
-product/lib64/libmorpho_easy_hdr.so|2f9b5fcc74a022d492fc20fc09b5cb3fec2ba0e4
-product/lib64/libmorpho_image_refiner_1_4_2.so|3e99884fc3ee27f9c607f5d8717acddbbddcb582
-product/lib64/libmorpho_panorama_gp3.so|b8ef93fa1b2bcc7f3166bfe8783d650182299935
-product/lib64/libmorpho_sensor_fusion.so|eee6c344fc928d2c20a5e7a139d88d7cdbac7a73
-product/lib64/libmot-cinemagraph-engine.so|788df0fddf6635997e2599315a4be1c162f7cd7d
-product/lib64/libmot-util.so|704b6032528691074dfffd28a72b3b1e11ae4526
-product/lib64/libmpbase.so|07021c39abbc5c8538f6df1876a3eb3015ff9c2a
-product/lib64/libqc-snpe.so|9b6fbb44cd3083ac4e1fa9db1666c58567206890
-product/lib64/libsmart_ppt.so|bc562289e07bb64095effd8ed473d822272b53b9
-product/lib64/libsmudge_detect.so|915e44b5013096b846b87c539d92200a0b048d23
-product/lib64/libtensorflowlite.so|17f94dc427220788db8f10d658d3a330488ac7d6
-product/lib64/libtensorflowlite_gpu_delegate.so|821bcbece27d47c49daac00a65fdf48213befad1
+product/priv-app/MotCamera4/MotCamera4.apk;OVERRIDES=Aperture;PRESIGNED
+-system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
+system/etc/init/cameraserver.rc
+system/framework/com.motorola.motosignature.jar
+system/framework/moto-core_services.jar
+system/framework/moto-settings.jar
+system_ext/bin/motsettings
+system_ext/lib/libavenhancements.so
+system_ext/lib64/libavenhancements.so
+-system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
 
 # MotCamera4 - Permissions
 product/etc/permissions/com.motorola.camera3.content.ai.xml
@@ -547,7 +498,9 @@ product/etc/permissions/com.motorola.camera3.xml
 product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
 product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
 product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
-system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
+system/etc/permissions/com.motorola.motosignature.xml
+system/etc/permissions/moto-core_services.xml
+system/etc/permissions/moto-settings.xml
 
 # NFC
 vendor/bin/STFlashTool