diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cdf3421..75b09edc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v1.40.0] 2023-03-24
+
+- eive-tmtc: v2.19.4
+- q7s-packasge: v2.1.0
 - Bumped fsfwgen for bugfix: Event translation can deal with duplicate event names now.
 
 ## Fixed
@@ -25,6 +29,8 @@ will consitute of a breaking change warranting a new major release:
   Ideally, this will never be an issue and the PAPB VC interface should never block for a longer
   period.
 - The `mekfInvalidCounter` now resets on setting the STR to faulty.
+- Improve the SD lock handling. The file handling does not need to be locked as it
+  is only handled by one thread.
 
 ## Added
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a966ea9..6798ded7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 39)
-set(OBSW_VERSION_REVISION 1)
+set(OBSW_VERSION_MINOR 40)
+set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
 
diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
index 66d9ff92..1698b6b4 100644
--- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 1ebd3015..87237916 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -18,8 +18,8 @@
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"
-#include "mission/system/com/comModeTree.h"
 #include "mission/core/GenericFactory.h"
+#include "mission/system/com/comModeTree.h"
 
 void ObjectFactory::produce(void* args) {
   ObjectFactory::setStatics();
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 66d9ff92..1698b6b4 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
diff --git a/release_checklist.md b/release_checklist.md
index 2e0247c7..4c8be066 100644
--- a/release_checklist.md
+++ b/release_checklist.md
@@ -4,8 +4,8 @@ OBSW Release Checklist
 # Pre-Release
 
 1. Update version in `CMakeLists.txt`
-2. Re-run the auto-formatters with the `scripts/auto-formatter.sh` script
-3. Re-run the generators with `generators/gen.py all`
+2. Re-run the generators with `generators/gen.py all`
+3. Re-run the auto-formatters with the `scripts/auto-formatter.sh` script
 4. Verify that the Q7S, Q7S EM and Host build are working
 5. Wait for CI/CD results
 
diff --git a/tmtc b/tmtc
index c636c5c3..3a602667 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit c636c5c3e30d4d60cad27f15c53a004b3e946f11
+Subproject commit 3a60266774b3cb7c646d793449a2b2cdb76fb4e0