diff --git a/dot_ssh/config.d/private.conf b/dot_ssh/config.d/private.conf
index 8dabe42..6393018 100644
--- a/dot_ssh/config.d/private.conf
+++ b/dot_ssh/config.d/private.conf
@@ -1,27 +1,6 @@
-Host mail
-  HostName mail.servhub.eu
-  User jan
-  Port 22
-  LocalForward 11334 127.0.0.1:11334
-  IdentityFile ~/.ssh/id_ed25519
+# This file is for private SSH configurations
 
-Host unlock-mail
-  HostName mail.servhub.eu
-  User root
-  Port 2865
-  IdentityFile ~/.ssh/id_ed25519
-
-Host cerberus
-  Hostname cerberus.ext.servhub.eu
-  user jan
-  Port 22
-  IdentityFile ~/.ssh/id_ed25519
-
-Host unlock-cerberus
-  HostName cerberus.ext.servhub.eu
-  user root
-  Port 2222
-  IdentityFile ~/.ssh/id_ed25519
+### Netcup
 
 Host apollo
   Hostname apollo.ext.servhub.eu
@@ -35,6 +14,12 @@ Host unlock-apollo
   Port 2222
   IdentityFile ~/.ssh/id_ed25519
 
+Host aegis aegis.ext.servhub.eu
+  Hostname aegis.ext.servhub.eu
+  Port 865
+
+### Hetzner
+
 Host andromeda
   HostName andromeda.ext.servhub.eu
   LocalForward 3001 127.0.0.1:3389
@@ -43,6 +28,8 @@ Host unlock-andromeda
   HostName andromeda.ext.servhub.eu
   User root
 
+### Oracle Cloud
+
 Host sirius sirius.ext.servhub.eu
   Hostname sirius.ext.servhub.eu
   IdentityFile ~/.ssh/id_ed25519
@@ -51,8 +38,16 @@ Host sirius sirius.ext.servhub.eu
 Host mail2 mail2.ext.servhub.eu
   HostName mail2.ext.servhub.eu  
 
-Host aegis aegis.ext.servhub.eu
-  Hostname aegis.ext.servhub.eu
+
+### Contabo 
+Host loki loki.ext.servhub.eu
+  Hostname loki.ext.servhub.eu
+  Port 865
+
+### IONOS
+
+Host heimdall heimdall.ext.servhub.eu
+  Hostname heimdall.ext.servhub.eu
   Port 865
 
 # Defaults
diff --git a/dot_ssh/config.d/private/private.conf b/dot_ssh/config.d/private/private.conf
new file mode 100644
index 0000000..6393018
--- /dev/null
+++ b/dot_ssh/config.d/private/private.conf
@@ -0,0 +1,58 @@
+# This file is for private SSH configurations
+
+### Netcup
+
+Host apollo
+  Hostname apollo.ext.servhub.eu
+  user jan
+  port 865
+  IdentityFile ~/.ssh/id_ed25519
+
+Host unlock-apollo
+  Hostname apollo.ext.servhub.eu
+  User root
+  Port 2222
+  IdentityFile ~/.ssh/id_ed25519
+
+Host aegis aegis.ext.servhub.eu
+  Hostname aegis.ext.servhub.eu
+  Port 865
+
+### Hetzner
+
+Host andromeda
+  HostName andromeda.ext.servhub.eu
+  LocalForward 3001 127.0.0.1:3389
+
+Host unlock-andromeda
+  HostName andromeda.ext.servhub.eu
+  User root
+
+### Oracle Cloud
+
+Host sirius sirius.ext.servhub.eu
+  Hostname sirius.ext.servhub.eu
+  IdentityFile ~/.ssh/id_ed25519
+  Port 22
+
+Host mail2 mail2.ext.servhub.eu
+  HostName mail2.ext.servhub.eu  
+
+
+### Contabo 
+Host loki loki.ext.servhub.eu
+  Hostname loki.ext.servhub.eu
+  Port 865
+
+### IONOS
+
+Host heimdall heimdall.ext.servhub.eu
+  Hostname heimdall.ext.servhub.eu
+  Port 865
+
+# Defaults
+Host Match final host *.servhub.eu
+  User jan
+  Port 22
+  IdentityFile ~/.ssh/id_ed25519
+  IdentitiesOnly yes
diff --git a/dot_ssh/config.tmpl b/dot_ssh/config.tmpl
index eac09a4..0a309e8 100644
--- a/dot_ssh/config.tmpl
+++ b/dot_ssh/config.tmpl
@@ -14,7 +14,7 @@ Host *
 {{- end }}
 
 # Privat
-Include ~/.ssh/config.d/private.conf
+Include ~/.ssh/config.d/private/private.conf
 {{ if .addSemodia }}
 # Semodia
 Include ~/.ssh/config.d/semodia/semodia.conf