diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index e4aa2daa..b51eefdb 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -63,22 +63,22 @@ static constexpr uint32_t HK_STORE_QUEUE_SIZE = 300;
 static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
 
 static constexpr uint32_t LIVE_CHANNEL_NORMAL_QUEUE_SIZE = 250;
-static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 450;
+static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 350;
 
-static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 50;
+static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 10;
 static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_DEST_HANDLER = 300;
 static constexpr uint32_t CFDP_SHORT_DELAY_MS = 40;
 static constexpr uint32_t CFDP_REGULAR_DELAY_MS = 200;
 
 static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100;
-static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = 150;
+static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = LIVE_CHANNEL_CFDP_QUEUE_SIZE;
 static constexpr uint32_t VERIFICATION_SERVICE_QUEUE_DEPTH = 120;
 static constexpr uint32_t HK_SERVICE_QUEUE_DEPTH = 60;
 static constexpr uint32_t ACTION_SERVICE_QUEUE_DEPTH = 60;
 
 static constexpr uint32_t UDP_MAX_STORED_CMDS = 200;
 static constexpr uint32_t UDP_MSG_QUEUE_DEPTH = UDP_MAX_STORED_CMDS;
-static constexpr uint32_t TCP_MAX_STORED_CMDS = 300;
+static constexpr uint32_t TCP_MAX_STORED_CMDS = 350;
 static constexpr uint32_t TCP_MSG_QUEUE_DEPTH = TCP_MAX_STORED_CMDS;
 static constexpr uint32_t TCP_MAX_NUMBER_TMS_SENT_PER_CYCLE = TCP_MSG_QUEUE_DEPTH;
 
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index d66ef5f7..25b59f9b 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -118,7 +118,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{600, 32},  {400, 64},   {400, 128},
-                                            {350, 512}, {500, 1200}, {100, 2048}};
+                                            {400, 512}, {800, 1200}, {150, 2048}};
     *tmStore = new PoolManager(objects::TM_STORE, poolCfg);
   }