diff --git a/package.json b/package.json
index 2e1b0ee0c..8d8e86e72 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "start:api": "yarn workspace dbgate-api start",
     "start:app": "cd app && yarn start",
     "start:api:portal": "yarn workspace dbgate-api start:portal",
-    "start:api:covid": "yarn workspace dbgate-api start:covid",
+    "start:api:singledb": "yarn workspace dbgate-api start:singledb",
     "start:web": "yarn workspace dbgate-web dev",
     "start:sqltree": "yarn workspace dbgate-sqltree start",
     "start:tools": "yarn workspace dbgate-tools start",
diff --git a/packages/api/.env-portal b/packages/api/env/portal/.env
similarity index 100%
rename from packages/api/.env-portal
rename to packages/api/env/portal/.env
diff --git a/packages/api/.env-singledb b/packages/api/env/singledb/.env
similarity index 100%
rename from packages/api/.env-singledb
rename to packages/api/env/singledb/.env
diff --git a/packages/api/package.json b/packages/api/package.json
index 721a664d3..6c8238eed 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -53,8 +53,8 @@
   },
   "scripts": {
     "start": "env-cmd node src/index.js",
-    "start:portal": "env-cmd -f .env-portal node src/index.js",
-    "start:singledb": "env-cmd -f .env-singledb node src/index.js",
+    "start:portal": "env-cmd -f env/portal/.env node src/index.js",
+    "start:singledb": "env-cmd -f env/singledb/.env node src/index.js",
     "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db",
     "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test",
     "ts": "tsc",