diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index dfdcf0ba53..abf630be42 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit dfdcf0ba53c908d5a2f0d0f5848f6acf4799930f
+Subproject commit abf630be427e40426af172bf0eabd702697531b9
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 2eaae6ee8a..d2df99b4b5 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -964,7 +964,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_STORE_MAX_CSFCS
-#define MYNEWT_VAL_BLE_STORE_MAX_CSFCS (CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
+#define MYNEWT_VAL_BLE_STORE_MAX_CSFCS CONFIG_BT_NIMBLE_MAX_BONDS
 #endif
 
 #ifdef CONFIG_BT_NIMBLE_MAX_EADS
diff --git a/examples/bluetooth/nimble/ble_dynamic_service/main/gatt_svr.c b/examples/bluetooth/nimble/ble_dynamic_service/main/gatt_svr.c
index f6afece49c..d03ae5a013 100644
--- a/examples/bluetooth/nimble/ble_dynamic_service/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_dynamic_service/main/gatt_svr.c
@@ -60,6 +60,7 @@ const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }
diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/gatt_svr.c b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/gatt_svr.c
index 1b1bdd06dd..2c5711210d 100644
--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/gatt_svr.c
@@ -70,6 +70,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                         0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }
diff --git a/examples/bluetooth/nimble/ble_multi_adv/main/gatt_svr.c b/examples/bluetooth/nimble/ble_multi_adv/main/gatt_svr.c
index a142dc9091..ea32f61725 100644
--- a/examples/bluetooth/nimble/ble_multi_adv/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_multi_adv/main/gatt_svr.c
@@ -55,6 +55,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                         0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }
diff --git a/examples/bluetooth/nimble/bleprph/main/gatt_svr.c b/examples/bluetooth/nimble/bleprph/main/gatt_svr.c
index d48a35f0ab..75f488da57 100644
--- a/examples/bluetooth/nimble/bleprph/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/bleprph/main/gatt_svr.c
@@ -83,6 +83,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }
diff --git a/examples/bluetooth/nimble/power_save/main/gatt_svr.c b/examples/bluetooth/nimble/power_save/main/gatt_svr.c
index f59de24e10..402df8bcbc 100644
--- a/examples/bluetooth/nimble/power_save/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/power_save/main/gatt_svr.c
@@ -70,6 +70,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }