diff --git a/features/storage/kvstore/conf/filesystem/mbed_lib.json b/features/storage/kvstore/conf/filesystem/mbed_lib.json
index 5afb3ce7aa..85b27cbf4d 100644
--- a/features/storage/kvstore/conf/filesystem/mbed_lib.json
+++ b/features/storage/kvstore/conf/filesystem/mbed_lib.json
@@ -33,6 +33,10 @@
             "help": "Path for the working directory where the FileSystemStore stores the data",
             "value": "kvstore"
         }
+    },
+    "target_overrides": {
+        "MCU_PSOC6": {
+            "rbp_internal_size": 7168
+        }
     }
 }
-
diff --git a/features/storage/kvstore/conf/tdb_external/mbed_lib.json b/features/storage/kvstore/conf/tdb_external/mbed_lib.json
index 215cd888eb..b4d0fb6923 100644
--- a/features/storage/kvstore/conf/tdb_external/mbed_lib.json
+++ b/features/storage/kvstore/conf/tdb_external/mbed_lib.json
@@ -1,5 +1,4 @@
 {
-
     "name": "storage_tdb_external",
     "config": {
         "rbp_internal_size": {
@@ -22,5 +21,10 @@
             "help": "The default will set start address to address 0",
             "value": "0"
         }
+    },
+    "target_overrides": {
+        "MCU_PSOC6": {
+            "rbp_internal_size": "7168"
+        }
     }
-}
\ No newline at end of file
+}