diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index faeeeff87..94d1a1bd7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,13 +2,39 @@
   "name": "PHP & SQLite",
   "image": "ghcr.io/asbiin/devcontainers/php:8.4",
 
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "xdebug.php-debug",
+        "bmewburn.vscode-intelephense-client",
+        "xdebug.php-pack",
+        "devsense.phptools-vscode",
+        "mikestead.dotenv",
+        "editorconfig.editorconfig",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+        "vue.volar",
+        "qwtel.sqlite-viewer"
+      ]
+    }
+  },
+
   // For use with PHP or Apache (e.g.php -S localhost:8080 or apache2ctl start)
   "forwardPorts": [8080],
   "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {},
     "ghcr.io/devcontainers/features/github-cli:1": {}
   },
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": ".devcontainer/postCreate.sh",
-  "postStartCommand": ".devcontainer/postStart.sh"
+  "postStartCommand": ".devcontainer/postStart.sh",
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root",
+
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
+  ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index c25380fb2..2915891ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,11 @@
 services:
   laravel.test: &app
     build:
-      context: ./vendor/laravel/sail/runtimes/8.3
+      context: ./vendor/laravel/sail/runtimes/8.4
       dockerfile: Dockerfile
       args:
         WWWGROUP: '${WWWGROUP}'
-    image: sail-8.3/app
+    image: sail-8.4/app
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     ports: