diff --git a/roles/odoo/defaults/main.yml b/roles/odoo/defaults/main.yml
index bef9bad..9d6c6d6 100644
--- a/roles/odoo/defaults/main.yml
+++ b/roles/odoo/defaults/main.yml
@@ -18,7 +18,6 @@ _odoo_memory_request: 512Mi
 _odoo_postgresql_database_name: "MASTER"
 _odoo_postgresql_defaultdb: postgres
 _odoo_postgresql_port: 5432
-_odoo_postgresql_service_name: postgresql
 _odoo_postgresql_user: odoo
 _odoo_server_wide_modules: web,monitoring_status
 _odoo_smtp_password: YWRtaW4=
diff --git a/roles/odoo/templates/odoo_deployment_config.j2 b/roles/odoo/templates/odoo_deployment_config.j2
index 87144ff..4dbe150 100644
--- a/roles/odoo/templates/odoo_deployment_config.j2
+++ b/roles/odoo/templates/odoo_deployment_config.j2
@@ -31,7 +31,7 @@ spec:
         imagePullPolicy: IfNotPresent
         env:
           - name: PGHOST
-            value: "{{ _odoo_postgresql_service_name }}"
+            value: "{{ _odoo_name }}-postgresql"
           - name: PGPORT
             value: "{{ _odoo_postgresql_port }}"
           - name: PGUSER
@@ -39,7 +39,7 @@ spec:
           - name: PGPASSWORD
             valueFrom:
               secretKeyRef:
-                name: "{{ _postgresql_name }}"
+                name: "{{ _odoo_name }}-postgresql"
                 key: "database-password"
           - name: DEFAULTDB
             value: "{{ _odoo_postgresql_defaultdb }}"
@@ -50,12 +50,12 @@ spec:
           - name: ODOO_ADMIN_PASSWD
             valueFrom:
               secretKeyRef:
-                name: "{{ _odoo_name }}"
+                name: "{{ _odoo_name }}-odoo"
                 key: "odoo-admin-passwd"
           - name: ODOO_ADMIN_USER_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: "{{ _odoo_name }}"
+                name: "{{ _odoo_name }}-odoo"
                 key: "odoo-admin-user-password"
           - name: ODOO_ADMIN_USER_TIMEZONE
             value: {{ _odoo_admin_user_timezone }}
@@ -66,7 +66,7 @@ spec:
           - name: ODOO_SMTP_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: "{{ _odoo_name }}"
+                name: "{{ _odoo_name }}-odoo"
                 key: "odoo-smtp-password"
           - name: ODOO_SMTP_PORT
             value: "{{ _odoo_smtp_port }}"