diff --git a/etc/units/webhookd@.service b/etc/units/webhookd@.service
new file mode 100644
index 0000000..7030ab1
--- /dev/null
+++ b/etc/units/webhookd@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Webkookd Server
+After=docker.service
+Requires=docker.service
+
+[Service]
+ExecStartPre=-/usr/bin/docker pull ncarlier/webhookd:latest
+ExecStartPre=-/usr/bin/docker kill %p
+ExecStartPre=-/usr/bin/docker rm %p
+ExecStart=/usr/bin/docker run --rm --name %p -v /var/run/docker.sock:/var/run/docker.sock -v /media/data/webhookd/deploy_rsa:/root/.ssh/id_rsa --env-file /media/data/webhookd/env.conf -P ncarlier/webhookd
+ExecStop=/usr/bin/docker stop %p
+
+[X-Fleet]
+X-Conflicts=%p@*.service