diff --git a/.gitmodules b/.gitmodules
index 57e906f..35c744b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,6 @@
-[submodule "external/solanaceae_message3"]
-	path = external/solanaceae_message3
-	url = https://github.com/Green-Sky/solanaceae_message3.git
 [submodule "external/entt/entt"]
 	path = external/entt/entt
 	url = https://github.com/skypjack/entt.git
 [submodule "external/solanaceae_util"]
 	path = external/solanaceae_util
 	url = https://github.com/Green-Sky/solanaceae_util.git
-[submodule "external/solanaceae_contact"]
-	path = external/solanaceae_contact
-	url = https://github.com/Green-Sky/solanaceae_contact.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index d9270b6..75f6c4f 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1,14 +1,26 @@
 cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
+include(FetchContent)
+
 add_subdirectory(./solanaceae_util)
-#add_subdirectory(./solanaceae_plugin)
 
 add_subdirectory(./entt)
 
-add_subdirectory(./solanaceae_contact)
-add_subdirectory(./solanaceae_message3)
+if (NOT TARGET solanaceae_contact)
+	FetchContent_Declare(solanaceae_contact
+		GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_contact.git
+		GIT_TAG master
+	)
+	FetchContent_MakeAvailable(solanaceae_contact)
+endif()
 
-include(FetchContent)
+if (NOT TARGET solanaceae_message3)
+	FetchContent_Declare(solanaceae_message3
+		GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_message3.git
+		GIT_TAG master
+	)
+	FetchContent_MakeAvailable(solanaceae_message3)
+endif()
 
 # TODO: move to clamav.cmake
 find_package(PkgConfig QUIET)
diff --git a/external/solanaceae_contact b/external/solanaceae_contact
deleted file mode 160000
index 5ff7d1c..0000000
--- a/external/solanaceae_contact
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ff7d1cee0c3ed22f9fe7d66021d95ad1c5a3f04
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
deleted file mode 160000
index 48fb5f0..0000000
--- a/external/solanaceae_message3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 48fb5f0889404370006ae12b3637a77d7d4ba485