diff --git a/.run/fsfw-example-hosted.run.xml b/.run/fsfw-example-hosted.run.xml
index 9d5e7e5..e2c7721 100644
--- a/.run/fsfw-example-hosted.run.xml
+++ b/.run/fsfw-example-hosted.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
+  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Size" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
     <method v="2">
       <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
     </method>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73a7cfb..cfca1b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,8 @@ endif()
 option(OBSW_ADD_FMT_TESTS "Add {fmt} library tests" OFF)
 option(OBSW_ENABLE_IPO "Enable IPO/LTO optimization" ON)
 
-include(CheckIPOSupported)
-check_ipo_supported(RESULT IPO_SUPPORTED OUTPUT IPO_ERROR)
-if(NOT IPO_SUPPORTED)
-  message(STATUS "IPO/LTO not supported: ${IPO_ERROR}")
+if(OBSW_ENABLE_IPO)
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
 ################################################################################
@@ -112,10 +110,6 @@ add_subdirectory(${COMMON_PATH})
 # Post-Sources preparation
 ################################################################################
 
-if(OBSW_ENABLE_IPO AND IPO_SUPPORTED)
-  set_property(TARGET ${TARGET_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
 # Add libraries for all sources.
 target_link_libraries(${TARGET_NAME} PRIVATE
   ${LIB_FSFW_NAME}
diff --git a/fsfw b/fsfw
index 7ab617a..e802388 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7ab617accb4ff5a5bcd656b720091fc11d4ee6a6
+Subproject commit e8023886f60ba3af0a63279da8dbc0d3eb0939a7