diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json b/components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
index e29ea19a4b..f31cd7015e 100644
--- a/components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
+++ b/components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
@@ -13,27 +13,15 @@
         "QSPI_MIN_PROG_SIZE": "1"
     },
     "target_overrides": {
-        "DISCO_F413ZH": {
-            "QSPI_FREQ": "80000000"
-        },
-        "DISCO_L475VG_IOT01A": {
+        "MX25R6435F": {
             "QSPI_FREQ": "8000000"
         },
-        "DISCO_L476VG": {
-            "QSPI_FREQ": "80000000"
-        },
-        "DISCO_L496AG": {
+        "MX25L51245G": {
             "QSPI_FREQ": "8000000"
         },
-        "DISCO_F469NI": {
+        "N25Q128A": {
             "QSPI_FREQ": "80000000"
         },
-        "DISCO_F746NG": {
-            "QSPI_FREQ": "80000000"
-        },
-        "DISCO_F769NI": {
-            "QSPI_FREQ": "8000000"
-        },
         "MCU_NRF52840": {
             "QSPI_FREQ": "32000000",
             "QSPI_MIN_READ_SIZE": "4",
diff --git a/targets/targets.json b/targets/targets.json
index 6d5e690433..dd76232c09 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2745,6 +2745,7 @@
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
+            "N25Q128A",
             "STM32F4",
             "STM32F413xx",
             "STM32F413ZH",
@@ -4072,6 +4073,7 @@
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
+            "N25Q128A",
             "STM32F4",
             "STM32F469",
             "STM32F469NI",
@@ -4233,6 +4235,7 @@
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M7F",
         "extra_labels_add": [
+            "N25Q128A",
             "STM32F7",
             "STM32F746",
             "STM32F746xG",
@@ -4287,6 +4290,7 @@
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M7FD",
         "extra_labels_add": [
+            "MX25L51245G",
             "STM32F7",
             "STM32F769",
             "STM32F769xI",
@@ -4345,6 +4349,7 @@
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
+            "MX25R6435F",
             "STM32L4",
             "STM32L475xG",
             "STM32L475VG"
@@ -4418,6 +4423,7 @@
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
+            "N25Q128A",
             "STM32L4",
             "STM32L476xG",
             "STM32L476VG"
@@ -8248,6 +8254,7 @@
         "supported_form_factors": ["ARDUINO", "STMOD", "PMOD"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
+            "MX25R6435F",
             "STM32L4",
             "STM32L496AG",
             "STM32L496xG"