diff --git a/.env.sample b/.env.sample
index e49928f..1f488fa 100644
--- a/.env.sample
+++ b/.env.sample
@@ -4,12 +4,12 @@ DB_FILE=database.sqlite
 DB_NAME=retro-pilot
 DB_USER=root
 DB_PASS=root
-DB_HOST=db
+DB_HOST=db # If using docker compose, this should match the container service name
 DB_PORT=5432
 ALLOW_REGISTRATION=true
 HTTP_INTERFACE=0.0.0.0
 HTTP_PORT=3000
-CAN_SEND_MAIL=true # Skips sending mail, all attempted mail is logged under DEBUG
+CAN_SEND_MAIL=true # Set to false to skip sending mail, all attempted mail is logged under DEBUG
 SMTP_HOST="localhost" # credentials for smtp server to send account registration mails. if not filled in, get the generated tokens from the server.log manually
 SMTP_PORT=25
 SMTP_USER=root
diff --git a/.gitignore b/.gitignore
index 55ec2e0..2deba24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,9 @@
 node_modules/
 
 # Data
-realdata/
+realdata
+database
 *.sqlite
-!database.empty.sqlite
-config.js
-config_prod.js
 test/.devKeys
 
 # Miscellaneous
@@ -20,4 +18,5 @@ test/.devKeys
 *.log
 .env
 
-data/certbot
\ No newline at end of file
+data/*
+!data/nginx
diff --git a/docker-compose.yml b/docker-compose.yml
index b8a8790..0ff515b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,8 @@ services:
       - '5438:5432'
     volumes:
       - ./sql/create_tables.sql:/docker-entrypoint-initdb.d/create_tables.sql
+      - ./data/postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: root
-      POSTGRES_DB: retro-pilot
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASS}
+      POSTGRES_DB: ${DB_NAME}