diff --git a/.gitmodules b/.gitmodules
index 1f3dc6ec..d309e0f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "etl"]
-	path = thirdparty/etl
-	url = https://github.com/ETLCPP/etl.git
 [submodule "arduino"]
 	path = arduino
 	url = https://egit.irs.uni-stuttgart.de/eive/eive_arduino_interface.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 529bffbb..18a16e72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,7 +307,7 @@ add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
 
 
 if(EIVE_ADD_ETL_LIB)
-    add_subdirectory(${LIB_ETL_PATH})
+    # add_subdirectory(${LIB_ETL_PATH})
 endif()
 
 if(EIVE_ADD_JSON_LIB)
diff --git a/fsfw b/fsfw
index 1739edd9..3d047f96 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1739edd9b07933ddbdfcbfd19cf98146815ebe3f
+Subproject commit 3d047f9629c3a6fe25514f92dd008bd34d0784dd
diff --git a/thirdparty/etl b/thirdparty/etl
deleted file mode 160000
index c308dc42..00000000
--- a/thirdparty/etl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4