diff --git a/Dockerfile b/Dockerfile
index f704370c..518ecd2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,9 +18,9 @@ RUN echo "export const build = \"$BUILD\" as any;" > server/build.ts
 # if the build is oss then remove the server/private directory
 RUN if [ "$BUILD" = "oss" ]; then rm -rf server/private; fi
 
-RUN if [ "$DATABASE" = "pg" ]; then npx drizzle-kit generate --dialect postgresql --schema ./server/db/pg/schema.ts --out init; else npx drizzle-kit generate --dialect $DATABASE --schema ./server/db/$DATABASE/schema.ts --out init; fi
+RUN if [ "$DATABASE" = "pg" ]; then npx drizzle-kit generate --dialect postgresql --schema ./server/db/pg/schema --out init; else npx drizzle-kit generate --dialect $DATABASE --schema ./server/db/$DATABASE/schema --out init; fi
 
-RUN mkdir -p dist 
+RUN mkdir -p dist
 RUN npm run next:build
 RUN node esbuild.mjs -e server/index.ts -o dist/server.mjs -b $BUILD
 RUN if [ "$DATABASE" = "pg" ]; then \
diff --git a/drizzle.pg.config.ts b/drizzle.pg.config.ts
index f6dbb665..febd5f45 100644
--- a/drizzle.pg.config.ts
+++ b/drizzle.pg.config.ts
@@ -2,8 +2,7 @@ import { defineConfig } from "drizzle-kit";
 import path from "path";
 
 const schema = [
-    path.join("server", "db", "pg", "schema.ts"),
-    path.join("server", "db", "pg", "privateSchema.ts")
+    path.join("server", "db", "pg", "schema"),
 ];
 
 export default defineConfig({
diff --git a/drizzle.sqlite.config.ts b/drizzle.sqlite.config.ts
index df635931..4912c256 100644
--- a/drizzle.sqlite.config.ts
+++ b/drizzle.sqlite.config.ts
@@ -3,8 +3,7 @@ import { defineConfig } from "drizzle-kit";
 import path from "path";
 
 const schema = [
-    path.join("server", "db", "sqlite", "schema.ts"),
-    path.join("server", "db", "sqlite", "privateSchema.ts")
+    path.join("server", "db", "sqlite", "schema"),
 ];
 
 export default defineConfig({
diff --git a/server/db/pg/index.ts b/server/db/pg/index.ts
index 5cc80e86..6e2c79f5 100644
--- a/server/db/pg/index.ts
+++ b/server/db/pg/index.ts
@@ -1,3 +1,3 @@
 export * from "./driver";
-export * from "./schema";
-export * from "./privateSchema";
+export * from "./schema/schema";
+export * from "./schema/privateSchema";
diff --git a/server/db/pg/privateSchema.ts b/server/db/pg/schema/privateSchema.ts
similarity index 100%
rename from server/db/pg/privateSchema.ts
rename to server/db/pg/schema/privateSchema.ts
diff --git a/server/db/pg/schema.ts b/server/db/pg/schema/schema.ts
similarity index 100%
rename from server/db/pg/schema.ts
rename to server/db/pg/schema/schema.ts
diff --git a/server/db/sqlite/driver.ts b/server/db/sqlite/driver.ts
index 6369c268..211ba8ea 100644
--- a/server/db/sqlite/driver.ts
+++ b/server/db/sqlite/driver.ts
@@ -1,6 +1,6 @@
 import { drizzle as DrizzleSqlite } from "drizzle-orm/better-sqlite3";
 import Database from "better-sqlite3";
-import * as schema from "./schema";
+import * as schema from "./schema/schema";
 import path from "path";
 import fs from "fs";
 import { APP_PATH } from "@server/lib/consts";
diff --git a/server/db/sqlite/index.ts b/server/db/sqlite/index.ts
index 8c7a15e5..6e2c79f5 100644
--- a/server/db/sqlite/index.ts
+++ b/server/db/sqlite/index.ts
@@ -1,3 +1,3 @@
 export * from "./driver";
-export * from "./schema";
-export * from "./privateSchema";
\ No newline at end of file
+export * from "./schema/schema";
+export * from "./schema/privateSchema";
diff --git a/server/db/sqlite/privateSchema.ts b/server/db/sqlite/schema/privateSchema.ts
similarity index 100%
rename from server/db/sqlite/privateSchema.ts
rename to server/db/sqlite/schema/privateSchema.ts
diff --git a/server/db/sqlite/schema.ts b/server/db/sqlite/schema/schema.ts
similarity index 100%
rename from server/db/sqlite/schema.ts
rename to server/db/sqlite/schema/schema.ts