diff --git a/boards/bitcraze/crazyflie/src/mtd.cpp b/boards/bitcraze/crazyflie/src/mtd.cpp
index 2255e0d60a..2b00e231b2 100644
--- a/boards/bitcraze/crazyflie/src/mtd.cpp
+++ b/boards/bitcraze/crazyflie/src/mtd.cpp
@@ -72,7 +72,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/modalai/fc-v2/src/mtd.cpp b/boards/modalai/fc-v2/src/mtd.cpp
index 765ce93e2d..644b96581d 100644
--- a/boards/modalai/fc-v2/src/mtd.cpp
+++ b/boards/modalai/fc-v2/src/mtd.cpp
@@ -71,7 +71,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/nxp/ucans32k146/src/mtd.cpp b/boards/nxp/ucans32k146/src/mtd.cpp
index 3f18a4cc02..d16cf9f2a6 100644
--- a/boards/nxp/ucans32k146/src/mtd.cpp
+++ b/boards/nxp/ucans32k146/src/mtd.cpp
@@ -66,7 +66,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/px4/fmu-v4pro/src/mtd.cpp b/boards/px4/fmu-v4pro/src/mtd.cpp
index 9c0556f45b..4bd93619db 100644
--- a/boards/px4/fmu-v4pro/src/mtd.cpp
+++ b/boards/px4/fmu-v4pro/src/mtd.cpp
@@ -65,7 +65,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/px4/fmu-v5x/src/mtd.cpp b/boards/px4/fmu-v5x/src/mtd.cpp
index f0b518699a..4e9548c275 100644
--- a/boards/px4/fmu-v5x/src/mtd.cpp
+++ b/boards/px4/fmu-v5x/src/mtd.cpp
@@ -105,7 +105,6 @@ static const px4_mtd_manifest_t board_mtd_config = {
 	.nconfigs   = 3,
 	.entries = {
 		&fmum_fram,
-		&base_eeprom,
 		&imu_eeprom
 	}
 };
@@ -117,7 +116,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/px4/fmu-v6u/src/mtd.cpp b/boards/px4/fmu-v6u/src/mtd.cpp
index 765ce93e2d..644b96581d 100644
--- a/boards/px4/fmu-v6u/src/mtd.cpp
+++ b/boards/px4/fmu-v6u/src/mtd.cpp
@@ -71,7 +71,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/boards/px4/fmu-v6x/src/mtd.cpp b/boards/px4/fmu-v6x/src/mtd.cpp
index f0b518699a..4feb42baec 100644
--- a/boards/px4/fmu-v6x/src/mtd.cpp
+++ b/boards/px4/fmu-v6x/src/mtd.cpp
@@ -117,7 +117,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts = {
+		&mtd_mft
+	}
 };
 
 const px4_mft_s *board_get_manifest(void)
diff --git a/platforms/common/include/px4_platform_common/px4_manifest.h b/platforms/common/include/px4_platform_common/px4_manifest.h
index cc646def8c..4b93b0961a 100644
--- a/platforms/common/include/px4_platform_common/px4_manifest.h
+++ b/platforms/common/include/px4_platform_common/px4_manifest.h
@@ -65,7 +65,7 @@ typedef struct {
 
 typedef struct {
 	const uint32_t        nmft;
-	const px4_mft_entry_s *mfts;
+	const px4_mft_entry_s *mfts[];
 } px4_mft_s;
 
 #include "px4_platform_common/mtd_manifest.h"
diff --git a/platforms/nuttx/src/px4/common/px4_manifest.cpp b/platforms/nuttx/src/px4/common/px4_manifest.cpp
index 6d7e322542..c66d6f9394 100644
--- a/platforms/nuttx/src/px4/common/px4_manifest.cpp
+++ b/platforms/nuttx/src/px4/common/px4_manifest.cpp
@@ -58,7 +58,9 @@ static const px4_mft_entry_s mtd_mft = {
 
 static const px4_mft_s default_mft = {
 	.nmft = 1,
-	.mfts = &mtd_mft
+	.mfts =  {
+		&mtd_mft
+	}
 };
 
 
@@ -73,9 +75,9 @@ __EXPORT int px4_mft_configure(const px4_mft_s *mft)
 
 	if (mft != nullptr) {
 		for (uint32_t m = 0; m < mft->nmft; m++) {
-			switch (mft->mfts[m].type) {
+			switch (mft->mfts[m]->type) {
 			case MTD:
-				px4_mtd_config(static_cast<const px4_mtd_manifest_t *>(mft->mfts[m].pmft));
+				px4_mtd_config(static_cast<const px4_mtd_manifest_t *>(mft->mfts[m]->pmft));
 				break;
 
 			case MFT:
@@ -95,7 +97,7 @@ __EXPORT int px4_mft_query(const px4_mft_s *mft, px4_manifest_types_e type,
 
 	if (mft != nullptr) {
 		for (uint32_t m = 0; m < mft->nmft; m++) {
-			if (mft->mfts[m].type == type)
+			if (mft->mfts[m]->type == type)
 				switch (type) {
 				case MTD:
 					return px4_mtd_query(sub, val);