diff --git a/.ssh/config b/.ssh/config
index a312252..fa134e7 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,112 +1,3 @@
-Include thefossguy
-# hosts for git
-Host github.com
-    User git
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/git
-
-Host git.resf.org
-    User git
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/git
-
-Host git.rockylinux.org
-    User git
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/git
-
-Host src.fedoraproject.org
-    User git
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/git
-
-Host gitlab.com
-    User git
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/git
-
-# Raspberry Pi 4 hosts
-Host sentinel
-    Hostname 10.0.0.14
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-Host reddish
-    Hostname 10.0.0.19
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-# VisionFive 2 hosts
-Host vasudev
-    Hostname 10.0.0.105
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-Host pawandev
-    Hostname 10.0.0.22
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-# Radxa Rock 5 Model B
-Host mahadev
-    Hostname 10.0.0.101
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-# FriendlyARM NanoPC-T6
-Host stuti
-    Hostname 10.0.0.26
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-
-# Xunlong Orange Pi 5
-Host opi5
-    Hostname 10.0.0.170
-    ConnectTimeout 2
-    User pratham
-    IdentityFile ~/.ssh/ssh
-    UserKnownHostsFile /dev/null
-    StrictHostKeyChecking no
-
-# local VMs
-Host self.kvm0
-    Hostname 127.0.0.1
-    User pratham
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/ssh
-    UserKnownHostsFile /dev/null
-    StrictHostKeyChecking no
-    Port 6900
-
-Host self.kvm1
-    Hostname 127.0.0.1
-    User pratham
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/ssh
-    UserKnownHostsFile /dev/null
-    StrictHostKeyChecking no
-    Port 6901
-
-Host self.kvm2
-    Hostname 127.0.0.1
-    User pratham
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/ssh
-    UserKnownHostsFile /dev/null
-    StrictHostKeyChecking no
-    Port 6902
-
-Host self.kvm3
-    Hostname 127.0.0.1
-    User pratham
-    ConnectTimeout 2
-    IdentityFile ~/.ssh/ssh
-    UserKnownHostsFile /dev/null
-    StrictHostKeyChecking no
-    Port 6903
+Include includes/git
+Include includes/local-machines
+Include includes/thefossguy
diff --git a/.ssh/includes/git b/.ssh/includes/git
new file mode 100644
index 0000000..1864e39
--- /dev/null
+++ b/.ssh/includes/git
@@ -0,0 +1,24 @@
+Host github.com
+    User git
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/git
+
+Host git.resf.org
+    User git
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/git
+
+Host git.rockylinux.org
+    User git
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/git
+
+Host src.fedoraproject.org
+    User git
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/git
+
+Host gitlab.com
+    User git
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/git
diff --git a/.ssh/includes/local-machines b/.ssh/includes/local-machines
new file mode 100644
index 0000000..dd3748a
--- /dev/null
+++ b/.ssh/includes/local-machines
@@ -0,0 +1,85 @@
+Host flameboi
+    Hostname 10.0.0.13
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host sentinel
+    Hostname 10.0.0.14
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host reddish
+    Hostname 10.0.0.19
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host mahadev
+    Hostname 10.0.0.21
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host pawandev
+    Hostname 10.0.0.22
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host stuti
+    Hostname 10.0.0.23
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host vaaman
+    Hostname 10.0.0.41
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+Host vaayu
+    Hostname 10.0.0.42
+    ConnectTimeout 2
+    User pratham
+    IdentityFile ~/.ssh/ssh
+
+
+# local VMs
+Host self.kvm0
+    Hostname 127.0.0.1
+    User pratham
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/ssh
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    Port 6900
+
+Host self.kvm1
+    Hostname 127.0.0.1
+    User pratham
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/ssh
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    Port 6901
+
+Host self.kvm2
+    Hostname 127.0.0.1
+    User pratham
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/ssh
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    Port 6902
+
+Host self.kvm3
+    Hostname 127.0.0.1
+    User pratham
+    ConnectTimeout 2
+    IdentityFile ~/.ssh/ssh
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    Port 6903