diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index d3d5c84b43..ca668cf0aa 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit d3d5c84b43fc8c790c7b389416fc391b8e9475a6
+Subproject commit ca668cf0aa11704f3fde4b641cb2a30758792975
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
index 96d31f84a2..aa69f6579f 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -91,6 +91,7 @@
 #define BLE_50_FEATURE_SUPPORT (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
 #endif
 #endif
+
 #ifndef CONFIG_BT_NIMBLE_EXT_ADV
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #else
@@ -141,25 +142,25 @@
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_BROADCASTER
-#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1)
+#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_CENTRAL
-#define MYNEWT_VAL_BLE_ROLE_CENTRAL (1)
+#define MYNEWT_VAL_BLE_ROLE_CENTRAL (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_CENTRAL (CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_OBSERVER
-#define MYNEWT_VAL_BLE_ROLE_OBSERVER (1)
+#define MYNEWT_VAL_BLE_ROLE_OBSERVER (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_OBSERVER (CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
-#define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (1)
+#define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 #endif
@@ -320,7 +321,7 @@
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_HCI_UART_PORT
-#define MYNEWT_VAL_BLE_HCI_UART_PORT (1)
+#define MYNEWT_VAL_BLE_HCI_UART_PORT (0)
 #else
 #define MYNEWT_VAL_BLE_HCI_UART_PORT (CONFIG_BT_NIMBLE_HCI_UART_PORT)
 #endif