diff --git a/.drone.yml b/.drone.yml
index 356b3ee..4a9cc2f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,6 +28,8 @@ steps:
       - pip install psycopg2
       - python3 db-creation.py
     environment:
-     POSTGRES_ROOT_PASSWORD:
-       from_secret: db_root_password
+      POSTGRES_USER:
+        from_secret: db_user
+      POSTGRES_PASSWORD:
+        from_secret: db_password
     depends_on: [ deploy-container-pgsql ]
diff --git a/database/db-creation.py b/database/db-creation.py
index f9db5b3..bc6c5b6 100644
--- a/database/db-creation.py
+++ b/database/db-creation.py
@@ -2,13 +2,14 @@ import os
 import psycopg2
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
-env_root_password = os.getenv('POSTGRES_ROOT_PASSWORD')
+env_user = os.getenv('POSTGRES_USER')
+env_password = os.getenv('POSTGRES_PASSWORD')
 
 # Establish connection to the PostgreSQL database
 conn = psycopg2.connect(
     dbname="postgres", 
-    user="postgres", 
-    password=env_root_password, 
+    user=env_user, 
+    password=env_password, 
     host="felixmielcarek-bigbrotherdb"
 )
 conn.autocommit = True