diff --git a/.env b/.env
index a14fa08..703f62b 100644
--- a/.env
+++ b/.env
@@ -23,7 +23,7 @@ WOPI_SERVER=http://collabora:9980
 # ADMIN_PASSWORD=
 
 ## Symfony/framework-bundle
-TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$',${TRUSTED_HOST_2},${TRUSTED_HOST_3}
+TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$'
 TRUSTED_PROXIES=~
 
 ## Doctrine/doctrine-bundle
diff --git a/docker-compose.override.dev.template.yml b/docker-compose.override.dev.template.yml
index 7b77a75..54640ab 100644
--- a/docker-compose.override.dev.template.yml
+++ b/docker-compose.override.dev.template.yml
@@ -18,6 +18,8 @@ services:
       - PHP_FPM_USER=1000
       - PHP_FPM_GROUP=100
       - COMPOSER_HOME=/var/www/app/.composer
+      # this is required to run tests with database from vendor/chill-project/chill-bundles directory
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
     links:
       - smtp
 
@@ -26,9 +28,11 @@ services:
       - .:/var/www/app
 
   db:
-    image: postgis/postgis:12-3.1-alpine
     volumes:
       - ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+        # if you prefer to store the data somewhere into your user path, instead of the docker's path
+        # this is useful not to loose data when you run `docker container prune` or `docker volume prune`
+      - /path/to/your/db/data:/var/lib/postgresql
     ports:
       - "127.0.0.1:5432:5432"
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fbbac8..d4b8052 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     ports:
       - "8001:80"
   db:
-    image: postgis/postgis:12-3.1-alpine
+    image: postgis/postgis:14-3.3-alpine
     volumes:
       - ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
     ports: