diff --git a/whoami@.service b/whoami@.service
new file mode 100644
index 0000000..a2ca946
--- /dev/null
+++ b/whoami@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=whoami-%i
+After=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill whoami-%i
+ExecStartPre=-/usr/bin/docker rm whoami-%i
+ExecStartPre=/usr/bin/docker pull jwilder/whoami
+ExecStart=/usr/bin/docker run --name whoami-%i -p :8000 jwilder/whoami
+ExecStop=/usr/bin/docker stop whoami-%i