diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8321e0f6..e6dfd20f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,8 @@ will consitute of a breaking change warranting a new major release:
 - Handling of multiple RWs in the ACS Controller is improved and can be changed by parameter
   commands.
 - Moved PDU `vcc` and `vbat` variable from auxiliary dataset to core dataset.
+- Tweak TCP/IP configuration: Only the TCP server will be included on the EM. For the FM, no
+  TCP/IP servers will be included by default.
 
 ## Added
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaa2d340..8256dc27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,13 @@ else()
   set(INIT_VAL 1)
   set(OBSW_STAR_TRACKER_GROUND_CONFIG 0)
 endif()
+
+set(OBSW_ADD_TMTC_TCP_SERVER
+    ${OBSW_Q7S_EM}
+    CACHE STRING "Add TCP TMTC Server")
+set(OBSW_ADD_TMTC_UDP_SERVER
+    0
+    CACHE STRING "Add UDP TMTC Server")
 set(OBSW_ADD_MGT
     ${INIT_VAL}
     CACHE STRING "Add MGT module")
diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in
index 1c0a4db8..2555d7cd 100644
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/bsp_q7s/OBSWConfig.h.in
@@ -67,8 +67,8 @@
 // because UDP packets are not allowed in the VPN
 // This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the
 // CCSDS IP Cores. 
-#define OBSW_ADD_TMTC_TCP_SERVER                    1
-#define OBSW_ADD_TMTC_UDP_SERVER                    1
+#define OBSW_ADD_TMTC_TCP_SERVER                    @OBSW_ADD_TMTC_TCP_SERVER@
+#define OBSW_ADD_TMTC_UDP_SERVER                    @OBSW_ADD_TMTC_UDP_SERVER@
 
 // Can be used to switch device to NORMAL mode immediately
 #define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    0
diff --git a/mission/controller/acs/ActuatorCmd.h b/mission/controller/acs/ActuatorCmd.h
index 6a1b3dbb..b14a4a25 100644
--- a/mission/controller/acs/ActuatorCmd.h
+++ b/mission/controller/acs/ActuatorCmd.h
@@ -3,7 +3,6 @@
 
 #include <cmath>
 
-
 class ActuatorCmd {
  public:
   ActuatorCmd();
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index 2dd00ee6..34c07302 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -49,6 +49,7 @@
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/tcs/tcsModeTree.h"
 #include "mission/tcs/defs.h"
+#include "mission/tmtc/Service15TmStorage.h"
 #include "mission/tmtc/tmFilters.h"
 #include "objects/systemObjectList.h"
 #include "tmtc/pusIds.h"
@@ -58,15 +59,13 @@ using persTmStore::PersistentTmStores;
 #if OBSW_ADD_TCPIP_SERVERS == 1
 #if OBSW_ADD_TMTC_UDP_SERVER == 1
 // UDP server includes
-#include "devices/gpioIds.h"
-#include "fsfw/osal/common/UdpTcPollingTask.h"
-#include "fsfw/osal/common/UdpTmTcBridge.h"
+#include <fsfw/osal/common/UdpTcPollingTask.h>
+#include <fsfw/osal/common/UdpTmTcBridge.h>
 #endif
 #if OBSW_ADD_TMTC_TCP_SERVER == 1
 // TCP server includes
-#include "fsfw/osal/common/TcpTmTcBridge.h"
-#include "fsfw/osal/common/TcpTmTcServer.h"
-#include "mission/tmtc/Service15TmStorage.h"
+#include <fsfw/osal/common/TcpTmTcBridge.h>
+#include <fsfw/osal/common/TcpTmTcServer.h>
 #endif
 #endif