diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 96b86fe..d30a721 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -2,9 +2,10 @@ import Database from 'better-sqlite3';
 import { drizzle } from 'drizzle-orm/better-sqlite3';
 import * as schema from './schema';
 import { existsSync, mkdirSync } from 'fs';
-import { dirname } from 'path';
+import { dirname, join } from 'path';
 
-const DB_PATH = process.env.DATABASE_PATH || './data/taskplaner.db';
+const DATA_DIR = process.env.TASKPLANER_DATA_DIR || './data';
+const DB_PATH = join(DATA_DIR, 'taskplaner.db');
 
 // Ensure data directory exists
 const dbDir = dirname(DB_PATH);
diff --git a/src/lib/server/images/storage.ts b/src/lib/server/images/storage.ts
index 305f785..2c8ac81 100644
--- a/src/lib/server/images/storage.ts
+++ b/src/lib/server/images/storage.ts
@@ -1,9 +1,10 @@
 import { mkdir, writeFile, unlink } from 'node:fs/promises';
 import { join } from 'node:path';
 
-export const UPLOAD_DIR = 'data/uploads';
-export const ORIGINALS_DIR = 'data/uploads/originals';
-export const THUMBNAILS_DIR = 'data/uploads/thumbnails';
+const DATA_DIR = process.env.TASKPLANER_DATA_DIR || './data';
+export const UPLOAD_DIR = join(DATA_DIR, 'uploads');
+export const ORIGINALS_DIR = join(DATA_DIR, 'uploads/originals');
+export const THUMBNAILS_DIR = join(DATA_DIR, 'uploads/thumbnails');
 
 /**
  * Ensure upload directories exist