diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b7f906..c881b42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ project(fsfw-example-hosted C CXX)
 ################################################################################
 
 # Specify the C++ standard
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # Set names and variables
diff --git a/example_common b/example_common
index 9d70db9..e1aa39f 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 9d70db97f83e1d8886a5c1372a40124b79cee53d
+Subproject commit e1aa39f5e4ccd7dc5694e2f5bffb5e3161778097
diff --git a/fsfw b/fsfw
index 1a07864..5764144 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1a07864a5faf0ceba707b3174172e133e083ff53
+Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f