diff --git a/package.json b/package.json
index 0230cf27e..182c5840b 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,9 @@
     "test": "vitest",
     "test:ui": "vitest --ui",
     "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "docker:build": "turbo build && docker build . -t homarr:dev",
+    "docker:start": "docker run --env-file ./.env -p 7575:7575 homarr:dev "
   },
   "dependencies": {
     "@ctrl/deluge": "^4.1.0",
diff --git a/src/pages/api/configs/tryPassword.tsx b/src/pages/api/configs/tryPassword.tsx
index 1632985ab..6e6b98670 100644
--- a/src/pages/api/configs/tryPassword.tsx
+++ b/src/pages/api/configs/tryPassword.tsx
@@ -5,8 +5,12 @@ function Post(req: NextApiRequest, res: NextApiResponse) {
   const { tried, type = 'password' } = req.body;
   // If the type of password is "edit", we run this branch to check the edit password
   if (type === 'edit') {
-    if (tried === process.env.EDIT_MODE_PASSWORD) {
-      process.env.DISABLE_EDIT_MODE = process.env.DISABLE_EDIT_MODE === 'true' ? 'false' : 'true';
+    if ((tried === process.env.EDIT_MODE_PASSWORD) !== undefined) {
+      if (process.env.DISABLE_EDIT_MODE?.toLowerCase() === 'true') {
+        process.env.DISABLE_EDIT_MODE = 'false';
+      } else {
+        process.env.DISABLE_EDIT_MODE = 'true';
+      }
       return res.status(200).json({
         success: true,
       });
diff --git a/src/server/api/routers/docker/DockerSingleton.ts b/src/server/api/routers/docker/DockerSingleton.ts
index 9694059be..7ddc9cc6e 100644
--- a/src/server/api/routers/docker/DockerSingleton.ts
+++ b/src/server/api/routers/docker/DockerSingleton.ts
@@ -9,12 +9,7 @@ export default class DockerSingleton extends Docker {
 
   public static getInstance(): DockerSingleton {
     if (!DockerSingleton.dockerInstance) {
-      DockerSingleton.dockerInstance = new Docker({
-        // If env variable DOCKER_HOST is not set, it will use the default socket
-        ...(process.env.DOCKER_HOST && { host: process.env.DOCKER_HOST }),
-        // Same thing for docker port
-        ...(process.env.DOCKER_PORT && { port: process.env.DOCKER_PORT }),
-      });
+      DockerSingleton.dockerInstance = new Docker();
     }
     return DockerSingleton.dockerInstance;
   }