diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 3c86915f..3304fce8 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -1084,8 +1084,9 @@ ReturnValue_t CoreController::actionListDirectoryDumpDirectly(ActionId_t actionI
     dumpContext.segmentIdx++;
     dumpContext.dumpedBytes += nextDumpLen;
     // Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles.
-    if (dumpContext.segmentIdx == 25) {
+    if (dumpContext.segmentIdx == 10) {
       dumpContext.active = true;
+      dumpContext.firstDump = true;
       dumpContext.commander = commandedBy;
       dumpContext.actionId = actionId;
       return returnvalue::OK;
@@ -2358,6 +2359,10 @@ MessageQueueId_t CoreController::getCommandQueue() const {
 }
 
 void CoreController::dirListingDumpHandler() {
+  if (dumpContext.firstDump) {
+    dumpContext.firstDump = false;
+    return;
+  }
   size_t nextDumpLen = 0;
   size_t dummy = 0;
   ReturnValue_t result;
@@ -2390,7 +2395,7 @@ void CoreController::dirListingDumpHandler() {
     dumpContext.segmentIdx++;
     dumpContext.dumpedBytes += nextDumpLen;
     // Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles.
-    if (dumpContext.segmentIdx == 25) {
+    if (dumpContext.segmentIdx == 10) {
       break;
     }
   }
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index a58faf86..05878d6d 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -179,6 +179,7 @@ class CoreController : public ExtendedControllerBase, public ReceivesParameterMe
 
   struct DirListingDumpContext {
     bool active;
+    bool firstDump;
     size_t dumpedBytes;
     size_t totalFileSize;
     size_t listingDataOffset;
diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index 78ba52e4..bd93586c 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -59,6 +59,7 @@ static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
 static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100;
 static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = 80;
 static constexpr uint32_t HK_SERVICE_QUEUE_DEPTH = 60;
+static constexpr uint32_t ACTION_SERVICE_QUEUE_DEPTH = 60;
 
 static constexpr uint32_t MAX_STORED_CMDS_UDP = 150;
 static constexpr uint32_t MAX_STORED_CMDS_TCP = 180;
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index 4ec4adec..36c75f0e 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -234,7 +234,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 
   // PUS service stack
   new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, config::EIVE_PUS_APID,
-                                      pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 40);
+                                      pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 120);
   new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_2, 3, 10);
   new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID,
@@ -243,7 +243,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
       PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
       80, 160);
   new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
-                                 pus::PUS_SERVICE_8, 16, 60, 50);
+                                 pus::PUS_SERVICE_8, config::ACTION_SERVICE_QUEUE_DEPTH, 16, 60);
   new Service9TimeManagement(
       PsbParams(objects::PUS_SERVICE_9_TIME_MGMT, config::EIVE_PUS_APID, pus::PUS_SERVICE_9));