diff --git a/ci/user-data b/ci/user-data
index d122770..0f74161 100644
--- a/ci/user-data
+++ b/ci/user-data
@@ -6,9 +6,9 @@ user:
   primary_group: runner
   groups: runner docker
 
-packages:
-- snap:
-  - docker
+snap:
+  commands:
+    00: snap install docker
 
 runcmd:
   -
diff --git a/server/user-data b/server/user-data
index a8f26b6..e69de29 100644
--- a/server/user-data
+++ b/server/user-data
@@ -1,21 +0,0 @@
-#cloud-config
-# vim: syntax=yaml
-
-users:
-- name: ci
-  shell: /bin/bash
-
-packages:
-- snap:
-  - [caddy, --classic]
-
-write_files:
-- path: /etc/caddy/Caddyfile
-  content: |
-    include /srv/*/Caddyfile
-
-runcmd:
-- snap start --system --enable caddy.server
-- mkdir -p /srv
-- chown -R caddy:ci /srv
-- chmod -R g+w-r /srv