diff --git a/.env.example b/.env.example
index 6f62d3f90..1a762a1ce 100644
--- a/.env.example
+++ b/.env.example
@@ -8,9 +8,6 @@ APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=en_US
 
-APP_MAINTENANCE_DRIVER=file
-APP_MAINTENANCE_STORE=database
-
 PHP_CLI_SERVER_WORKERS=4
 
 BCRYPT_ROUNDS=12
@@ -22,16 +19,18 @@ LOG_LEVEL=debug
 
 DB_CONNECTION=sqlite
 
+SESSION_DRIVER=cookie
+SESSION_LIFETIME=10080
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
 BROADCAST_CONNECTION=log
-CACHE_STORE=database
 FILESYSTEM_DISK=local
 QUEUE_CONNECTION=database
 
-SESSION_DRIVER=database
-SESSION_LIFETIME=120
-SESSION_ENCRYPT=false
-SESSION_PATH=/
-SESSION_DOMAIN=null
+CACHE_STORE=database
+# CACHE_PREFIX=
 
 MAIL_MAILER=smtp
 MAIL_HOST=mailhog
@@ -41,3 +40,5 @@ MAIL_PASSWORD=null
 MAIL_SCHEME=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="Speedtest Tracker"
+
+VITE_APP_NAME="${APP_NAME}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 1112e7846..6e29e727a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,33 @@ services:
         networks:
             - sail
         depends_on:
+            - pgsql
             - mailpit
+    pgsql:
+        image: 'postgres:17'
+        ports:
+            - '${FORWARD_DB_PORT:-5432}:5432'
+        environment:
+            PGPASSWORD: '${DB_PASSWORD:-secret}'
+            POSTGRES_DB: '${DB_DATABASE}'
+            POSTGRES_USER: '${DB_USERNAME}'
+            POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
+        volumes:
+            - 'sail-pgsql:/var/lib/postgresql/data'
+            - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql'
+        networks:
+            - sail
+        healthcheck:
+            test:
+                - CMD
+                - pg_isready
+                - '-q'
+                - '-d'
+                - '${DB_DATABASE}'
+                - '-U'
+                - '${DB_USERNAME}'
+            retries: 3
+            timeout: 5s
     mailpit:
         image: 'axllent/mailpit:latest'
         ports:
@@ -32,3 +58,6 @@ services:
 networks:
     sail:
         driver: bridge
+volumes:
+    sail-pgsql:
+        driver: local