diff --git a/server/package.json b/server/package.json
index b7a599ef3..7e0f963df 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,8 +11,9 @@
     "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
     "test-watch": "jest --watch",
     "coverage": "jest --coverage",
-    "typeorm": "npx ts-node -r dotenv/config ./node_modules/typeorm/cli.js",
-    "typeorm:migration:generate": "npx ts-node -r dotenv/config ./node_modules/typeorm/cli.js migration:generate -d src/dataSource.ts"
+    "typeorm": "typeorm-ts-node-commonjs",
+    "typeorm:migration:generate": "npm run migration",
+    "migration": "typeorm-ts-node-commonjs migration:generate -d src/dataSource.ts"
   },
   "dependencies": {
     "@apalchys/pino-cloudwatch": "0.9.0",
diff --git a/server/src/dataSource.ts b/server/src/dataSource.ts
index 4af0c618a..39742e314 100644
--- a/server/src/dataSource.ts
+++ b/server/src/dataSource.ts
@@ -1,3 +1,5 @@
+import 'dotenv/config';
+
 import { DataSource } from 'typeorm';
 import { dataSourceOptions } from './dataSourceOptions';