diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
index df694d2662..e3acaef6b3 100644
--- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
+++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(stub_esp32 STATIC system_api.c flash_ops.c cpu_start.c)
+add_library(stub_esp32 STATIC system_api.c cpu_start.c)
 target_include_directories(stub_esp32 PUBLIC .)
 add_library(stub::esp32 ALIAS stub_esp32)
 
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
index c44bb82f1a..199ac3ada2 100644
--- a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
+++ b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(stub_spi_flash INTERFACE)
+add_library(stub_spi_flash STATIC flash_ops.c)
 target_include_directories(stub_spi_flash INTERFACE .)
 add_library(stub::spi_flash ALIAS stub_spi_flash)
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_flash.h
similarity index 100%
rename from examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h
rename to examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_flash.h
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/flash_ops.c
similarity index 100%
rename from examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c
rename to examples/build_system/cmake/idf_as_lib/stubs/spi_flash/flash_ops.c