diff --git a/.gitmodules b/.gitmodules
index 2365dbc..e42d90c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,9 @@
 	path = thirdparty/boost
 	url = https://github.com/Manu343726/boost-cmake.git
 	branch = master
+[submodule "thirdparty/nonstd/expected-lite"]
+	path = thirdparty/nonstd/expected-lite
+	url = https://github.com/martinmoene/expected-lite.git
+[submodule "thirdparty/nonstd/variant-lite"]
+	path = thirdparty/nonstd/variant-lite
+	url = https://github.com/martinmoene/variant-lite.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a75966c..5d0d364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ install(TARGETS ${LIB_TARGET_NAME}
         ARCHIVE DESTINATION lib/static)
 
 install (DIRECTORY include/ DESTINATION include)
-install (DIRECTORY thirdparty/nonstd/expected-light/include/ DESTINATION include)
-install (DIRECTORY thirdparty/nonstd/variant-light/include/ DESTINATION include)
+install (DIRECTORY thirdparty/nonstd/expected-lite/include/ DESTINATION include)
+install (DIRECTORY thirdparty/nonstd/variant-lite/include/ DESTINATION include)
 install (DIRECTORY thirdparty/nonstd/value-ptr-lite/include/ DESTINATION include)
 install (FILES cmake/public/FindJinja2Cpp.cmake DESTINATION cmake)
diff --git a/include/jinja2cpp/error_info.h b/include/jinja2cpp/error_info.h
index 0dac900..aad7c08 100644
--- a/include/jinja2cpp/error_info.h
+++ b/include/jinja2cpp/error_info.h
@@ -3,8 +3,6 @@
 
 #include "value.h"
 
-#include <nonstd/optional.hpp>
-
 #include <iostream>
 #include <vector>
 
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 7a4f601..04072b6 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -29,8 +29,8 @@ if(expected-lite_FOUND)
     imported_target_alias(expected-lite ALIAS expected-lite::expected-lite)
 else()
     message(STATUS "expected-lite not found, using submodule")
-    update_submodule(nonstd/expected-light)
-    add_subdirectory(nonstd/expected-light EXCLUDE_FROM_ALL)
+    update_submodule(nonstd/expected-lite)
+    add_subdirectory(nonstd/expected-lite EXCLUDE_FROM_ALL)
 endif()
 
 find_package(variant-lite QUIET)
@@ -40,11 +40,11 @@ if(variant-lite_FOUND AND optional-lite_FOUND)
     imported_target_alias(optional-lite ALIAS optional-lite::optional-lite)
 else()
     message(STATUS "variant-lite or optional-lite not found, using submodule")
-    update_submodule(nonstd/variant-light)
-    add_subdirectory(nonstd/variant-light EXCLUDE_FROM_ALL)
+    update_submodule(nonstd/variant-lite)
+    add_subdirectory(nonstd/variant-lite EXCLUDE_FROM_ALL)
     # There's a bug in the lib, the target does not include the header include dirs.
     # See https://github.com/martinmoene/variant-lite/issues/25
-    target_include_directories(variant-lite INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/nonstd/variant-light/include")
+    target_include_directories(variant-lite INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/nonstd/variant-lite/include")
 
     # Fake target until we use separated optional-lite as submodule
     # See https://github.com/martinmoene/variant-lite/issues/19
diff --git a/thirdparty/nonstd/expected-lite b/thirdparty/nonstd/expected-lite
new file mode 160000
index 0000000..6944fb2
--- /dev/null
+++ b/thirdparty/nonstd/expected-lite
@@ -0,0 +1 @@
+Subproject commit 6944fb266f4cbcb2f4b9ed29189a23a4505d6db1
diff --git a/thirdparty/nonstd/variant-lite b/thirdparty/nonstd/variant-lite
new file mode 160000
index 0000000..bc3e47d
--- /dev/null
+++ b/thirdparty/nonstd/variant-lite
@@ -0,0 +1 @@
+Subproject commit bc3e47de7c16e5b7583da7f48073aa2937ec627f