diff --git a/.gitmodules b/.gitmodules
index 30a6863..f573da9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "cmake/stm32-cmake"]
 	path = cmake/stm32-cmake
 	url = https://github.com/spacefisch/stm32-cmake.git
-[submodule "fsfw_hal"]
-	path = fsfw_hal
-	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-hal.git
 [submodule "STM32CubeH7"]
 	path = STM32CubeH7
 	url = https://github.com/STMicroelectronics/STM32CubeH7.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cee66c..552810c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ set(LIB_FSFW_HAL_NAME fsfw_hal)
 # Set path names
 set(FSFW_PATH fsfw)
 set(COMMON_PATH example_common)
-set(LIB_FSFW_HAL_PATH fsfw_hal)
+# set(LIB_FSFW_HAL_PATH fsfw_hal)
 
 set(BSP_PATH "bsp_stm32h7_freertos")
 set(COMMON_CONFIG_PATH "${COMMON_PATH}/config")
@@ -109,7 +109,7 @@ add_executable(${TARGET_NAME})
 # Add subdirectories
 add_subdirectory(${BSP_PATH})
 add_subdirectory(${FSFW_PATH})
-add_subdirectory(${LIB_FSFW_HAL_PATH})
+# add_subdirectory(${LIB_FSFW_HAL_PATH})
 add_subdirectory(${COMMON_PATH})
 
 ################################################################################
@@ -119,7 +119,7 @@ add_subdirectory(${COMMON_PATH})
 # Add libraries for all sources.
 target_link_libraries(${TARGET_NAME} PRIVATE
     ${LIB_FSFW_NAME}
-    ${LIB_FSFW_HAL_NAME}
+    # ${LIB_FSFW_HAL_NAME}
     ${FREERTOS_NAMESPACE}::Heap::4
     ${FREERTOS_NAMESPACE}::ARM_CM7
     HAL::STM32::H7::M7::RCC
diff --git a/fsfw b/fsfw
index 22693ee..1db5c95 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 22693eee50aa85fccc9a1bd45aca4bca6b5dd62b
+Subproject commit 1db5c950b883a0e95644e06a49ef74577a289a4e
diff --git a/fsfw_hal b/fsfw_hal
deleted file mode 160000
index 1eda487..0000000
--- a/fsfw_hal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1eda4874cda2a31443c435fc671fd5cae8236660