diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1410bdb..db7bb059 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ set(FSFW_PATH fsfw)
 set(MISSION_PATH mission)
 set(CSPLIB_PATH libcsp)
 
-set(WARNING_SHADOW_LOCAL FALSE)
+set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
 
 # Analyse different OS and architecture/target options, determine BSP_PATH,
 # display information about compiler etc.
diff --git a/fsfw b/fsfw
index bd5cc7ae..8f83f7be 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit bd5cc7ae3ea53040cc832b5d756846d21613d91a
+Subproject commit 8f83f7becd7ae9ee45a6bfccffdf1338993e426c