diff --git a/apps/gateway/sdkconfig b/apps/gateway/sdkconfig
index 3185a61..c65199a 100644
--- a/apps/gateway/sdkconfig
+++ b/apps/gateway/sdkconfig
@@ -622,11 +622,8 @@ CONFIG_GATEWAY_CHANNEL1_NATIVE_BAUDRATE=1200
 #
 CONFIG_GATEWAY_CACHE_SUPPORTED=y
 CONFIG_GATEWAY_CACHE_START_ENABLED=y
-CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED=y
-# CONFIG_GATEWAY_CACHE_FULL_STATE_MIRROR is not set
+# CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED is not set
 CONFIG_GATEWAY_CACHE_FLUSH_INTERVAL_MS=60000
-CONFIG_GATEWAY_CACHE_OUTSIDE_BUS_FIRST=y
-# CONFIG_GATEWAY_CACHE_LOCAL_GATEWAY_FIRST is not set
 # end of Gateway Cache
 
 # CONFIG_GATEWAY_ENABLE_DALI_BUS is not set
@@ -2775,9 +2772,9 @@ CONFIG_DALI_TIMER_RESOLUTION_HZ=3636363
 CONFIG_DALI_CUSTOM_HALF_BIT_TIME_X100_US=0
 CONFIG_DALI_TX_STOP_CONDITION_US=0
 CONFIG_DALI_RX_STOP_CONDITION_US=0
-CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=20
+CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=25
 CONFIG_DALI_DOUBLE_SEND_DELAY_MS=15
-CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=20
+CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=15
 CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=5
 CONFIG_DALI_FORWARD_MAX_WAIT_MS=50
 CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=10
diff --git a/apps/gateway/sdkconfig.old b/apps/gateway/sdkconfig.old
index 53024d5..3ff6cc8 100644
--- a/apps/gateway/sdkconfig.old
+++ b/apps/gateway/sdkconfig.old
@@ -1,3 +1,7 @@
+#
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) 5.5.4 Project Configuration
+#
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_UART_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
@@ -1129,8 +1133,8 @@ CONFIG_BT_CTRL_BLE_ADV=y
 # Common Options
 #
 CONFIG_BT_ALARM_MAX_NUM=50
-CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT=y
-# CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS is not set
+# CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT is not set
+CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS=y
 
 #
 # BLE Log
@@ -2771,9 +2775,9 @@ CONFIG_DALI_TIMER_RESOLUTION_HZ=3636363
 CONFIG_DALI_CUSTOM_HALF_BIT_TIME_X100_US=0
 CONFIG_DALI_TX_STOP_CONDITION_US=0
 CONFIG_DALI_RX_STOP_CONDITION_US=0
-CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=20
+CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=25
 CONFIG_DALI_DOUBLE_SEND_DELAY_MS=15
-CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=20
+CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=15
 CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=5
 CONFIG_DALI_FORWARD_MAX_WAIT_MS=50
 CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=10