diff --git a/yggdrasil/etro.json b/yggdrasil/current/etro.json
similarity index 60%
rename from yggdrasil/etro.json
rename to yggdrasil/current/etro.json
index 7ba2741..a136af9 100644
--- a/yggdrasil/etro.json
+++ b/yggdrasil/current/etro.json
@@ -3,7 +3,8 @@
 "location": "Hetzner, Tuusula, Finland",
 "peering": "Ask me? I don't know yet",
 "contact": {
-"name": "Mikaela Suomalainen",
+"name": "Aminda Suomalainen",
 "xmpp": "mikaela@blesmrt.net",
-"public keys": "https://mikaela.info/keys/"}
+"email-deltachat": "delta@aminda.eu",
+"public keys": "https://www.aminda.eu/keys/"}
 }
diff --git a/yggdrasil/jitsi.json b/yggdrasil/current/jitsi.json
similarity index 100%
rename from yggdrasil/jitsi.json
rename to yggdrasil/current/jitsi.json
diff --git a/yggdrasil/jolly-roger.json b/yggdrasil/current/jolly-roger.json
similarity index 51%
rename from yggdrasil/jolly-roger.json
rename to yggdrasil/current/jolly-roger.json
index 70aa0d8..e72f4c4 100644
--- a/yggdrasil/jolly-roger.json
+++ b/yggdrasil/current/jolly-roger.json
@@ -1,7 +1,8 @@
 { "name": "y.jolly-roger.hel.piraattipuolue.internal",
 "type": "desktop",
 "contact": {
-"name": "Mikaela Suomalainen",
+"name": "Aminda Suomalainen",
 "xmpp": "mikaela@blesmrt.net",
-"public keys": "https://mikaela.info/keys/"}
+"email-deltachat": "delta@aminda.eu",
+"public keys": "https://www.aminda.eu/keys/"}
 }
diff --git a/yggdrasil/current/rbtpzn.json b/yggdrasil/current/rbtpzn.json
new file mode 100644
index 0000000..d3372f4
--- /dev/null
+++ b/yggdrasil/current/rbtpzn.json
@@ -0,0 +1,8 @@
+{ "name": "y.rbtpzn.mikaela.info",
+"type": "desktop",
+"contact": {
+"name": "Aminda Suomalainen",
+"xmpp": "mikaela@blesmrt.net",
+"email-deltachat": "delta@aminda.eu",
+"public keys": "https://www.aminda.eu/keys/"}
+}
diff --git a/yggdrasil/current/sedric.json b/yggdrasil/current/sedric.json
new file mode 100644
index 0000000..7308b13
--- /dev/null
+++ b/yggdrasil/current/sedric.json
@@ -0,0 +1,8 @@
+{ "name": "y.sedric.mikaela.info",
+"type": "laptop",
+"contact": {
+"name": "Aminda Suomalainen",
+"xmpp": "mikaela@blesmrt.net",
+"email-deltachat": "delta@aminda.eu",
+"public keys": "https://www.aminda.eu/keys/"}
+}
diff --git a/yggdrasil/silta.json b/yggdrasil/current/silta.json
similarity index 100%
rename from yggdrasil/silta.json
rename to yggdrasil/current/silta.json
diff --git a/yggdrasil/current/zaldaryn.json b/yggdrasil/current/zaldaryn.json
new file mode 100644
index 0000000..02117bc
--- /dev/null
+++ b/yggdrasil/current/zaldaryn.json
@@ -0,0 +1,8 @@
+{ "name": "y.zaldaryn.mikaela.info",
+"type": "desktop",
+"contact": {
+"name": "Aminda Suomalainen",
+"xmpp": "mikaela@blesmrt.net",
+"email-deltachat": "delta@aminda.eu",
+"public keys": "https://www.aminda.eu/keys/"}
+}
diff --git a/yggdrasil/rbtpzn.json b/yggdrasil/rbtpzn.json
deleted file mode 100644
index e6c84a6..0000000
--- a/yggdrasil/rbtpzn.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "name": "y.rbtpzn.mikaela.info",
-"type": "desktop",
-"contact": {
-"name": "Mikaela Suomalainen",
-"xmpp": "mikaela@blesmrt.net",
-"public keys": "https://mikaela.info/keys/"}
-}
diff --git a/yggdrasil/sedric.json b/yggdrasil/sedric.json
deleted file mode 100644
index 995d560..0000000
--- a/yggdrasil/sedric.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "name": "y.sedric.mikaela.info",
-"type": "laptop",
-"contact": {
-"name": "Mikaela Suomalainen",
-"xmpp": "mikaela@blesmrt.net",
-"public keys": "https://mikaela.info/keys/"}
-}
diff --git a/yggdrasil/zaldaryn.json b/yggdrasil/zaldaryn.json
deleted file mode 100644
index 1f08956..0000000
--- a/yggdrasil/zaldaryn.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "name": "y.zaldaryn.mikaela.info",
-"type": "desktop",
-"contact": {
-"name": "Mikaela Suomalainen",
-"xmpp": "mikaela@blesmrt.net",
-"public keys": "https://mikaela.info/keys/"}
-}