diff --git a/database/src/config/index.ts b/database/src/config/index.ts
index f66a32fa1..fdfb1b57e 100644
--- a/database/src/config/index.ts
+++ b/database/src/config/index.ts
@@ -11,11 +11,17 @@ const constants = {
 }
 
 const database = {
-  DB_HOST: process.env.DB_HOST || 'localhost',
+  DB_CONNECT_RETRY_COUNT: process.env.DB_CONNECT_RETRY_COUNT
+    ? Number.parseInt(process.env.DB_CONNECT_RETRY_COUNT)
+    : 15,
+  DB_CONNECT_RETRY_DELAY_MS: process.env.DB_CONNECT_RETRY_DELAY_MS
+    ? Number.parseInt(process.env.DB_CONNECT_RETRY_DELAY_MS)
+    : 500,
+  DB_HOST: process.env.DB_HOST ?? 'localhost',
   DB_PORT: process.env.DB_PORT ? Number.parseInt(process.env.DB_PORT) : 3306,
-  DB_USER: process.env.DB_USER || 'root',
-  DB_PASSWORD: process.env.DB_PASSWORD || '',
-  DB_DATABASE: process.env.DB_DATABASE || 'gradido_community',
+  DB_USER: process.env.DB_USER ?? 'root',
+  DB_PASSWORD: process.env.DB_PASSWORD ?? '',
+  DB_DATABASE: process.env.DB_DATABASE ?? 'gradido_community',
 }
 
 const migrations = {
diff --git a/database/src/prepare.ts b/database/src/prepare.ts
index fc359c226..864368636 100644
--- a/database/src/prepare.ts
+++ b/database/src/prepare.ts
@@ -11,8 +11,8 @@ export enum DatabaseState {
 }
 
 export async function connectToDatabaseServer(
-  maxRetries = 15,
-  delayMs = 500,
+  maxRetries: number,
+  delayMs: number,
 ): Promise<Connection | null> {
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {