diff --git a/.gitmodules b/.gitmodules
index 953846a48a..2ce2f1ef8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/FMS"]
-	path = src/FMS
-	url = https://github.com/NOAA-GFDL/FMS.git
 [submodule "src/MOM6"]
 	path = src/MOM6
 	url = https://github.com/NOAA-GFDL/MOM6.git
@@ -34,3 +31,9 @@
 [submodule "src/ice_param"]
 	path = src/ice_param
 	url = https://github.com/NOAA-GFDL/ice_param.git
+[submodule "src/FMS1"]
+	path = src/FMS1
+	url = https://github.com/NOAA-GFDL/FMS
+[submodule "src/FMS2"]
+	path = src/FMS2
+	url = https://github.com/NOAA-GFDL/FMS
diff --git a/src/FMS b/src/FMS
deleted file mode 160000
index f61416fef6..0000000000
--- a/src/FMS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f61416fef691d9ba39a40df1ce72aa574f54c390
diff --git a/src/FMS b/src/FMS
new file mode 120000
index 0000000000..0f4d9314e4
--- /dev/null
+++ b/src/FMS
@@ -0,0 +1 @@
+FMS1
\ No newline at end of file
diff --git a/src/FMS1 b/src/FMS1
new file mode 160000
index 0000000000..f61416fef6
--- /dev/null
+++ b/src/FMS1
@@ -0,0 +1 @@
+Subproject commit f61416fef691d9ba39a40df1ce72aa574f54c390
diff --git a/src/FMS2 b/src/FMS2
new file mode 160000
index 0000000000..b9fc6515c7
--- /dev/null
+++ b/src/FMS2
@@ -0,0 +1 @@
+Subproject commit b9fc6515c7e729909e59a0f9a1efc6eb1d3e44d1