diff --git a/CMakeLists.txt b/CMakeLists.txt
index b35aaa15..93eb267b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,12 +81,12 @@ else()
 endif()
 
 set(OBSW_ADD_TMTC_TCP_SERVER
-    # TODO: Activate TCP server until VC0 issue has been resolved
+    # TODO: Only activate on EM when VC0 issue has been resolved.
     # ${OBSW_Q7S_EM}
     1
     CACHE STRING "Add TCP TMTC Server")
 set(OBSW_ADD_TMTC_UDP_SERVER
-    # TODO: Activate UDP server on FM until VC0 issue has been resolved
+    # TODO: Disable completely when VC0 issue has been resolved
     # 0
     ${INIT_VAL}
     CACHE STRING "Add UDP TMTC Server")