diff --git a/etc.hosts b/etc.hosts
index 4ca78c3..03d8ad2 100644
--- a/etc.hosts
+++ b/etc.hosts
@@ -206,6 +206,10 @@
 10.243.2.84 4.makanek.r 4.makanek.kmein.r
 42:0:3c46:f7a9:1f0a:1b2b:822a:6050 makanek.r makanek.kmein.r
 42:0:3c46:f7a9:1f0a:1b2b:822a:6050 6.makanek.r 6.makanek.kmein.r
+10.243.2.85 manakish.r manakish.kmein.r
+10.243.2.85 4.manakish.r 4.manakish.kmein.r
+42:0:3c46:ac99:ae36:cb8:c551:ba27 manakish.r manakish.kmein.r
+42:0:3c46:ac99:ae36:cb8:c551:ba27 6.manakish.r 6.manakish.kmein.r
 10.243.29.179 martha.r
 10.243.29.179 4.martha.r
 42:0:3c46:5466:7dbe:f27a:673f:ea64 martha.r
@@ -290,10 +294,6 @@
 10.243.122.122 4.rtjure.r
 42:0:3c46:e3ce:cacc:bd95:dc9f:bc85 rtjure.r
 42:0:3c46:e3ce:cacc:bd95:dc9f:bc85 6.rtjure.r
-10.243.2.2 zaatar.r zaatar.kmein.r
-10.243.2.2 4.zaatar.r 4.zaatar.kmein.r
-42:0:3c46:4007:5bce:f1bc:606b:2b18 zaatar.r zaatar.kmein.r
-42:0:3c46:4007:5bce:f1bc:606b:2b18 6.zaatar.r 6.zaatar.kmein.r
 10.243.23.2 schasch.r
 10.243.23.2 4.schasch.r
 42:0:3c46:85c6:fbe9:bcac:ad31:b4b3 schasch.r
@@ -398,6 +398,10 @@
 10.243.0.14 4.yellow.r
 42:0:ce16::3110 yellow.r
 42:0:ce16::3110 6.yellow.r
+10.243.2.2 zaatar.r zaatar.kmein.r
+10.243.2.2 4.zaatar.r 4.zaatar.kmein.r
+42:0:3c46:156e:10b6:3bd6:6e82:b2cd zaatar.r zaatar.kmein.r
+42:0:3c46:156e:10b6:3bd6:6e82:b2cd 6.zaatar.r 6.zaatar.kmein.r
 10.243.13.40 zu.r
 10.243.13.40 4.zu.r
 42:0:a46e:9c86:82ce:fa82:83d3:fda zu.r
diff --git a/hosts/manakish b/hosts/manakish
new file mode 100644
index 0000000..409841e
--- /dev/null
+++ b/hosts/manakish
@@ -0,0 +1,17 @@
+Subnet = 10.243.2.85
+Subnet = 42:0:3c46:ac99:ae36:cb8:c551:ba27
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAtZcWwm1tTFoMcO0EOwNdSrZW9m2tSNWzwTGjlfuNFQKPnHiKdFFH
+Hym72+WtaIZmffermGTfYdMoB/lWgOB0glqH9oSBFvrLVDgdQL2il589EXBd/1Qy
+7Ye5EVy2/xEA7iZGg3j0i+q1ic48tt6ePd4+QR0LmLEa8+Gz5X0Tp9TTf7gdv+lB
+dVA6p7LJixKcBsC5W0jY5oTGUP0fM844AtWbpflmlz0JZNWrkJhCksOnfhUzeIsF
+1m9rCsyK+3jGMV6ZxhEbwaOt99Wlv0N0ouPePw+xLnnGTu0rJ/RKWceYnWnrHIyb
+GgGIHnm9GbMd4mAfyp63emRYDMclSQSrddpDUL2GK8TCTttr6bZm4M/pFuXQGJsQ
+EG0iaE8FM+nCrhmCRnX8dRWcNmHybd34UoVGCDJ6u+ksLIivqgWeY41CauqN0vQw
+U4zqp6XMXRB6vlVcyLzdTASxVKaLJt+BuvHcyqz/YslJ97z4yoLE3d7s/9gZkM//
++FD970bsyvKpKRx72rNRCO9tQJNgPsaMiW5nuHUFw71XxX8o0w//5a0h5cdbiT64
+I4ISySa4ynmHI1/v0a937/sFS0IvRI1Va0Efh2VxasNIqpDmM3hA8auPDj0Js/4c
+qVnWMbvqqYlY9l//HCNxUXIhi0vcOr2PoCxBtcP5pHY8nNphQrPjRrcCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+
diff --git a/hosts/scardanelli b/hosts/zaatar
similarity index 94%
rename from hosts/scardanelli
rename to hosts/zaatar
index e97e396..6809167 100644
--- a/hosts/scardanelli
+++ b/hosts/zaatar
@@ -1,5 +1,5 @@
 Subnet = 10.243.2.2
-Subnet = 42:0:3c46:4007:5bce:f1bc:606b:2b18
+Subnet = 42:0:3c46:156e:10b6:3bd6:6e82:b2cd
 
 -----BEGIN PUBLIC KEY-----
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxM93+YgGhk5PtcOrE7E/