diff --git a/.env.sample b/.env.sample
index 4e4d21b..57c9f47 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,6 +1,6 @@
-SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-POSTGRES_USER=icarus
-POSTGRES_PASSWORD=password
-POSTGRES_DB=icarus_db
-POSTGRES_HOST=main_db
-DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}
\ No newline at end of file
+SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
+POSTGRES_MAIN_USER=icarus
+POSTGRES_MAIN_PASSWORD=password
+POSTGRES_MAIN_DB=icarus_db
+POSTGRES_MAIN_HOST=main_db
+DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 041fdb3..2a77885 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -48,9 +48,9 @@ services:
     container_name: icarus_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_USER:-icarus}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_DB:-icarus_db}
+      POSTGRES_USER: ${POSTGRES_MAIN_USER:-icarus}
+      POSTGRES_PASSWORD: ${POSTGRES_MAIN_PASSWORD:-password}
+      POSTGRES_DB: ${POSTGRES_MAIN_DB:-icarus_db}
     volumes:
       # Persist database data using a named volume
       - postgres_data:/var/lib/postgresql/data