diff --git a/.ssh/config b/.ssh/config
index 6b2e1f5..5e30a18 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -30,6 +30,13 @@ Host mikob
 	ServerAliveInterval 30
 	ServerAliveCountMax 3
 
+Host jacko
+	User pbikes
+	HostName gacrux.uberspace.de
+	IdentityFile ~/.ssh/massivedynamic_rsa
+	ServerAliveInterval 30
+	ServerAliveCountMax 3
+
 Host miko
 	User mikob
 	HostName giacobini.uberspace.de
@@ -40,3 +47,13 @@ Host gitlab.com
 	User git
 	HostName gitlab.com
 	IdentityFile ~/.ssh/massivedynamic_rsa
+
+Host github.com
+	User git
+	HostName github.com
+	IdentityFile ~/.ssh/massivedynamic_rsa
+
+Host gitlab.fsi.hochschule-trier.de
+	User git
+	HostName gitlab.fsi.hochschule-trier.de
+	IdentityFile ~/.ssh/uni_rsa
diff --git a/.ssh/config.d/maschinendeck b/.ssh/config.d/maschinendeck
index 2bd9a87..fa8e7bc 100644
--- a/.ssh/config.d/maschinendeck
+++ b/.ssh/config.d/maschinendeck
@@ -10,12 +10,13 @@
 #   Version 1,0,0                                                             #
 #                                                                             #
 ###############################################################################
-host mdeck.new asgard tuer bridge mdeck.uber.space
+host asgard tuer bridge mdeck.uber.space mediapi
 	IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
 	User miko
 
 host mdeck.new
 	HostName tritton.uberspace.de
+	IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
 	User maschine
 
 host mdeck.uber.space
@@ -31,6 +32,9 @@ host asgard
 	Hostname tuer.maschinendeck.org
 	ForwardAgent yes
 
+host mediapi
+	Hostname mediapi.local
+
 host bridge
 	Hostname bridge.local
 	ProxyJump asgard
diff --git a/.ssh/config.d/propeller b/.ssh/config.d/propeller
index 304a28c..7539d7a 100644
--- a/.ssh/config.d/propeller
+++ b/.ssh/config.d/propeller
@@ -25,7 +25,7 @@ Host gitlab.propeller.de
 	IdentityFile /Users/mochmann/.ssh/propeller_rsa
 	ForwardAgent yes
 
-Host anubis atum hapi min aton thot geb ptah bastet  propeller.technology crommelin ra selket
+Host anubis atum hapi min aton thot geb ptah bastet  propeller.technology crommelin ra selket blackbird
 	User mochmann
 	IdentityFile /Users/mochmann/.ssh/propeller_rsa
 	ForwardAgent yes
@@ -52,6 +52,8 @@ Host ra
 	HostName ra.propeller.de
 Host selket
 	HostName selket.propeller.de
+Host blackbird
+	HostName blackbird.propeller.de
 
 # OLD HOSTS
 Host ark ichigo manticore zerotwo nexus mars
@@ -70,3 +72,8 @@ Host nexus
 	HostName nexus.propeller.de
 Host mars
 	HostName mars.propeller.de
+
+Host pbx
+	HostName propellerpbx.propeller.local
+	User root
+	IdentityFile /Users/mochmann/.ssh/propeller_rsa