diff --git a/components/bt/esp_ble_mesh/mesh_core/main.c b/components/bt/esp_ble_mesh/mesh_core/main.c
index 64710ddc1..978a0aa24 100644
--- a/components/bt/esp_ble_mesh/mesh_core/main.c
+++ b/components/bt/esp_ble_mesh/mesh_core/main.c
@@ -336,17 +336,16 @@ int bt_mesh_init(const struct bt_mesh_prov *prov,
         bt_mesh_gatt_init();
     }
 
-    if (IS_ENABLED(CONFIG_BLE_MESH_PROXY)) {
-        if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) &&
-            IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) ||
-            IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) {
-            bt_mesh_proxy_init();
-        }
-        if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
-            IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) ||
-            IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_CLIENT)) {
-            bt_mesh_proxy_prov_client_init();
-        }
+    if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) &&
+        IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) ||
+        IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) {
+        bt_mesh_proxy_init();
+    }
+
+    if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
+        IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) ||
+        IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_CLIENT)) {
+        bt_mesh_proxy_prov_client_init();
     }
 
     if (IS_ENABLED(CONFIG_BLE_MESH_PROV)) {
@@ -444,10 +443,10 @@ int bt_mesh_deinit(struct bt_mesh_deinit_param *param)
 
     bt_mesh_beacon_deinit();
 
-    if (IS_ENABLED(CONFIG_BLE_MESH_PROXY)) {
-        if (IS_ENABLED(CONFIG_BLE_MESH_NODE)) {
-            bt_mesh_proxy_deinit();
-        }
+    if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) &&
+        IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) ||
+        IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) {
+        bt_mesh_proxy_deinit();
     }
 
     if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid
index e9b0c0b0f..ef14cf978 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid
@@ -8,6 +8,8 @@ CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Enable  | Enable       | Disable      |
 CONFIG_BLE_MESH=y
 CONFIG_BLE_MESH_NODE=y
 CONFIG_BLE_MESH_PB_GATT=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00
new file mode 100644
index 000000000..ffe217d40
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00
@@ -0,0 +1,17 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Disable | Disable      | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_GATT_PROXY_SERVER=n
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01
new file mode 100644
index 000000000..219a495d4
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01
@@ -0,0 +1,16 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Disable | Enable       | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02
new file mode 100644
index 000000000..e212fccea
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02
@@ -0,0 +1,18 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Disable | Disable      | Enable       |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_GATT_PROXY_SERVER=n
+CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03
new file mode 100644
index 000000000..63b2e21f9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03
@@ -0,0 +1,17 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Enable  | Disable      | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_GATT_PROXY_SERVER=n
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04
new file mode 100644
index 000000000..5f243c626
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04
@@ -0,0 +1,18 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Server | Proxy Client |
+#| Enable | Enable  | Disable      | Enable       |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_GATT_PROXY_SERVER=n
+CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05
new file mode 100644
index 000000000..714f8f3f0
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05
@@ -0,0 +1,18 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy   | PB-GATT | Proxy Server | Proxy Client |
+#| Disable | Disable | Disable      | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_GATT_PROXY_SERVER=n
+CONFIG_BLE_MESH_PROXY=n
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid
index 935a2823f..f961bd803 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid
@@ -7,6 +7,8 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
+#| Proxy  | PB-GATT | Proxy Client |
+#| Enable | Enable  | Disable      |
 CONFIG_BLE_MESH=y
 CONFIG_BLE_MESH_PROVISIONER=y
 CONFIG_BLE_MESH_PB_GATT=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00
new file mode 100644
index 000000000..da5fd368f
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00
@@ -0,0 +1,16 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Client |
+#| Enable | Disable | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01
new file mode 100644
index 000000000..9b55d0576
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01
@@ -0,0 +1,17 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Client |
+#| Enable | Disable | Enable       |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02
new file mode 100644
index 000000000..a3bf24757
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02
@@ -0,0 +1,17 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy  | PB-GATT | Proxy Client |
+#| Enable | Enable  | Enable       |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03
new file mode 100644
index 000000000..5fec5b9c6
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03
@@ -0,0 +1,17 @@
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=n
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+#| Proxy   | PB-GATT | Proxy Client |
+#| Disable | Disable | Disable      |
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=n
+CONFIG_BLE_MESH_PROXY=n
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y