diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 60e5c2fb..871a03cc 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -4,5 +4,7 @@ if(CONFIG_ETL)
 
   zephyr_compile_definitions_ifdef(CONFIG_ETL_DEBUG ETL_DEBUG)
   zephyr_compile_definitions_ifdef(CONFIG_ETL_CHECK_PUSH_POP ETL_CHECK_PUSH_POP)
+  zephyr_compile_definitions_ifdef(CONFIG_ETL_CHECK_INDEX_OPERATOR ETL_CHECK_INDEX_OPERATOR)
+  zephyr_compile_definitions_ifdef(CONFIG_ETL_CHECK_EXTRA ETL_CHECK_EXTRA)
   zephyr_compile_definitions_ifdef(CONFIG_ETL_LOG_ERRORS ETL_LOG_ERRORS)
 endif()
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 259f1d5e..3a500d6e 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -13,6 +13,12 @@ config ETL_DEBUG
 config ETL_CHECK_PUSH_POP
   bool "Enable push/pop checks in ETL"
 
+config ETL_CHECK_INDEX_OPERATOR
+  bool "Enable bounds checks on ETL operator[]"
+
+config ETL_CHECK_EXTRA
+  bool "Enable extra bounds and empty checks in ETL containers"
+
 config ETL_LOG_ERRORS
   bool "Call ETL error handler instead of assert"