diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..dcba6c3318a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "toolchains/environments"]
+	path = toolchains/environments
+	url = https://github.com/tipi-build/environments.git
diff --git a/toolchains/environments b/toolchains/environments
new file mode 160000
index 00000000000..c68fcc1827c
--- /dev/null
+++ b/toolchains/environments
@@ -0,0 +1 @@
+Subproject commit c68fcc1827ccc3c9e5dc39bfc9599652f997191b