diff --git a/home/.ssh/config b/home/.ssh/config
index 4bee4cb..8cfa12d 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -1,8 +1,9 @@
 CanonicalizeHostname yes
 CanonicalDomains 0l.de rwth-aachen.de eonerc.rwth-aachen.de acs-lab.eonerc.rwth-aachen.de
 
-User stv0g
-VerifyHostKeyDNS yes
+Host *
+	User stv0g
+	VerifyHostKeyDNS yes
 
 # PKCS11Provider /usr/lib/ssh-keychain.dylib
 
@@ -35,7 +36,6 @@ Host acs-zerberus
 Host acs-stargate
 	HostName stargate.eonerc.rwth-aachen.de
 	ForwardAgent yes
-	User svg
 
 Host acs-vm-ubuntu-xilinx
 	HostName 137.226.133.215
@@ -45,6 +45,7 @@ Host acs-vm-ubuntu-xilinx
 
 Host acs-*
 	ForwardAgent yes
+	User svg
 #	ProxyJump acs-stargate
 
 Host *.os-cloud.eonerc.rwth-aachen.de
@@ -74,7 +75,6 @@ Host acs-ernie
 	HostName 134.130.169.31
 
 Host acs-villas-old
-	User svg
 	HostName 134.130.169.10
 
 Host acs-ernie
@@ -86,7 +86,6 @@ Host acs-mac-buildbot
 	HostName 137.226.133.207
 
 Host acs-buildbot
-	User svg
 	HostName 137.226.133.208
 
 Host acs-hyper1
@@ -102,7 +101,6 @@ Host acs-hyper3
 	HostName 137.226.133.193
 
 Host acs-os-villas
-	User svg
 	HostName 137.226.248.91
 
 Host acs-os-fein-website
@@ -110,7 +108,6 @@ Host acs-os-fein-website
 	HostName 137.226.248.111
 
 Host acs-fedora-svg-2
-	User svg
 	HostName 134.130.169.13
 
 Host acs-keycloak
@@ -123,7 +120,6 @@ Host inl-villas
 	ProxyJump acs-villas
 
 Host *.fein-aachen.org
-	User svg
 	ForwardAgent yes
 
 Host os.fein-aachen.org