diff --git a/.ssh/config b/.ssh/config
index 1e8f566..7a610b0 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -33,38 +33,30 @@ Host o2.lilo.ch
    User ubuntu
    ForwardAgent yes
 
-Host he-fw
-   HostName 192.168.254.1
-   User root
-   ForwardAgent yes
+#################################
 
-Host he-file
-   HostName 192.168.254.2
-   User root
-   ForwardAgent yes
-
-Host pf-fw
+Host pf-fw pf-file.home.lilo.ch
    HostName 192.168.0.1
    User root
    ForwardAgent yes
 
-Host pf-file
+Host pf-file pf-file.home.lilo.ch
    HostName 192.168.0.2
    #ProxyCommand ssh -q -W 172.23.254.32:22 co.lilo.ch
    User root
    ForwardAgent yes
 
-Host bu-fw
-   ProxyCommand ssh -q -W 172.23.254.61:22 co.lilo.ch
-   User root
-   ForwardAgent yes
-
-Host z100
+Host z100 z100.home.lilo.ch
    HostName 192.168.0.3
    User ueli
-   ForwardAgent yes   
+   ForwardAgent yes
 
-Host kasm
+Host nuc nuc.home.lilo.ch
+   HostName 192.168.254.11
+   User ueli
+   ForwardAgent yes
+
+Host kasm kasm.home.lilo.ch
    HostName 192.168.0.130
    User root
    ForwardAgent yes   
@@ -74,6 +66,21 @@ Host kasm
 #   User ueli
 #   ForwardAgent yes   
 
+Host he-fw he-fw.home.lilo.ch
+   HostName 192.168.254.1
+   User root
+   ForwardAgent yes
+
+Host he-file he-file.home.lilo.ch
+   HostName 192.168.254.2
+   User root
+   ForwardAgent yes
+
+Host bu-fw
+   ProxyCommand ssh -q -W 172.23.254.61:22 co.lilo.ch
+   User root
+   ForwardAgent yes
+
 #Host backup.lilo.ch
 #   User root
 #   ProxyCommand ssh -q -W 172.23.0.21:22 u.utf3.ch