diff --git a/.gitmodules b/.gitmodules
index fd43cd4b56..d6c431aeba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -142,6 +142,24 @@
 	fxrequired = AlwaysOptional
 	fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
 
+#-----------------------------
+# Tools
+#-----------------------------
+
+[submodule "AeroTab"]
+path = tools/AeroTab
+url = https://github.com/NorESMhub/AeroTab
+fxtag = aerotab1_00_000
+fxrequired = AlwaysOptional
+fxDONOTUSEurl = https://github.com/NorESMhub/AeroTab
+
+[submodule "CUPiD"]
+path = tools/CUPiD
+url = https://github.com/NCAR/CUPiD.git
+fxtag = v0.1.4
+fxrequired = AlwaysOptional
+fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
+
 #-----------------------------
 # CESM libraries
 #-----------------------------
diff --git a/tools/AeroTab b/tools/AeroTab
new file mode 160000
index 0000000000..6e02e35339
--- /dev/null
+++ b/tools/AeroTab
@@ -0,0 +1 @@
+Subproject commit 6e02e353399dc44853f6e87731f5dc2b58106b2b