diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c53f0cc531b8c334479f2ffc4d0f6fd5688b9c9a..7f6a67b532f69a2bba2efd1781c794a0e0c5dacc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ test-style:
       -e USE_SQLITE_AS_DB=$USE_SQLITE_AS_DB
       -e POSTGRES_PASSWORD=$POSTGRES_PASSWORD
       -e POSTGRES_HOST=db-local
-      -e POSTGRES_DBNAME=$POSTGRES_DBNAME
+      -e POSTGRES_DB=$POSTGRES_DB
       -e POSTGRES_USER=$POSTGRES_USER
       -v  $(pwd)/persistent:/code/persistent
       "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
@@ -58,7 +58,7 @@ test-sqlite:
 test-pg:
   extends: ".test"
   variables:
-    POSTGRES_DBNAME: "ippidb"
+    POSTGRES_DB: "ippidb"
     POSTGRES_USER: "ippidb"
     POSTGRES_PASSWORD: "ippidb"
     POSTGRES_HOST: "postgres"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 93f97e77a68f7a5db36602b4baac3bfa8a5d43dd..53e34572dbd44977da44be3afb3f8751c2abfa65 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,26 +1,22 @@
 version: "3"
 
 services:
-  db:
+  db-local:
     image: postgres:14
     volumes:
       - ippidb-dev-db-data:/var/lib/postgresql/data
     restart: always
     ports:
       - "5433:5432"
-    environment:
-      - POSTGRES_NAME=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+    env_file:
+      - ./ippisite/ippisite/settings.example.ini
+
 
   django:
     build:
       context: ./ippisite
-    environment:
-      - POSTGRES_NAME=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_HOST=db
+    env_file:
+      - ./ippisite/ippisite/settings.example.ini
     entrypoint: /docker-entrypoint.sh
     command: gunicorn --reload --reload-engine inotify ippisite.wsgi -b 0.0.0.0:8000
     volumes:
@@ -28,7 +24,8 @@ services:
     ports:
       - "8095:8000"
     depends_on:
-      - db
+      - db-local
+
 
 
 
diff --git a/ippisite/ippisite/settings.example.ini b/ippisite/ippisite/settings.example.ini
new file mode 100644
index 0000000000000000000000000000000000000000..c75438558c933740056eadbe4506ce966b29841c
--- /dev/null
+++ b/ippisite/ippisite/settings.example.ini
@@ -0,0 +1,5 @@
+[settings]
+POSTGRES_DB=ippidb-db
+POSTGRES_USER=ippidb-user
+POSTGRES_PASSWORD=ippidb-pwd
+POSTGRES_HOST=db-local
\ No newline at end of file
diff --git a/ippisite/ippisite/settings.py b/ippisite/ippisite/settings.py
index 649818b7a878d6a9e5bb4f359edb5c3da2ce26c7..28438a53f641902744c9c63090cba60999404219 100644
--- a/ippisite/ippisite/settings.py
+++ b/ippisite/ippisite/settings.py
@@ -122,7 +122,7 @@ else:
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.postgresql",
-            "NAME": os.environ.get("POSTGRES_DBNAME"),
+            "NAME": os.environ.get("POSTGRES_DB"),
             "USER": os.environ.get("POSTGRES_USER"),
             "PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
             "HOST": os.environ.get("POSTGRES_HOST"),