diff --git a/software/CMakeLists.txt b/software/CMakeLists.txt
deleted file mode 100644
index 794041c..0000000
--- a/software/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Top-level CMakeLists.txt for the multi-app setup
-
-cmake_minimum_required(VERSION 3.20)
-
-add_subdirectory(apps/gateway)
-add_subdirectory(apps/slave_node)
\ No newline at end of file
diff --git a/software/apps/gateway/CMakeLists.txt b/software/apps/gateway/CMakeLists.txt
index ca80807..555e999 100644
--- a/software/apps/gateway/CMakeLists.txt
+++ b/software/apps/gateway/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 
+# Include the main 'software' directory as a module to find boards, libs, etc.
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(gateway)
 
diff --git a/software/apps/slave_node/CMakeLists.txt b/software/apps/slave_node/CMakeLists.txt
index 1b466e4..65606a4 100644
--- a/software/apps/slave_node/CMakeLists.txt
+++ b/software/apps/slave_node/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Point BOARD_ROOT and DTS_ROOT to the main 'software' directory
-# so Zephyr can find the 'boards' subdirectory there.
+# Point BOARD_ROOT and DTS_ROOT to the 'software' directory, which contains 'boards'.
 list(APPEND BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 list(APPEND DTS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)