diff --git a/.gitmodules b/.gitmodules
index fa0e046..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "third_party/eigenmath"]
-	path = third_party/eigenmath
-	url = https://github.com/theteamatx/x-edr-eigenmath.git
-[submodule "third_party/genit"]
-	path = third_party/genit
-	url = https://github.com/theteamatx/x-edr-genit.git
diff --git a/WORKSPACE b/WORKSPACE
index e0a33b9..82856bb 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -33,17 +33,29 @@ http_archive(
 http_archive(
     name = "eigen",
     build_file = "//third_party:eigen.BUILD",
+    sha256 = "8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72",
     url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz",
     strip_prefix="eigen-3.4.0",
 )
 
-local_repository(
-    name = "genit",
-    path = "third_party/genit",
+# GenIt
+_GENIT_VERSION = "1.0.0"
+http_archive(
+    name = "x_edr_genit",
+    sha256 = "ab1bbb15ecbe86c5c3888a12c56fe88fac416f2f305acaf1bbf7f68c3d429851",
+    strip_prefix = "x-edr-genit-%s" % _GENIT_VERSION,
+    urls = [
+        "https://github.com/theteamatx/x-edr-genit/archive/refs/tags/v%s.tar.gz" % _GENIT_VERSION,
+    ],
 )
 
-local_repository(
-    name = "eigenmath",
-    path = "third_party/eigenmath",
+# Eigenmath
+_EIGENMATH_VERSION = "1.0.0"
+http_archive(
+    name = "x_edr_eigenmath",
+    sha256 = "180bf186214b37190e3f26204a271d214b503b25bd22d4228d8f32e7c7151e05",
+    strip_prefix = "x-edr-eigenmath-%s" % _EIGENMATH_VERSION,
+    urls = [
+        "https://github.com/theteamatx/x-edr-eigenmath/archive/refs/tags/v%s.tar.gz" % _EIGENMATH_VERSION,
+    ],
 )
-
diff --git a/eigenmath_tf2/BUILD b/eigenmath_tf2/BUILD
index c291370..49085b4 100644
--- a/eigenmath_tf2/BUILD
+++ b/eigenmath_tf2/BUILD
@@ -26,7 +26,7 @@ cc_library(
         "circular_buffer.h",
     ],
     deps = [
-        "@genit//genit:iterators",
+        "@x_edr_genit//genit:iterators",
     ],
 )
 
diff --git a/third_party/eigenmath b/third_party/eigenmath
deleted file mode 160000
index 7080426..0000000
--- a/third_party/eigenmath
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 70804261a46fdb1dc8a8cc87974d7c2f05acbb75
diff --git a/third_party/eigenmath_tf2/BUILD b/third_party/eigenmath_tf2/BUILD
index fe84263..f5ba95b 100644
--- a/third_party/eigenmath_tf2/BUILD
+++ b/third_party/eigenmath_tf2/BUILD
@@ -40,7 +40,7 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
-        "@eigenmath//eigenmath",
+        "@x_edr_eigenmath//eigenmath",
     ],
 )
 
@@ -58,9 +58,9 @@ cc_test(
     srcs = ["time_cache_test.cc"],
     deps = [
         ":eigenmath_tf2",
-        "@eigenmath//eigenmath",
-        "@eigenmath//eigenmath:matchers",
         "@com_google_absl//absl/time",
         "@com_google_googletest//:gtest_main",
+        "@x_edr_eigenmath//eigenmath",
+        "@x_edr_eigenmath//eigenmath:matchers",
     ],
 )
diff --git a/third_party/genit b/third_party/genit
deleted file mode 160000
index 542a055..0000000
--- a/third_party/genit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 542a05502bf8b0e94c7b756aead336dbcf2c7471