diff --git a/abra.sh b/abra.sh
index 59c0156..fcf82eb 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1 +1 @@
-export PRETIX_CONFIG_VERSION=v1
\ No newline at end of file
+export PRETIX_CONFIG_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 4165936..c2aa892 100644
--- a/compose.yml
+++ b/compose.yml
@@ -46,7 +46,7 @@ services:
     secrets:
       - db_password
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/pretix.cfg.tmpl b/pretix.cfg.tmpl
index dc2784d..d779080 100644
--- a/pretix.cfg.tmpl
+++ b/pretix.cfg.tmpl
@@ -6,7 +6,7 @@ url=https://{{ env "DOMAIN" }}
 currency=EUR
 datadir=/data
 plugins_default=pretix.plugins.sendmail,pretix.plugins.statistics
-cookie_domain=.pretix.de
+cookie_domain=.{{ env "DOMAIN" }}
 loglevel=INFO
 trust_x_forwarded_for=on
 trust_x_forwarded_proto=on
@@ -23,7 +23,7 @@ name=pretix
 user=pretix
 password={{ secret "db_password" }}
 host=db
-port=3306
+port=5432
 
 [mail]
 from={{ env "SMTP_FROM" }}
@@ -47,7 +47,7 @@ enabled=en,de
 
 [celery]
 backend=redis://redis:6379/1
-broker=redis://redis:6379/1
+broker=redis://redis:6379/2
 
 [pretix_file_upload]
 ; Max upload size for images in MiB, defaults to 10 MiB