diff --git a/client/src/pages/Profile/Profile.tsx b/client/src/pages/Profile/Profile.tsx
index 0957a5a..8f62b5d 100644
--- a/client/src/pages/Profile/Profile.tsx
+++ b/client/src/pages/Profile/Profile.tsx
@@ -44,8 +44,9 @@ function Profile() {
 		if (view === "personal") {
 			if (emailRef.current) emailRef.current.value = user.email || "";
 			if (phoneRef.current) phoneRef.current.value = user.phone_number || "";
-			if (siretRef.current) siretRef.current.value = user.siret || "";
-			if (companyNameRef.current)
+			if (siretRef.current && user.role === "trainer")
+				siretRef.current.value = user.siret || "";
+			if (companyNameRef.current && user.role === "trainer")
 				companyNameRef.current.value = user.company_name || "";
 		}
 	}, [user, navigate, view]);
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 1bd1a1f..804710a 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -30,11 +30,14 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5434:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
+
   adminer:
     image: adminer
     restart: unless-stopped
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 2e69964..9b79a97 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -30,11 +30,14 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5433:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
+
   adminer:
     image: adminer
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 99f0d07..ce9643a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,11 +30,13 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5433:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
 
   adminer:
     image: adminer