diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7ec51536b..04653336d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 // https://aka.ms/devcontainer.json
 {
-	"name": "Existing Docker Compose (Extend)",
+	"name": "Speedtest Tracker Dev Environment",
 	"dockerComposeFile": [
-		"../docker-compose.yml"
+		"../compose.yaml"
 	],
 	"service": "laravel.test",
 	"workspaceFolder": "/var/www/html",
@@ -20,7 +20,7 @@
 		}
 	},
 	"remoteUser": "sail",
-	"postCreateCommand": "chown -R 1000:1000 /var/www/html 2>/dev/null || true"
+	"postCreateCommand": "composer install && npm install && npm run build && touch database/database.sqlite && php artisan migrate:fresh --force"
 	// "forwardPorts": [],
 	// "runServices": [],
 	// "shutdownAction": "none",
diff --git a/.env.example b/.env.example
index 1a762a1ce..b09ac0014 100644
--- a/.env.example
+++ b/.env.example
@@ -18,6 +18,11 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=sqlite
+#DB_HOST=
+#DB_PORT=
+#DB_DATABASE=
+#DB_USERNAME=
+#DB_PASSWORD=
 
 SESSION_DRIVER=cookie
 SESSION_LIFETIME=10080
@@ -42,3 +47,7 @@ MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="Speedtest Tracker"
 
 VITE_APP_NAME="${APP_NAME}"
+
+# For the Dev Container
+# WWWUSER=1000
+# WWWGROUP=1000
diff --git a/compose.yaml b/compose.yaml
index acd813d9b..a4ccb9e57 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -25,7 +25,7 @@ services:
             - mailpit
             - apprise
     pgsql:
-        image: 'postgres:17-alpine'
+        image: 'postgres:18-alpine'
         ports:
             - '${FORWARD_DB_PORT:-5432}:5432'
         environment: