diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index fba8c1a8afc..539c38c838e 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -426,28 +426,28 @@ menu "GATT / ATT"
     config BT_NIMBLE_GATT_CACHING_MAX_SVCS
         int "Maximum number of services per connection"
         depends on BT_NIMBLE_GATT_CACHING
-        default 64
+        default 8
         help
             Set this option to set the upper limit on number of services per connection to be cached.
 
     config BT_NIMBLE_GATT_CACHING_MAX_INCL_SVCS
         int "Maximum number of included services per connection"
         depends on BT_NIMBLE_GATT_CACHING
-        default 64
+        default 8
         help
             Set this option to set the upper limit on number of included services per connection to be cached.
 
     config BT_NIMBLE_GATT_CACHING_MAX_CHRS
         int "Maximum number of characteristics per connection"
         depends on BT_NIMBLE_GATT_CACHING
-        default 64
+        default 58
         help
             Set this option to set the upper limit on number of characteristics per connection to be cached.
 
     config BT_NIMBLE_GATT_CACHING_MAX_DSCS
         int "Maximum number of descriptors per connection"
         depends on BT_NIMBLE_GATT_CACHING
-        default 64
+        default 58
         help
             Set this option to set the upper limit on number of descriptors per connection to be cached.
 
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index 83794b7c5fc..6ad55ca0aa7 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 83794b7c5fcdb1fab972c1ebbc35cd47abaef8f0
+Subproject commit 6ad55ca0aa7f0db03b6301e2f4a8d03309427f7b