diff --git a/all/common/templates/motd.j2 b/all/common/templates/motd.j2
index 03ac7225adf76533929b0d6fab252807a30770f8..0f2843f4de6d106de98d48752bb2b9d8d50b6885 100644
--- a/all/common/templates/motd.j2
+++ b/all/common/templates/motd.j2
@@ -6,6 +6,8 @@
     \/      \/  //      \\ ||  \\ ||    //===   \\=//   ||    \|| ||====
  
  Server:  {{ ansible_hostname }}
- Öffentliche IPs: {{ansible_eth0.ipv4.address}} / {{ansible_eth0.ipv6[0].address}}
-
+ {% for line in motd_lines %}
+ {{ line }}
+ {% endfor %}
+ 
 
diff --git a/host_vars/vorstandspi b/host_vars/vorstandspi
index c29b658ff6921393c971046de67dfb51e848a0fa..46f6712cc9213bf119176f7c5a2f1562babc1fcd 100644
--- a/host_vars/vorstandspi
+++ b/host_vars/vorstandspi
@@ -1,6 +1,10 @@
 
 # Host spezifische Variablen 
 
+motd_lines: 
+  - "Vorstands-PI"
+  - "Öffentliche IPs: {{ansible_eth0.ipv4.address}} / {{ansible_eth0.ipv6[0].address}}"
+
 debian_sources: 
   - "deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi"
 
diff --git a/host_vars/warphab b/host_vars/warphab
index 65a933d9e16c7d76704425533cbf42b7459bb80a..b14fd6421548aaa992f6bbf4bc43d4396fc157b9 100644
--- a/host_vars/warphab
+++ b/host_vars/warphab
@@ -1,6 +1,10 @@
 
 # Host spezifische Variablen 
 
+motd_lines: 
+  - "OpenHAB Server"
+  - "Öffentliche IPs: {{ansible_eth0.ipv4.address}} / {{ansible_eth0.ipv6[0].address}}"
+
 debian_sources: 
   - "deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi"
   - "deb https://homegear.eu/packages/Raspbian/ jessie/"
diff --git a/host_vars/warpsrvext b/host_vars/warpsrvext
new file mode 100644
index 0000000000000000000000000000000000000000..3e0271eb14609fbc6a2de52fac88da409684d07c
--- /dev/null
+++ b/host_vars/warpsrvext
@@ -0,0 +1,19 @@
+
+# Host spezifische Variablen 
+
+motd_lines: 
+  - "Externer Server @ myLoc"
+  - "Öffentliche IPs: {{ansible_br0.ipv4.address}} / {{ansible_br0.ipv6[0].address}}"
+
+debian_sources: 
+  - "deb http://repo.myloc.de/debian jessie main non-free contrib"
+  - "deb http://security.debian.org/ jessie/updates main contrib non-free"
+
+debian_keys:
+
+administratorenteam:
+  - "void"
+  - "sandhome"
+  - "sandmobil"
+
+
diff --git a/host_vars/warpsrvint b/host_vars/warpsrvint
new file mode 100644
index 0000000000000000000000000000000000000000..4d1c4c0ddecb2f5ce34f4a9f057368e340d334f9
--- /dev/null
+++ b/host_vars/warpsrvint
@@ -0,0 +1,19 @@
+
+# Host spezifische Variablen 
+
+motd_lines: 
+  - "Interner Server @ warpzone"
+  - "Haupt-IP @ eth2: {{ansible_eth2.ipv4.address}}"
+
+debian_sources: 
+  - "deb http://debian.uni-duisburg-essen.de/debian/ jessie main non-free contrib"
+  - "deb http://security.debian.org/ jessie/updates main contrib non-free"
+  - "deb http://debian.uni-duisburg-essen.de/debian/ jessie-updates main contrib non-free"
+
+debian_keys:
+
+administratorenteam:
+  - "void"
+  - "sandhome"
+  - "sandmobil"
+#  - "ennox" (ssh key fehlt noch)
diff --git a/host_vars/webserver b/host_vars/webserver
index 6610509007ab949a703ceb18cf7d908b954cf31c..83038811637251ca9fc1a94ac14a167553b50e28 100644
--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -1,6 +1,10 @@
 
 # Host spezifische Variablen 
 
+motd_lines: 
+  - "Webserver"
+  - "Öffentliche IPs: {{ansible_eth0.ipv4.address}} / {{ansible_eth0.ipv6[0].address}}"
+
 debian_sources: 
   - "deb http://ftp.halifax.rwth-aachen.de/debian/ jessie main contrib non-free"
   - "deb http://security.debian.org/ jessie/updates main contrib non-free"
diff --git a/hosts b/hosts
index 023ca815bb2f0b4d39e3579b1901adb417dd2d6c..f8dbda9012b5dd3d35d21c8052e596ddefff2c9f 100644
--- a/hosts
+++ b/hosts
@@ -2,12 +2,18 @@
 # Debian Jessie basierte Server 
 [debianjessie]
 
+# Interner Server Warpzone 
+# Umgebaute Watchguard im Serverschrank 
+# Die KVM Verwaltung erfolgt aktuell noch manuell 
+warpsrvint   ansible_ssh_host=192.168.0.103
+
 # Server für Interne Dienste 
-warpdock   ansible_ssh_host=192.168.0.201
+# warpsrvint   ansible_ssh_host=192.168.0.103
 
 # Öffentlicher Server Warpzone 
-# Hauptinstanz für KVM Verwaltung
-# kvmserver   ansible_ssh_host=217.79.181.126 
+# Webserver im Rechnzentrum bei myLoc 
+# Die KVM Verwaltung erfolgt aktuell noch manuell 
+warpsrvext  ansible_ssh_host=217.79.181.126 
 
 # Öffentlicher Webserver Warpzone 
 # VM auf dem Webtropia-Server