diff --git a/apps/gateway/sdkconfig b/apps/gateway/sdkconfig
index ee3638d..000d0ae 100644
--- a/apps/gateway/sdkconfig
+++ b/apps/gateway/sdkconfig
@@ -622,9 +622,12 @@ CONFIG_GATEWAY_CHANNEL1_NATIVE_BAUDRATE=1200
 #
 CONFIG_GATEWAY_CACHE_SUPPORTED=y
 CONFIG_GATEWAY_CACHE_START_ENABLED=y
-# CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED is not set
+CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED=y
+CONFIG_GATEWAY_CACHE_FULL_STATE_MIRROR=y
 CONFIG_GATEWAY_CACHE_FLUSH_INTERVAL_MS=10000
 CONFIG_GATEWAY_CACHE_REFRESH_INTERVAL_MS=120000
+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
diff --git a/apps/gateway/sdkconfig.old b/apps/gateway/sdkconfig.old
index ce636b7..2b1e99a 100644
--- a/apps/gateway/sdkconfig.old
+++ b/apps/gateway/sdkconfig.old
@@ -2781,10 +2781,10 @@ 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=25
-CONFIG_DALI_DOUBLE_SEND_DELAY_MS=15
-CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=15
-CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=5
+CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=30
+CONFIG_DALI_DOUBLE_SEND_DELAY_MS=20
+CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=20
+CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=10
 CONFIG_DALI_FORWARD_MAX_WAIT_MS=50
 CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=10
 CONFIG_DALI_BUS_POWER_CHECK_INTERVAL_MS=500