diff --git a/coreos-config/plays/vps.yaml b/coreos-config/plays/vps.yaml
index 06c49ed..4fa31db 100644
--- a/coreos-config/plays/vps.yaml
+++ b/coreos-config/plays/vps.yaml
@@ -24,3 +24,4 @@
     - {role: compose_project, service: caddy}
     - {role: compose_project, service: diun}
     - {role: compose_project, service: watchtower}
+    - {role: compose_project, service: wkd}
diff --git a/coreos-config/roles/compose_project/templates/blog/docker-compose.yaml b/coreos-config/roles/compose_project/templates/blog/docker-compose.yaml
index 1139e7c..933c29d 100644
--- a/coreos-config/roles/compose_project/templates/blog/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/blog/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
     image: registry.tobiasmanske.de/tobiasmanske.de:latest
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.tobiasmanskede.rule=(Host(`tobiasmanske.de`) || Host(`www.tobiasmanske.de`)) && !PathPrefix(`/{path:(_matrix|_synapse|.well-known/matrix|openpgpkey)}/`)"
+      - "traefik.http.routers.tobiasmanskede.rule=(Host(`tobiasmanske.de`) || Host(`www.tobiasmanske.de`)) && !PathPrefix(`/{path:(_matrix|_synapse|.well-known/matrix|.well-known/openpgpkey)}/`)"
       - "traefik.http.routers.tobiasmanskede.entryPoints=websecure"
       - "traefik.http.services.tobiasmanskede.loadbalancer.server.port=80"
     restart: always
