diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
index bb32ec4a9..8c861c45e 100644
--- a/cmake/arch_build.cmake
+++ b/cmake/arch_build.cmake
@@ -703,7 +703,7 @@ function(setup_platform_msgids)
       list(APPEND OUTPUT_VAR_LIST ${CFGSRC}_cfe_${DEP_NAME}_msgids)
     endforeach(DEP_NAME ${MISSION_CORE_MODULES})
 
-    foreach(DEP_NAME ${TGTSYS_${SYSVAR}_APPS} ${TGTSYS_${SYSVAR}_STATICAPPS})
+    foreach(DEP_NAME ${MISSION_APPS})
       string(TOUPPER "${DEP_NAME}_CFGFILE_SRC" CFGSRC)
       list(APPEND OUTPUT_VAR_LIST ${CFGSRC}_${DEP_NAME}_msgids)
     endforeach(DEP_NAME ${MISSION_APPS})