diff --git a/Dockerfile.dev b/Dockerfile.dev
index d59e3cf3..6985fc57 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,8 +1,7 @@
-FROM node:18-alpine
+FROM node:lts-alpine
 
 RUN apk -U upgrade \
   && apk add bash build-base python3 xdg-utils --no-cache \
   && npm install npm --global
 
-USER node
 WORKDIR /app
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 3beb5685..424d0a83 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,7 +1,6 @@
 services:
   planka-server:
     build:
-      context: .
       dockerfile: Dockerfile.dev
     image: planka-dev
     pull_policy: never
@@ -109,10 +108,15 @@ services:
       - POSTGRES_DB=planka
       - POSTGRES_HOST_AUTH_METHOD=trust
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
-      interval: 10s
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U postgres -d planka && psql -U postgres -d planka -c 'SELECT 1'",
+        ]
+      interval: 3s
       timeout: 5s
-      retries: 5
+      retries: 15
+      start_period: 10s
 
 volumes:
   db-data:
diff --git a/server/nodemon.json b/server/nodemon.json
new file mode 100644
index 00000000..d552807c
--- /dev/null
+++ b/server/nodemon.json
@@ -0,0 +1,15 @@
+{
+  "watch": [
+    "api/**/*.js",
+    "config/**/*.js",
+    "db/**/*.js",
+    "utils/**/*.js",
+    "app.js",
+    "constants.js"
+  ],
+  "ignore": ["node_modules", ".tmp", ".venv"],
+  "ext": "js,json",
+  "verbose": true,
+  "delay": 1000,
+  "legacyWatch": false
+}