diff --git a/generate-ed25519-key.sh b/generate-ed25519-key.sh
index d3c31f3..fefcdd9 100755
--- a/generate-ed25519-key.sh
+++ b/generate-ed25519-key.sh
@@ -1,5 +1,6 @@
 THISHOST=$(hostname)
+DISTRO=$(cat /etc/*-release | grep -w ID | cut -d= -f2 | tr -d '"')
 
-ssh-keygen -t ed25519 -C "martind2000@gmail.com"
+ssh-keygen -t ed25519 -C "martin@caliban.io"
 
-cp $HOME/.ssh/id_ed25519.pub ./${THISHOST}.id_ed25519.pub
+cp $HOME/.ssh/id_ed25519.pub ./${THISHOST}.${DISTRO}.id_ed25519.pub
diff --git a/generate-new-key.sh b/generate-new-key.sh
index 581aad8..0cec7bd 100755
--- a/generate-new-key.sh
+++ b/generate-new-key.sh
@@ -1,5 +1,6 @@
 THISHOST=$(hostname)
+DISTRO=$(cat /etc/*-release | grep -w ID | cut -d= -f2 | tr -d '"')
 
-ssh-keygen -t rsa -b 4096 -C "martind2000@gmail.com"
+ssh-keygen -t rsa -b 4096 -C "martin@caliban.io"
 
-cp $HOME/.ssh/id_rsa.pub ./${THISHOST}.id_rsa.pub
+cp $HOME/.ssh/id_rsa.pub ./${THISHOST}.${DISTRO}.id_rsa.pub
diff --git a/stolas.nixos.id_ed25519.pub b/stolas.nixos.id_ed25519.pub
new file mode 100644
index 0000000..732ba77
--- /dev/null
+++ b/stolas.nixos.id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOC+EdoVZAGLtqgVkxLCIopqM0To3U8DlbrfWFRz227 martin@caliban.io
diff --git a/stolas.nixos.id_rsa.pub b/stolas.nixos.id_rsa.pub
new file mode 100644
index 0000000..c10fabd
--- /dev/null
+++ b/stolas.nixos.id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCXbadu/2QlpHDKewcjXwwWZLacRs+t3LMD9HCF5+tCkMoh9Y6E6JKsGDX3rhTO+Nu2KlCcT9hmOljI55NNGruwwdN0ouJSMM7zXgUlp0Sd4Q0Pzk1DOsUSe9tzkTlkZgpAM2emWm6tj1v4GYxek4lCajrqD/slm64ghy1Rgg7zrdfqR9/cIfP2sPgqoPK0Z7sTAKnIUU0BIzJeLjB4REtsGq33IZTKD37xJTalxPu2d3QCyMVooAwywUjlvP2WHlgmVGbcCtkYW/5CM2dlxZdb9lrbWG2PcHIi8Hy1Zy01eruxnXqvuEarivB2KQhyZ7ZeLpTW1+l+nCbJyePZHET21iPWXzme0b9Pw8N6O+UDFf2NoOSe84jaIFs3hdCfGrbaAPR1Q47LbHnk4HPKPedopF1wMZZi3S/RYPTVHKaBi/zEX3IRBh3d9IhovNd4nAF0d/MCNc4BxGNzxZzZ/n1vf2W6wXhT/iu+8n4+2wz7/A1Vz4HDvhqepPFtmIC4JHewscy7+8aMlluKAbl0SajvEnT3x9uh7S6tCmG+MYpeUx3pLvDST0KDvU1OIefODxFDNHZRq7ZABr63OkS5gbq2AUAbwbM9L8RJU2VW7ss1DZ2/k2o7odePy+lI7kZ3h2QmAsTpnaSIExVkxphSAloMpsyvpldq94hjBB2dybk5Rw== martin@caliban.io