diff --git a/docker-compose.yml b/docker-compose.yml
index c788aa64..9d275f3a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,9 +30,10 @@ services:
         condition: service_healthy
     networks:
       - intranet
+    entrypoint: "/bin/sh"
     command: |
-      vault secrets enable transit &&
-      vault write -f transit/keys/testkey
+      vault secrets enable transit
+      vault write transit/keys/testkey type=ed25519
 
 networks:
   intranet:
diff --git a/makefile b/makefile
index 0e660aaa..5800a457 100644
--- a/makefile
+++ b/makefile
@@ -10,7 +10,8 @@ endif
 
 .PHONY: setup
 setup:
-	docker-compose up -d --force-recreate --remove-orphans
+	docker-compose up -d --force-recreate --remove-orphans vault
+	docker-compose run setup
 
 .PHONY: teardown
 teardown: