diff --git a/home/.ssh/config b/home/.ssh/config
index 1e9b732..4bee4cb 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -1,8 +1,10 @@
-Host *
-#	ServerAliveInterval 60
-#	ServerAliveCountMax 0
-#	ControlMaster auto
-#	ControlPath ~/.ssh/master-%r@%h:%p
+CanonicalizeHostname yes
+CanonicalDomains 0l.de rwth-aachen.de eonerc.rwth-aachen.de acs-lab.eonerc.rwth-aachen.de
+
+User stv0g
+VerifyHostKeyDNS yes
+
+# PKCS11Provider /usr/lib/ssh-keychain.dylib
 
 Host bad
 	ForwardAgent yes
@@ -14,10 +16,18 @@ Host *.itc.rwth-aachen.de *.rz.rwth-aachen.de
 	User sv111090
 
 # Home
-Host 192.168.0.*
-	ForwardAgent yes
+Host 172.23.156.*, 172.23.157.*
+ 	ForwardAgent yes
 
 # ACS
+Host acs-op5600
+	User root
+	HostName 134.130.169.80
+
+Host acs-op5707
+	User root
+	HostName 134.130.169.81
+
 Host acs-zerberus
 	User vogel
 	HostName zerberus.eonerc.rwth-aachen.de
@@ -46,44 +56,30 @@ Host lb-*.os-cloud.eonerc.rwth-aachen.de
 	User ubuntu
 
 # Kubernetes
-Host acs-k8s-master
+Host acs-kubernetes-*
 	User ubuntu
+
+Host acs-kubernetes-master
 	HostName 137.226.248.165
 
-Host acs-k8s-node*
-	ProxyJump acs-k8s-master
-
-Host acs-k8s-node1
-	User ubuntu
-	HostName kubernetes-1
-
-Host acs-k8s-node2
-	User ubuntu
-	HostName kubernetes-2
-
-Host acs-k8s-node3
-	User ubuntu
-	HostName kubernetes-3
-
-Host acs-k8s-node4
-	User ubuntu
-	HostName kubernetes-4
-
-Host acs-k8s-master-old
-	HostName 137.226.248.72
-	User ubuntu
-
-Host acs-k8s-traefik
-	User ubuntu
-	HostName 137.226.248.149
+Host acs-kubernetes-worker-*
+	ProxyJump acs-kubernetes-master
 
 Host acs-reserver
-	User svg
+	User vogel
 	HostName 137.226.133.195
 
-Host acs-villas
+Host acs-ernie
+	User vogel
+	HostName 134.130.169.31
+
+Host acs-villas-old
 	User svg
-	HostName acs-villas.eonerc.rwth-aachen.de
+	HostName 134.130.169.10
+
+Host acs-ernie
+	User vogel
+	HostName ernie.acs-lab.eonerc.rwth-aachen.de
 
 Host acs-mac-buildbot
 	User acs-admin
@@ -117,6 +113,10 @@ Host acs-fedora-svg-2
 	User svg
 	HostName 134.130.169.13
 
+Host acs-keycloak
+	User ubuntu
+	HostName 137.226.248.37
+
 Host inl-villas
 	User root
 	HostName 141.221.118.93
@@ -138,8 +138,10 @@ Host villas-test
 
 Host tud-villas
 	HostName 10.10.12.20
+#	HostName 10.10.12.21
 	User iepg
 	ForwardAgent yes
+	ProxyJump villas-hub
 
 Host dtu-villas
 	User thangu
@@ -147,12 +149,6 @@ Host dtu-villas
 	ForwardAgent yes
 	HostName 10.10.12.22
 
-Host tud-villas
-	User iepg
-	ProxyJump villas-hub
-	ForwardAgent yes
-	HostName 10.10.12.21
-
 Host acs-nrg5-vpmu-demo
 	HostName 10.100.1.142
 	User ubuntu
@@ -166,28 +162,19 @@ Host villas-hub
 # Private
 #
 
-Host *.0l.dn42
-	ForwardAgent yes
-
 Host *.0l.de
 	ForwardAgent yes
-	RemoteForward 52698 127.0.0.1:52698
+	GSSAPIAuthentication yes
+	GSSAPIDelegateCredentials yes
 
-Host vog
-	User pi
-	ForwardAgent yes
-	HostName 172.23.156.9
+Host kub*.0l.de
+	User root
 
-Host rck
+Host rck.home.0l.de
 	User rock64
-	ForwardAgent yes
-	HostName 172.23.157.3
 
-Host lian
-	User stv0g
-	HostName 172.23.156.2
+Host vog.int.0l.de
+	User pi
 
-Host nag.0l.de
-	User stv0g
-	ForwardAgent yes
-	HostName nag.0l.de
+Host hex.0l.de
+	User root