diff --git a/.gitmodules b/.gitmodules
index 5cb21ac..a218b18 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule ".config/tmux/plugins/tmux"]
 	path = .config/tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux
-[submodule "ssh-gen"]
-	path = ssh-gen
-	url = https://git.simonis.lol/projects/ssh-generator.git
diff --git a/scripts/setup b/scripts/setup
index 7fd0c6a..5da42da 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -20,14 +20,16 @@ fi
 
 ./scripts/gitconfig
 
+echo
+echo "[+] Creating SSH Configs..."
+echo
+
+grep -qxF "Include ~/.config/ssh/*" ~/.ssh/config || echo "Include ~/.config/ssh/*" >> ~/.ssh/config
+
+
 echo
 echo "[+] Creating symlinks..."
 echo
 
 stow .
 
-echo
-echo "[+] Creating SSH config..."
-echo
-
-python3 ssh-gen/src/main.py --config=ssh-gen/conf.yaml
diff --git a/ssh-gen b/ssh-gen
deleted file mode 160000
index 1ebb971..0000000
--- a/ssh-gen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1ebb9719c6e8768a630b1de8043c699d01de4382