diff --git a/coreos-config/roles/compose_project/templates/wkd/Caddyfile b/coreos-config/roles/compose_project/templates/wkd/Caddyfile
new file mode 100644
index 0000000..93c7a5c
--- /dev/null
+++ b/coreos-config/roles/compose_project/templates/wkd/Caddyfile
@@ -0,0 +1,13 @@
+{
+  auto_https off
+}
+
+http://tobiasmanske.de {
+  header {
+    Access-Control-Allow-Origin *
+  }
+
+  uri strip_prefix /.well-known/openpgpkey/hu
+  root * /data/tobiasmanske.de/
+  file_server
+}
diff --git a/coreos-config/roles/compose_project/templates/wkd/data/arch-repo.asc b/coreos-config/roles/compose_project/templates/wkd/data/arch-repo.asc
deleted file mode 100644
index 8cb65a5..0000000
--- a/coreos-config/roles/compose_project/templates/wkd/data/arch-repo.asc
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZB8uOxYJKwYBBAHaRw8BAQdAc29ugqSUSoDvIKuQSdXr6GiItT97VW/pCc3J
-0rmyX4+0P1RvYmlhcyBNYW5za2UgKFBhY2thZ2UgU2lnbmluZyBLZXkpIDxhcmNo
-LXJlcG9AdG9iaWFzbWFuc2tlLmRlPoicBBMWCgBEAhsDBQkB4TOABQsJCAcCAiIC
-BhUKCQgLAgQWAgMBAh4HAheAFiEEw/6Hz7j41QOuA+wcAz5/Pccf6J4FAmQfL34C
-GQEACgkQAz5/Pccf6J62ZQD/YaMgOsMgzzViV4j/lSNHtTluGD0jBjf6LVs9+ogT
-1SQBAPgOjnvETqyna+zS8aChNxKh8ySLHivOpVo/VAOeqtsKiHUEEBYKAB0WIQQQ
-vga8J1zg4XNzs2j2eZbEhtG1awUCZB9D5AAKCRD2eZbEhtG1a9p7AP41mVjx4eiE
-CVK7m8jVr65c0b7xQ4beljFNlKB07wHpIgD9H66ESwroqboqpgG6lneSHbpDDDsK
-aUtSZdD3dA074Ao=
-=Djjb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/coreos-config/roles/compose_project/templates/wkd/data/contact.asc b/coreos-config/roles/compose_project/templates/wkd/data/contact.asc
deleted file mode 100644
index 3fc1c79..0000000
--- a/coreos-config/roles/compose_project/templates/wkd/data/contact.asc
+++ /dev/null
@@ -1,59 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mG8EZB6UmRMFK4EEACIDAwSarg3VOM7ytrHzDGKLDDdr0Ik8e36nPazCdOSXLyZ9
-8g9/3oq7aYXfpoStJ4PvU8pyjVW3cPniKlOFCChpIHO/t3xkTVWRdv5UCJQMFtDS
-n2WeGKMm7kSfMx7nDuoEfXO0J1RvYmlhcyBNYW5za2UgPGNvbnRhY3RAdG9iaWFz
-bWFuc2tlLmRlPoi5BBMTCQBBFiEEURlRsEymNIc3qqdjROqD4gE8w5oFAmQelccC
-GwMFCQPCZwAFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQROqD4gE8w5pg
-TgGA+9E7PxckQxun/mX3D96zfUemVskgksTUuqCfYpmaeX5DWN7fDW6bm/8Iju5f
-Bqt2AX93lwnwI06tM+5/cp6OA793Jy0C8O1QEmB6oCT6uoPUOLge7vKhlwKmXiml
-msh4d1WJAjMEEAEIAB0WIQQCAjcBfScdTiNE2PP/V3ULgwqjoQUCZB6WngAKCRD/
-V3ULgwqjoc8nD/9rxllj+8t/z+nSCVfraSQMOJ9b420156hYnOJwAzW/ktga+dW0
-xmAjOunBB+RuUKK3mQ7jdvdVnw90tawezNS6quHeamilsCME2qb8U7jIO1/Qs5V5
-IrL+aAuzVPFZszNHnAnSD4cKpV25ktC+0/b1w5o7/jIJUIo8cC/p0V9rTTnyOLcI
-AlB68pFl/iiS22ZZ1W+FKZySBzHSLjD1/X5W/2HP/mX3De4diRFixrnvjfkQz4T1
-Brw/8KdtHHWvzs3/KQLxEz4hIWNN/8dfKa4OTEqrwI1U8SZSt+lC71uzsnF7XXfT
-9YGeRgTk/OMJvktPnLu6qwWirIzIk0FwRfnSc4IKyEc6SbT/iIDQg5iKA7a3UmSa
-HIqSa2QpwKqi1OIr//IYy1/sFgwnPjh9Udqs5nPDaH6hFGC2kEfxGofr/AqOPZum
-KLNxiA1cijEcusjt76huqyYhnzfkCYIBhTHUEh7yJrZ4vkNqoq795h/fW8+gZFbF
-h4JauBklcg42A6o2tKNJ5MDd6bdNOJL9aNISEh9i5HR9EjxnNl1mnVHt2q4reaAB
-ISLfl7i+oIiJS8Ma5JrfGd3964utNicGXg/SoC+2oUd33BEUE80TJyjZOCVwBcDG
-0XCuV500WYkXqBworTbxGBf0SDssfCwC9tzaai+QnpIS7Pgyih2+TlH/ebQpVG9i
-aWFzIE1hbnNrZSA8dG9iaWFzLm1hbnNrZUBtYWlsYm94Lm9yZz6IvAQTEwkARAIb
-AwUJA8JnAAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgBYhBFEZUbBMpjSHN6qn
-Y0Tqg+IBPMOaBQJkHpbwAhkBAAoJEETqg+IBPMOaDgMBgOv6P/I2D6nZ74f+IYBU
-JDN4ewGf3jePgEEVKbCFUYzHsPoUtPKBUrShbWuM2CB6aAF/fNmLTTOy5TuRgUEB
-axpxlDQ9/h6cpHfB6iymVjO3KGLk/g7tH3Kd1aUXzO2g28lWiQIzBBABCAAdFiEE
-AgI3AX0nHU4jRNjz/1d1C4MKo6EFAmQelqAACgkQ/1d1C4MKo6FgrxAAlc7vr3vw
-TVHRj/rc5aIcSrx2chcgVaPWmM44Yikl+96TGTrCHToNBGSx1dLztO0CHXIdolj8
-o7Iz6JN0+RJluY/SJVKd71lKOmWWwfEdEFywa2vgqqU8+1sSoOeBxhJhob66QMOq
-z0VpqDix0kAcgR+ZpxRXd+5Bn5mQWLk2gGjfJsP7k7Up/ezYHZ6hqkAkOfesL20i
-qmpKQ5lmrtROqbnFvWn0ZF7qVzaFoh3H1ZuCZbdIwsTN2Kj9lEWix1qK8AvqQ9EG
-+WJilYbCHBhekywyH3QrtPFtTe+kNB59QiPNMn4+7ZIsQtBH6PWIdKTWnbGxPVri
-KCuHeu8pB5pHBoEFPnv2GVpc2ipPz17VkgnFilgrb0ifYt9vxs0OUPmKef3GzMK6
-W77mLHrDkMzznmSA9pkElH+qmsDSDsKvZTJIYGBObs87fXdJBj1Qyk5gWQ5OrmX3
-MP+/WPKVtq/oaFzVFHKpOUB3uR4pMeji75gMmF3gCFyyEgEHIU2jeSX3OKYMRIqG
-p6xLNvEbgItB9WFgyqcWFNXfu+Fmg2UFIlTgc1OeV1RtasPd0Vdb4wiRBQtOmQJ4
-QNrmTlvq4rzbT+kNguvdH4qmzbWDIubToQ9x/jlvN5DuQv+IhiY843C7Z+5I23RN
-uy18DvSe+oxRasUakHjPEYoaZuAc6cnHBo2IuQQTEwkAQRYhBFEZUbBMpjSHN6qn
-Y0Tqg+IBPMOaBQJkHpSZAhsDBQkDwmcABQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H
-AheAAAoJEETqg+IBPMOa4bwBfiusZ9iN9BZ+EhA6uqPWQSTTQhHvL4WBoVqYBxoq
-N1r4xw0u0cLi40nl9Cu//g2WzQGA2Z+tRTuDXdnDANpi3IRXPkzRvZHs2bhrCH+M
-ScpnHQjvd6vouzscxc8SRyzKEDHKuHMEZB6UmRIFK4EEACIDAwQZPzdMnGucq7ed
-L1kvvl0pgrDJzmWAfxzSwRwavcgH83Jn1AJDCre+31E1Q0HbTyx0TBiZLEXPl4pA
-wcDATXlMm1UqcBs4wqSHTrlsQr2enj/ZZZFaxbeiKhYgb37BzdkDAQkJiJ4EGBMJ
-ACYWIQRRGVGwTKY0hzeqp2NE6oPiATzDmgUCZB6UmQIbDAUJA8JnAAAKCRBE6oPi
-ATzDmvknAYCVSAem1tRTINaBJRVawtJc+lv6JdBBSapazC2gZfcayHYfVLpnZpI1
-MQEufpAjRTkBgLPsRHQaNhGglpd1cINoAJWZJU79Be8eIMp/4diIANnyxNfSgZvq
-ZSc5OzPvMElARrhvBGQelT4TBSuBBAAiAwMEvvZe4XbdMQNqFm2hiw5cZVz0cO65
-R5UkjkSMPljwkmgg3nA5B0NSD3Zx17ilwwKBBTOMNODuHOPFvfXXsSXMgz4DfKE0
-SgRgmSw8eSJe5OBHplNKcsz06EZrzT6q1XT2iQE1BBgTCQAmFiEEURlRsEymNIc3
-qqdjROqD4gE8w5oFAmQelT4CGyIFCQPCZwAAoQkQROqD4gE8w5qWIAQZEwkAHRYh
-BBsb4agcwfopi+NySZFktSdpSgcJBQJkHpU+AAoJEJFktSdpSgcJkEsBgM/AHpy3
-LhovMHRkeaIvkEy/snvRpkHyGGFtGJ6En6JOd6L/Q7hC+dbUDr7/dMWZegF8DqzL
-/5rN2Hsn8G9ig0F7h5D2IDXnz2iwRYZr2c0D7WYHHQcVVHhsvRuJ0F1LheEBwrQB
-fjVd6KqdDbLbQAAvEb+a5jRjcgTXIeUs1+UK7FPWU4k9Ok3+yBQDAtGYN81nUGFa
-2gGAzEm6i9yj6ErPtC2V/6bVTh0c4tJX9cGbKTf2Fg1zc/LGDFEs1u52PdHRk5Pq
-60j1
-=OJpp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq b/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq
new file mode 100644
index 0000000..664ce89
Binary files /dev/null and b/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/dizb37aqa5h4skgu7jf1xjr4q71w4paq differ
diff --git a/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 b/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15
new file mode 100644
index 0000000..fb810db
Binary files /dev/null and b/coreos-config/roles/compose_project/templates/wkd/data/tobiasmanske.de/nfse4krpjzrwtbwmo7m9hujznmf79t15 differ
diff --git a/coreos-config/roles/compose_project/templates/wkd/docker-compose.yaml b/coreos-config/roles/compose_project/templates/wkd/docker-compose.yaml
index c1cd62d..8e7137f 100644
--- a/coreos-config/roles/compose_project/templates/wkd/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/wkd/docker-compose.yaml
@@ -3,16 +3,16 @@ version: "3.4"
 
 services:
   wkd:
-    image: drgrove/wkd
+    image: caddy:2
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.wkd.rule=(Host(`tobiasmanske.de`) && PathPrefix(`/{path:.well-known/openpgpkey}/`))"
       - "traefik.http.routers.wkd.entryPoints=websecure"
+      - "traefik.http.routers.wkd.priority=100"
       - "traefik.http.services.wkd.loadbalancer.server.port=80"
     restart: always
-    environment:
-      MAIL_DOMAIN: tobiasmanske.de
     volumes:
+      - ./Caddyfile:/etc/caddy/Caddyfile:ro,z
       - ./data:/data:ro,Z
     networks:
       - gateway