diff --git a/features/storage/FEATURE_STORAGE/TESTS/.mbedignore b/features/storage/FEATURE_STORAGE/TESTS/.mbedignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/features/storage/FEATURE_STORAGE/TESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h b/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
index 928c023ee4..5af0c3ae49 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
+++ b/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
@@ -82,6 +82,8 @@ extern "C" {
 #include <stdint.h>
 #include <string.h>								/* requierd for memset() in ARM_CFSTORE_HANDLE_INIT() */
 
+#include "mbed_toolchain.h"                     /* required for MBED_DEPRECATED_SINCE */
+
 #define DEVICE_STORAGE 1						/* enable storage */
 /// @cond CFSTORE_DOXYGEN_DISABLE
 #include <Driver_Storage.h>
@@ -873,6 +875,7 @@ typedef struct _ARM_DRIVER_CFSTORE
 
 
 
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "CFSTORE replace by FATFileSystem.")
 extern ARM_CFSTORE_DRIVER cfstore_driver;
 
 #ifdef __cplusplus
diff --git a/features/storage/FEATURE_STORAGE/flash-journal/flash_journal.h b/features/storage/FEATURE_STORAGE/flash-journal/flash_journal.h
index e1825195e0..07a0ad6811 100644
--- a/features/storage/FEATURE_STORAGE/flash-journal/flash_journal.h
+++ b/features/storage/FEATURE_STORAGE/flash-journal/flash_journal.h
@@ -23,6 +23,7 @@ extern "C" {
 #endif // __cplusplus
 
 #include "storage_abstraction/Driver_Storage.h"
+#include "mbed_toolchain.h"                     /* required for MBED_DEPRECATED_SINCE */
 
 /**
  * General return codes. All Flash-Journal APIs return an int32_t to allow for
@@ -288,6 +289,8 @@ typedef struct FlashJournal_t {
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_initialize(FlashJournal_t           *journal,
                                               ARM_DRIVER_STORAGE       *mtd,
                                               const FlashJournal_Ops_t *ops,
@@ -332,6 +335,8 @@ static inline int32_t FlashJournal_initialize(FlashJournal_t           *journal,
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline FlashJournal_Status_t FlashJournal_getInfo(FlashJournal_t *journal, FlashJournal_Info_t *info)
 {
     return journal->ops.getInfo(journal, info);
@@ -411,6 +416,8 @@ static inline FlashJournal_Status_t FlashJournal_getInfo(FlashJournal_t *journal
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_read(FlashJournal_t *journal, void *blob, size_t n)
 {
     return journal->ops.read(journal, blob, n);
@@ -493,6 +500,8 @@ static inline int32_t FlashJournal_read(FlashJournal_t *journal, void *blob, siz
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_readFrom(struct FlashJournal_t *journal, size_t offset, void *blob, size_t n)
 {
     return journal->ops.readFrom(journal, offset, blob, n);
@@ -605,6 +614,8 @@ static inline int32_t FlashJournal_readFrom(struct FlashJournal_t *journal, size
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_log(FlashJournal_t *journal, const void *blob, size_t n)
 {
     return journal->ops.log(journal, blob, n);
@@ -669,6 +680,8 @@ static inline int32_t FlashJournal_log(FlashJournal_t *journal, const void *blob
  *     by an operation other than a commit, that operation will very likely
  *     return an error code.
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_commit(FlashJournal_t *journal)
 {
     return journal->ops.commit(journal);
@@ -728,6 +741,8 @@ static inline int32_t FlashJournal_commit(FlashJournal_t *journal)
  *     }
  * \endcode
  */
+MBED_DEPRECATED_SINCE("mbed-os-5.5", "FlashJournal is deprecated. "
+                      "Use a BlockDevice or filesystem instead")
 static inline int32_t FlashJournal_reset(FlashJournal_t *journal)
 {
     return journal->ops.reset(journal);
diff --git a/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h b/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
index c3b12e54e4..208b3e7003 100644
--- a/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
+++ b/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
@@ -23,6 +23,7 @@
 #endif // __cplusplus
 
 #include "storage_abstraction/Driver_Storage.h"
+#include "mbed_toolchain.h"                     /* required for MBED_DEPRECATED_SINCE */
 
 #if !defined(YOTTA_CFG_STORAGE_VOLUME_MANAGER_MAX_VOLUMES)
 #define MAX_VOLUMES 4
@@ -88,6 +89,8 @@ class StorageVolumeManager; /* forward declaration */
 
 class StorageVolume {
 public:
+    MBED_DEPRECATED_SINCE("mbed-os-5.5", "StorageVolume is deprecated. "
+                          "Use MBRBlockDevice for volumes instead")
     StorageVolume() : allocated(false) { /* empty */ }
 
 public:
@@ -161,6 +164,8 @@ private:
 
 class StorageVolumeManager {
 public:
+    MBED_DEPRECATED_SINCE("mbed-os-5.5", "StorageVolumeManager is deprecated. "
+                          "Use MBRBlockDevice to manage volumes instead")
     StorageVolumeManager()  { /* empty */ }
     ~StorageVolumeManager() { /* empty */ }
 
diff --git a/hal/storage_abstraction/Driver_Common.h b/hal/storage_abstraction/Driver_Common.h
index e2908694f6..f61ff2cc1c 100644
--- a/hal/storage_abstraction/Driver_Common.h
+++ b/hal/storage_abstraction/Driver_Common.h
@@ -25,6 +25,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+/****** This file has been deprecated since mbed-os-5.5 *****/
+
 #define ARM_DRIVER_VERSION_MAJOR_MINOR(major,minor) (((major) << 8) | (minor))
 
 /**
diff --git a/hal/storage_abstraction/Driver_Storage.h b/hal/storage_abstraction/Driver_Storage.h
index 65e78b225e..76dbc88292 100644
--- a/hal/storage_abstraction/Driver_Storage.h
+++ b/hal/storage_abstraction/Driver_Storage.h
@@ -23,6 +23,8 @@
 
 #include <stdint.h>
 
+/****** This file has been deprecated since mbed-os-5.5 *****/
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus