diff --git a/host_vars/dev-mail-01.yml b/host_vars/dev-mail-01.yml
new file mode 100644
index 0000000..bb04081
--- /dev/null
+++ b/host_vars/dev-mail-01.yml
@@ -0,0 +1,3 @@
+---
+
+hetzner_server_labels: "stage={{ stage }} service=mail"
diff --git a/keys/stefan.curow/id_rsa.pub b/keys/stefan.curow/id_rsa.pub
deleted file mode 100644
index fc85b11..0000000
--- a/keys/stefan.curow/id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAscASzHdu85wUZUNYLHNJSbee3uQxApRXBV90twEFdUI8I4MmKVeGOi5zTat4VXqAGFgJ8CAUGM1rwC6azi1SDzikPVbV8QtqeRK1P1KVkknyBepe4t/DrhelQudJ2VM2wuDgCtbHWgvVfh3vd7IF5pThPke/oa8H2rACfM8pSTpn5AVPnTotM/8aTgEt1YDoDS+59CG/mGCMTvZ/EkYhIVIFEkNcaMn0Xwx0q3X2VuanA5Zu6BClybwE45A/kRZo7nXtEa33Mvr2yqkoC9DRP9l3d1K2wiIn3X8DBsgM+ZWsriS8Tt7UzOyHzyu7+ZlEvb4ek6ta/weKMbtJl/X3VQ== scurow
\ No newline at end of file
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 56dcd1d..fb7c207 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -73,12 +73,12 @@
     - users
 
 # TODO check usage of key_options "no-agent-forwarding, no-agent-forwarding, no-X11-forwarding"
-- name: "Set up authorized keys"
+- name: "Set up authorized users"
   authorized_key:
     user: '{{ item }}'
     state: present
     exclusive: true
-    key: "{{ lookup('file', '{{ inventory_dir }}/keys/{{ item }}/id_rsa.pub') }}"
+    key: "{{ lookup('file', '{{ inventory_dir }}/users/{{ item }}/id_rsa.pub') }}"
   loop: '{{ smardigo_plattform_users | difference(["elastic"]) }}'
   tags:
     - users
diff --git a/stage-dev b/stage-dev
index 765ed33..49f4b1f 100644
--- a/stage-dev
+++ b/stage-dev
@@ -13,6 +13,9 @@ dev-elastic-stack-03
 [keycloak]
 dev-keycloak-01
 
+[mail]
+dev-mail-01
+
 [prometheus]
 dev-prometheus-01
 
@@ -21,6 +24,7 @@ connect
 docker_registry
 elastic
 keycloak
+mail
 prometheus
 
 [all:children]
diff --git a/keys/peter.heise/id_rsa.pub b/users/peter.heise/id_rsa.pub
similarity index 100%
rename from keys/peter.heise/id_rsa.pub
rename to users/peter.heise/id_rsa.pub
diff --git a/keys/sven.ketelsen/id_rsa.pub b/users/sven.ketelsen/id_rsa.pub
similarity index 100%
rename from keys/sven.ketelsen/id_rsa.pub
rename to users/sven.ketelsen/id_rsa.pub
diff --git a/keys/vanphuong.ma/id_rsa.pub b/users/vanphuong.ma/id_rsa.pub
similarity index 100%
rename from keys/vanphuong.ma/id_rsa.pub
rename to users/vanphuong.ma/id_rsa.pub