diff --git a/fsw/platform_inc/cf_msgids.h b/fsw/platform_inc/cf_msgids.h
index d3484717..a208d482 100644
--- a/fsw/platform_inc/cf_msgids.h
+++ b/fsw/platform_inc/cf_msgids.h
@@ -25,14 +25,45 @@
 #ifndef CF_MSGIDS_H
 #define CF_MSGIDS_H
 
+#include "cfe_msgids.h"
+#include "cfe_mission_cfg.h"
+
+/*
+ * Define a set of backup msg offsets, in case the user has not added these
+ * to the global mission config header.  This also facilitates the bundle build.
+ * However normally one should set a value for these in cfe_mission_cfg.h.
+ */
+#ifndef CFE_MISSION_CF_CMD_MSG
+#define CFE_MISSION_CF_CMD_MSG 0xB3
+#endif
+
+#ifndef CFE_MISSION_CF_SEND_HK_MSG
+#define CFE_MISSION_CF_SEND_HK_MSG 0xB4
+#endif
+
+#ifndef CFE_MISSION_CF_WAKE_UP_MSG
+#define CFE_MISSION_CF_WAKE_UP_MSG 0xB5
+#endif
+
+#ifndef CFE_MISSION_CF_HK_TLM_MSG
+#define CFE_MISSION_CF_HK_TLM_MSG 0xB0
+#endif
+
+#ifndef CFE_MISSION_CF_CONFIG_TLM_MSG
+#define CFE_MISSION_CF_CONFIG_TLM_MSG 0xB2
+#endif
+
 /**
  * \defgroup cfscfcmdmid CFS CFDP Command Message IDs
  * \{
  */
 
-#define CF_CMD_MID     (0x18B3) /**< \brief Message ID for commands */
-#define CF_SEND_HK_MID (0x18B4) /**< \brief Message ID to request housekeeping telemetry */
-#define CF_WAKE_UP_MID (0x18B5) /**< \brief Message ID for waking up the processing cycle */
+#define CF_CMD_MID CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_CF_CMD_MSG /**< \brief Message ID for commands */
+#define CF_SEND_HK_MID \
+    CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_CF_SEND_HK_MSG /**< \brief Message ID to request housekeeping telemetry */
+#define CF_WAKE_UP_MID                                                                                               \
+    CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_CF_WAKE_UP_MSG /**< \brief Message ID for waking up the processing cycle \
+                                                            */
 
 /**\}*/
 
@@ -41,8 +72,10 @@
  * \{
  */
 
-#define CF_HK_TLM_MID     (0x08B0) /**< \brief Message ID for housekeeping telemetry */
-#define CF_CONFIG_TLM_MID (0x08B2) /**< \brief Message ID for configuration telemetry */
+#define CF_HK_TLM_MID \
+    CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_CF_HK_TLM_MSG /**< \brief Message ID for housekeeping telemetry */
+#define CF_CONFIG_TLM_MID \
+    CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_CF_CONFIG_TLM_MSG /**< \brief Message ID for configuration telemetry */
 
 /**\}*/