diff --git a/src/go/collectors/go.d.plugin/config/go.d/postgres.conf b/src/go/collectors/go.d.plugin/config/go.d/postgres.conf
index e92dded280b764..b684b70e83e521 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/postgres.conf
+++ b/src/go/collectors/go.d.plugin/config/go.d/postgres.conf
@@ -1,9 +1,10 @@
 ## All available configuration options, their descriptions and default values:
 ## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/postgres#readme
 
-jobs:
-  - name: local
-    dsn: 'host=/var/run/postgresql dbname=postgres user=netdata'
-    #collect_databases_matching: '*'
+#jobs:
+#  - name: local
+#    dsn: 'host=/var/run/postgresql dbname=postgres user=netdata'
+#    #collect_databases_matching: '*'
+#
 #  - name: local
 #    dsn: 'postgresql://netdata@127.0.0.1:5432/postgres'
diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf b/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf
index 7f3c93f768da9c..4148fcd29d12dd 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf
+++ b/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf
@@ -313,9 +313,15 @@ compose:
           address: redis://@{{.IPAddress}}:{{.Port}}
       - selector: "postgres"
         template: |
-          module: postgres
-          name: local
-          dsn: postgresql://netdata@{{.Address}}/postgres
+          - module: postgres
+            name: local
+            dsn: 'host=/var/run/postgresql dbname=postgres user=postgres'
+          - module: postgres
+            name: local
+            dsn: 'host=/var/run/postgresql dbname=postgres user=netdata'
+          - module: postgres
+            name: local
+            dsn: postgresql://netdata@{{.Address}}/postgres
       - selector: "powerdns"
         template: |
           module: powerdns