diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36a531d8..22e45134 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,15 +55,15 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
-	if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi")
-		set(ROOT_CONFIG_FOLDER TRUE)
-		set(FSFW_CONFIG_PATH "fsfwconfig")
+    if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi")
+        set(ROOT_CONFIG_FOLDER TRUE)
+        set(FSFW_CONFIG_PATH "fsfwconfig")
         set(ADD_LINUX_FILES TRUE)
         set(ADD_CSP_LIB TRUE)
-	endif()
+    endif()
 else()
-	# Required by FSFW library
-	set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
+    # Required by FSFW library
+    set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
 endif()
 
 ################################################################################
@@ -75,11 +75,11 @@ add_executable(${TARGET_NAME})
 
 # Add subdirectories
 if(ROOT_CONFIG_FOLDER)
-	add_subdirectory(${FSFW_CONFIG_PATH})
+    add_subdirectory(${FSFW_CONFIG_PATH})
 endif()
 
 if(ADD_CSP_LIB)
-	add_subdirectory(${CSPLIB_PATH})
+    add_subdirectory(${CSPLIB_PATH})
 endif()
 
 if(ADD_LINUX_FILES)