diff --git a/package-lock.json b/package-lock.json
index f5204e7c..a3145242 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
 				"cli-table3": "^0.6.5",
 				"commander": "^12.1.0",
 				"cors": "^2.8.5",
-				"dotenv": "^16.3.1",
+				"dotenv": "^16.6.1",
 				"express": "^4.21.2",
 				"fastmcp": "^3.5.0",
 				"figlet": "^1.8.0",
@@ -79,7 +79,6 @@
 				"@types/marked-terminal": "^6.1.1",
 				"concurrently": "^9.2.1",
 				"cross-env": "^10.0.0",
-				"dotenv-mono": "^1.5.1",
 				"execa": "^8.0.1",
 				"jest": "^29.7.0",
 				"jest-environment-node": "^29.7.0",
@@ -15575,52 +15574,6 @@
 				"url": "https://dotenvx.com"
 			}
 		},
-		"node_modules/dotenv-expand": {
-			"version": "12.0.3",
-			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.3.tgz",
-			"integrity": "sha512-uc47g4b+4k/M/SeaW1y4OApx+mtLWl92l5LMPP0GNXctZqELk+YGgOPIIC5elYmUH4OuoK3JLhuRUYegeySiFA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"dotenv": "^16.4.5"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://dotenvx.com"
-			}
-		},
-		"node_modules/dotenv-mono": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/dotenv-mono/-/dotenv-mono-1.5.1.tgz",
-			"integrity": "sha512-dt7bK/WKQvL0gcdTxjI7wD4MhVR5F4bCk70XMAgnrbWN3fdhpyhWCypYbZalr/vjLURLA7Ib9/VCzazRLJnp1Q==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"cross-spawn": "^7.0.6",
-				"dotenv": "^17.2.0",
-				"dotenv-expand": "^12.0.2",
-				"minimist": "^1.2.8"
-			},
-			"bin": {
-				"dotenv": "dist/cli.js",
-				"dotenv-mono": "dist/cli.js"
-			}
-		},
-		"node_modules/dotenv-mono/node_modules/dotenv": {
-			"version": "17.2.2",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.2.tgz",
-			"integrity": "sha512-Sf2LSQP+bOlhKWWyhFsn0UsfdK/kCWRv1iuA2gXAwt3dyNabr6QSj00I2V10pidqz69soatm9ZwZvpQMTIOd5Q==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://dotenvx.com"
-			}
-		},
 		"node_modules/dts-resolver": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/dts-resolver/-/dts-resolver-2.1.2.tgz",
@@ -33481,7 +33434,6 @@
 				"tsup": "^8.5.0"
 			},
 			"devDependencies": {
-				"dotenv-mono": "^1.5.1",
 				"typescript": "^5.9.2"
 			}
 		},
@@ -33495,7 +33447,6 @@
 			"devDependencies": {
 				"@types/node": "^22.10.5",
 				"@vitest/coverage-v8": "^3.2.4",
-				"dotenv-mono": "^1.5.1",
 				"typescript": "^5.9.2",
 				"vitest": "^3.2.4"
 			}
diff --git a/package.json b/package.json
index 99f7daa6..62adc9bc 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
 		"cli-table3": "^0.6.5",
 		"commander": "^12.1.0",
 		"cors": "^2.8.5",
-		"dotenv": "^16.3.1",
+		"dotenv": "^16.6.1",
 		"express": "^4.21.2",
 		"fastmcp": "^3.5.0",
 		"figlet": "^1.8.0",
@@ -133,7 +133,6 @@
 		"@types/marked-terminal": "^6.1.1",
 		"concurrently": "^9.2.1",
 		"cross-env": "^10.0.0",
-		"dotenv-mono": "^1.5.1",
 		"execa": "^8.0.1",
 		"jest": "^29.7.0",
 		"jest-environment-node": "^29.7.0",
diff --git a/packages/build-config/package.json b/packages/build-config/package.json
index c2a3828f..d3fb875a 100644
--- a/packages/build-config/package.json
+++ b/packages/build-config/package.json
@@ -20,7 +20,6 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"dotenv-mono": "^1.5.1",
 		"typescript": "^5.9.2"
 	},
 	"dependencies": {
diff --git a/packages/build-config/src/tsdown.base.ts b/packages/build-config/src/tsdown.base.ts
index 6a4e57d9..b0a0d984 100644
--- a/packages/build-config/src/tsdown.base.ts
+++ b/packages/build-config/src/tsdown.base.ts
@@ -43,9 +43,9 @@ export const baseConfig: Partial<UserConfig> = {
 export function mergeConfig(
 	base: Partial<UserConfig>,
 	overrides: Partial<UserConfig>
-): Partial<UserConfig> {
+): UserConfig {
 	return {
 		...base,
 		...overrides
-	};
+	} as UserConfig;
 }
diff --git a/packages/tm-core/package.json b/packages/tm-core/package.json
index 005160d9..0e3b6553 100644
--- a/packages/tm-core/package.json
+++ b/packages/tm-core/package.json
@@ -36,7 +36,6 @@
 	"devDependencies": {
 		"@types/node": "^22.10.5",
 		"@vitest/coverage-v8": "^3.2.4",
-		"dotenv-mono": "^1.5.1",
 		"typescript": "^5.9.2",
 		"vitest": "^3.2.4"
 	},
diff --git a/packages/tm-core/src/storage/storage-factory.ts b/packages/tm-core/src/storage/storage-factory.ts
index a928f30a..34e5dcdd 100644
--- a/packages/tm-core/src/storage/storage-factory.ts
+++ b/packages/tm-core/src/storage/storage-factory.ts
@@ -82,7 +82,7 @@ export class StorageFactory {
 							apiAccessToken: credentials.token,
 							apiEndpoint:
 								config.storage?.apiEndpoint ||
-								process.env.HAMSTER_API_URL ||
+								process.env.TM_PUBLIC_BASE_DOMAIN ||
 								'https://tryhamster.com/api'
 						};
 						config.storage = nextStorage;
@@ -112,7 +112,7 @@ export class StorageFactory {
 							apiAccessToken: credentials.token,
 							apiEndpoint:
 								config.storage?.apiEndpoint ||
-								process.env.HAMSTER_API_URL ||
+								process.env.TM_PUBLIC_BASE_DOMAIN ||
 								'https://tryhamster.com/api'
 						};
 						config.storage = nextStorage;
diff --git a/tsdown.config.ts b/tsdown.config.ts
index b2780d60..fdf432a7 100644
--- a/tsdown.config.ts
+++ b/tsdown.config.ts
@@ -1,8 +1,6 @@
 import { defineConfig } from 'tsdown';
 import { baseConfig, mergeConfig } from '@tm/build-config';
-import { load as dotenvLoad } from 'dotenv-mono';
-
-dotenvLoad();
+import 'dotenv/config';
 
 // Get all TM_PUBLIC_* env variables for build-time injection
 const getBuildTimeEnvs = () => {