diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..848ea5f
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,18 @@
+{
+  "dockerComposeFile": ["../docker-compose.yml", "docker-compose_extend.yml"],
+  "service": "web",
+  "name": "pkmntrade-club",
+  "workspaceFolder": "/workspace",
+  "postStartCommand": "direnv allow /workspace",
+  "remoteUser": "app",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-python.black-formatter",
+        "ms-python.isort",
+        "ms-azuretools.vscode-docker"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.devcontainer/docker-compose_extend.yml b/.devcontainer/docker-compose_extend.yml
new file mode 100644
index 0000000..1ec784a
--- /dev/null
+++ b/.devcontainer/docker-compose_extend.yml
@@ -0,0 +1,11 @@
+services:
+  web:
+    volumes:
+      - .:/workspace:cached
+      - ./seed:/seed:ro
+      - ./src/pkmntrade_club:/app/lib/python3.12/site-packages/pkmntrade_club:cached
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - seccomp:unconfined
+    command: /bin/sh -c "while sleep 1000; do :; done"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c112cf3..256d2ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,7 @@ WORKDIR /app
 # Don't run app as root
 RUN <<EOT
 groupadd -r app -g 10003
-useradd -r -d /app -u 10003 -s /sbin/nologin -g app -N app
+useradd -r -d /app -u 10003 -s /bin/bash -g app -N app
 EOT
 
 # Runtime dependencies
@@ -73,7 +73,7 @@ apt-get update -qy
 apt-get install -qyy \
     -o APT::Install-Recommends=false \
     -o APT::Install-Suggests=false \
-    xvfb curl
+    xvfb curl direnv
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 EOT
@@ -88,6 +88,8 @@ COPY --chown=app:app --chmod=700 /scripts/deploy.sh /deploy.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 
+RUN mkdir -p /app/.cursor-server && chown app:app /app /app/.cursor-server
+
 USER app
 
 EXPOSE 8000
diff --git a/docker-compose.yml b/docker-compose.yml
index db8d728..7e2146f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,16 +12,17 @@ services:
     build: .
     volumes:
       - ./.env.dev:/.env:ro
-      - ./seed:/seed:ro
-      - ./src/pkmntrade_club/accounts/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/accounts/migrations # for makemigrations
-      - ./src/pkmntrade_club/cards/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/cards/migrations # for makemigrations
-      - ./src/pkmntrade_club/trades/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/trades/migrations # for makemigrations
-      - ./src/pkmntrade_club/home/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/home/migrations # for makemigrations
     env_file:
       - .env.dev
     depends_on:
       db:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
   db:
     image: postgres:16
     ports:
diff --git a/docker-compose_prod.yml b/docker-compose_prod.yml
index 715b5c6..3b033f8 100644
--- a/docker-compose_prod.yml
+++ b/docker-compose_prod.yml
@@ -18,4 +18,10 @@ services:
       - .env.production
     deploy:
       mode: replicated
-      replicas: 4
\ No newline at end of file
+      replicas: 4
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s