diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69706abb..ce293308 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Changed
+
+- Increased the maximum number of scheduled telecommands from 500 to 4000. Merry Christmas!
+
 ## Fixed
 
 - Faulty mapping of input values for QUEST algorithm.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e172ee9c..5ec74740 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ include(EiveHelpers)
 option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
 
-set(OBSW_MAX_SCHEDULED_TCS 500)
+set(OBSW_MAX_SCHEDULED_TCS 4000)
 
 if(EIVE_Q7S_EM)
   set(OBSW_Q7S_EM
diff --git a/fsfw b/fsfw
index 7105e199..e64e8b27 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7105e199c650303ac1a48e75aebc44182630931e
+Subproject commit e64e8b274d436502d5c5b87865b9006e52e4b1aa
diff --git a/tmtc b/tmtc
index f63a834d..4c54aa75 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit f63a834d9acd4506f0dbd7f8e63007f17c063c1d
+Subproject commit 4c54aa75865974c6026828a98f0523ed1074a8cc