diff --git a/infra/setup.ts b/infra/setup.ts
index acf1b84..801a299 100644
--- a/infra/setup.ts
+++ b/infra/setup.ts
@@ -22,8 +22,8 @@ const DEFAULT_AUTH_CONFIG: AuthSetupConfig = {
   ghcrReg: "ghcr.atyg.org",
   domainName: "auth.system.local",
   dbPassword: "",
-  dbDataPath: "/volume1/docker/auth-yes/db",
-  spireDataPath: "/volume1/docker/auth-yes/spire",
+  dbDataPath: "/volume1/docker/auth-yes/data",
+  spireDataPath: "/volume1/docker/spire",
   appSecret: "",
 };
 
@@ -70,10 +70,10 @@ POSTGRES_PORT=5432
 POSTGRES_USER=postgres
 POSTGRES_DB=authdb
 POSTGRES_PASSWORD=${config.dbPassword}
-DB_DATA_PATH=${config.dbDataPath}
+DB_DATA_PATH=${config.dbDataPath || "/volume1/docker/auth-yes/data"}
 
 # --- SPIRE Configuration ---
-SPIRE_DATA_PATH=${config.spireDataPath || "/volume1/docker/auth-yes/spire"}
+SPIRE_DATA_PATH=${config.spireDataPath || "/volume1/docker/spire"}
 
 # --- Valkey Configuration ---
 VALKEY_HOST=auth-valkey
@@ -618,9 +618,10 @@ if (import.meta.main) {
             "ghcr.atyg.org",
           domainName: options.domain,
           dbPassword,
-          dbDataPath: options.dbPath,
+          dbDataPath: options.dbPath || currentConfig.dbDataPath ||
+            "/volume1/docker/auth-yes/data",
           spireDataPath: options.spirePath || currentConfig.spireDataPath ||
-            "/volume1/docker/auth-yes/spire",
+            "/volume1/docker/spire",
           appSecret,
         };
         await generateAuthSetupFiles(newConfig);