diff --git a/defaults/settings.yml.default b/defaults/settings.yml.default
index 5f4c6aa1f..b550313ac 100644
--- a/defaults/settings.yml.default
+++ b/defaults/settings.yml.default
@@ -87,6 +87,9 @@ plex_auto_collections:
   state: present 
 plex_meta_manager:
   time: 03:00
+postgres:
+  published_ports:
+    - 127.0.0.1:5432:5432
 qbittorrentvpn:
   vpn_endpoint: netherlands.ovpn
   vpn_user: your_vpn_username
diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index 24dac3686..7b77268a3 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -30,13 +30,15 @@
       PUID: "{{ uid }}"
       PGID: "{{ gid }}"
       LOG_LEVEL: DEBUG
-      POSTGRES_PASSWORD: mysecretpassword
+      POSTGRES_USER: "{{ postgres.user }}"
+      POSTGRES_PASSWORD: "{{ postgres.password }}"
     volumes:
       - /opt/postgres/data:/var/lib/postgresql/data
     labels:
       "com.github.cloudbox.cloudbox_managed": "true"
     networks:
       - name: cloudbox
+    published_ports: "{{ postgres.published_ports|default('127.0.0.1:5432:5432',true) }}"
     purge_networks: yes
     restart_policy: unless-stopped
     state: started