diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68423f36..6261d7c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ change warranting a new major release:
 
 # [v1.21.0] 2023-01-26
 
+TMTC version: v2.5.0
 Syrlinks PR: PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/353
 
 ## Fixed
diff --git a/tmtc b/tmtc
index 67c6b86b..8b6039e1 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 67c6b86baf712bc3141c1024a857f19e38f1ca61
+Subproject commit 8b6039e15d6e1653fd9128b7d2c7991e5bee9588