diff --git a/infra/setup.ts b/infra/setup.ts
index ca2f19d..d62edc6 100644
--- a/infra/setup.ts
+++ b/infra/setup.ts
@@ -146,7 +146,7 @@ services:
     networks:
       - auth-internal-net
     volumes:
-      - ./spire/server/data:/opt/spire/data
+      - spire-server-data:/opt/spire/data
       - ./spire/server/conf/server.conf:/opt/spire/conf/server.conf:ro
     command: ["-config", "/opt/spire/conf/server.conf"]
 
@@ -159,13 +159,18 @@ services:
       - auth-internal-net
     volumes:
       - spire-socket:/var/run/spire
-      - ./spire/agent/data:/opt/spire/data
+      - spire-agent-data:/opt/spire/data
       - ./spire/agent/conf/agent.conf:/opt/spire/conf/agent.conf:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     command: ["-config", "/opt/spire/conf/agent.conf"]
     depends_on:
       - spire-server
 
 volumes:
+  spire-server-data:
+    name: spire-server-data
+  spire-agent-data:
+    name: spire-agent-data
   spire-socket:
     name: spire-socket
 
@@ -255,9 +260,17 @@ export async function generateAuthSetupFiles(
   const spireComposeContent = generateSpireDockerCompose();
   await Deno.writeTextFile(SPIRE_COMPOSE_PATH, spireComposeContent);
 
+  // Ensure default SPIRE directories exist
+  await Deno.mkdir(path.join("infra", "spire", "server", "conf"), {
+    recursive: true,
+  });
+  await Deno.mkdir(path.join("infra", "spire", "agent", "conf"), {
+    recursive: true,
+  });
+
   console.log(
     colors.green(
-      `\n✓ Successfully generated ${ENV_PATH} and ${COMPOSE_PATH}!`,
+      `\n✓ Successfully generated ${ENV_PATH}, ${COMPOSE_PATH}, and ${SPIRE_COMPOSE_PATH}!`,
     ),
   );
   console.log(