diff --git a/files/timothee.pub b/files/timothee.pub
new file mode 100644
index 0000000..f70e411
--- /dev/null
+++ b/files/timothee.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBderDKIMWN92iPby575KgUoIWkXdiH74hmwEzQTNZ/b6QPa3FCWAZhKWnUcam9n5haiXbgIIFvUhc1ogoRo+HpQZIoyEtSVZjs83S3Dzs2BWFbdxj4NS1RTFNGjh9S+Nw01JS4PfImSeFl/ftz3bia51D3RsYok0PdxYgTAblqeg2+hS6c/3m0mecvyDQLumD0C8lOk87hlMCFUo1kk8g2XKbkzCduiDLOT+4WkxfWQk/oCppm5kMBAheG/5J0c2SF3QHn1B+/1xYYUT0XajADlHM3y5lirNJJydj0NrF9fX4EYMNQyRvsrVgH0XgF6q1Pm0PM3tGrwRnhchUUAZdfdw52vYNaJ6AYb4E84ed8jOSe/uHzx2s0pJazYn3rw2vUTApdky6/o4Z5t+iR+EXITzinYTt3L3S99W+v2DJfsaTVCR5p11yMJ7ETHF2fBhBby5k7n/AWK6HHPY0f2gmIkGMsK9rGOpRgepTOdziwDHrEbn1p7akamd6/ftBrrfuCwixguNnO2c6t9Jr124KRcq1NABGdiMEWSUnqIPjgNfdm1Or21FKLwDwByPO/Pmxm/ARsW0jnYrXUxZx1PnV10up18sypEqX575h038ntQCXFfQs6kOj3kXkYn7cNw9DTcNf4/MzZ0kA6KUHgiiDuTGt7SwcSdhti87QwGYiVw== cardno:000609543377
diff --git a/manifest b/manifest
index 8d63425..41e2097 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# 2014 ungleich GmbH (cdist at ungleich.ch)
+# 2014-2020 ungleich GmbH (cdist at ungleich.ch)
+# 2017-2020 ungleich glarus ag (cdist at ungleich.ch)
 #
 # This file is part of cdist.
 #
@@ -27,7 +28,8 @@ state=$(cat "$__object/parameter/state")
 # not at ungleich (anymore)
 #
 set --
-for key in dave henk tobias carlos moep kamila kamila-phone; do
+for key in dave henk tobias carlos moep kamila kamila-phone \
+           youngjin; do
     keyfile="$__type/files/${key}.pub"
     set -- "$@" --key
     set -- "$@" "$(echo $(cat "$keyfile"))"
@@ -40,7 +42,7 @@ __ssh_authorized_keys "ungleich-staff-absent-$user" \
 # currently at ungleich
 #
 set --
-for key in jinguk nico dominique poljakowski youngjin balazs; do
+for key in jinguk nico dominique poljakowski balazs timothee; do
     keyfile="$__type/files/${key}.pub"
 
     set -- "$@" --key