diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10149bb6..10c3a349 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,9 +78,11 @@ if(TGT_BSP)
             OR ${TGT_BSP} MATCHES "arm/beagleboneblack"
     )
         set(FSFW_CONFIG_PATH "linux/fsfwconfig")
-        set(ADD_LINUX_FILES TRUE)
-        set(ADD_CSP_LIB TRUE)
-        set(FSFW_HAL_ADD_LINUX ON)
+        if(NOT Q7S_SIMPLE_MODE)
+            set(ADD_LINUX_FILES TRUE)
+            set(ADD_CSP_LIB TRUE)
+            set(FSFW_HAL_ADD_LINUX ON)
+        endif()
     endif()
    
     if(${TGT_BSP} MATCHES "arm/raspberrypi") 
@@ -137,27 +139,33 @@ if(ADD_LINUX_FILES)
     add_subdirectory(${LINUX_PATH})
 endif()
 
-add_subdirectory(${LWGPS_LIB_PATH})
 add_subdirectory(${BSP_PATH})
-add_subdirectory(${FSFW_PATH})
-add_subdirectory(${MISSION_PATH})
-add_subdirectory(${TEST_PATH})
-add_subdirectory(${FSFW_HAL_LIB_PATH})
 add_subdirectory(${COMMON_PATH})
 
+if(NOT Q7S_SIMPLE_MODE)
+    add_subdirectory(${LWGPS_LIB_PATH})
+    add_subdirectory(${FSFW_PATH})
+    add_subdirectory(${MISSION_PATH})
+    add_subdirectory(${TEST_PATH})
+    add_subdirectory(${FSFW_HAL_LIB_PATH})
+endif()
+
+
 ################################################################################
 # Post-Sources preparation
 ################################################################################
 
 set_property(CACHE OS_FSFW PROPERTY STRINGS host linux)
 
-# Add libraries for all sources.
-target_link_libraries(${TARGET_NAME} PRIVATE
-	${LIB_FSFW_NAME} 
-	${LIB_OS_NAME} 
-	${LIB_LWGPS_NAME}
-	${LIB_FSFW_HAL_NAME}
-)
+if(NOT Q7S_SIMPLE_MODE)
+    # Add libraries for all sources.
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        ${LIB_FSFW_NAME}
+        ${LIB_OS_NAME}
+        ${LIB_LWGPS_NAME}
+        ${LIB_FSFW_HAL_NAME}
+    )
+endif()
 
 if(ADD_ETL_LIB)
     target_link_libraries(${TARGET_NAME} PRIVATE
@@ -247,8 +255,3 @@ add_custom_command(
 
 include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
 set_build_type()
-
-
-
-
-
diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt
index ca260250..bc027af0 100644
--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@@ -2,8 +2,12 @@ target_sources(${TARGET_NAME} PUBLIC
 	main.cpp
 )
 
-add_subdirectory(boardconfig)
-add_subdirectory(comIF)
-add_subdirectory(boardtest)
-add_subdirectory(gpio)
-add_subdirectory(core)
+if(Q7S_SIMPLE_MODE)
+    add_subdirectory(simple)
+else()
+    add_subdirectory(boardconfig)
+    add_subdirectory(comIF)
+    add_subdirectory(boardtest)
+    add_subdirectory(gpio)
+    add_subdirectory(core)
+endif()
diff --git a/bsp_q7s/simple/CMakeLists.txt b/bsp_q7s/simple/CMakeLists.txt
new file mode 100644
index 00000000..399a1dd3
--- /dev/null
+++ b/bsp_q7s/simple/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(${TARGET_NAME} PRIVATE
+    simple.cpp
+)
diff --git a/cmake/scripts/Q7S/simple_make_debug_cfg.sh b/cmake/scripts/Q7S/simple_make_debug_cfg.sh
index 2ca0ab79..8b687504 100755
--- a/cmake/scripts/Q7S/simple_make_debug_cfg.sh
+++ b/cmake/scripts/Q7S/simple_make_debug_cfg.sh
@@ -31,5 +31,5 @@ fi
 echo "Running command (without the leading +):"
 set -x # Print command 
 ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-	-l"${build_dir}"  -d "${definitions}
+	-l"${build_dir}"  -d "${definitions}"
 # set +x
diff --git a/cmake/scripts/Q7S/simple_ninja_debug_cfg.sh b/cmake/scripts/Q7S/simple_ninja_debug_cfg.sh
index 0ec8a155..fa4d64f3 100755
--- a/cmake/scripts/Q7S/simple_ninja_debug_cfg.sh
+++ b/cmake/scripts/Q7S/simple_ninja_debug_cfg.sh
@@ -29,6 +29,6 @@ fi
 echo "Running command (without the leading +):"
 set -x # Print command 
 ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-	-l"${build_dir}" -d "${definitions}
+	-l"${build_dir}" -d "${definitions}"
 # set +x