diff --git a/imageroot/state/config_server.json b/imageroot/state/config_server.json
index cd95fd8..a443f6f 100644
--- a/imageroot/state/config_server.json
+++ b/imageroot/state/config_server.json
@@ -5,9 +5,9 @@
             "Group": "Localhost server",
             "Port": 5432,
             "Username": "postgres",
-            "Host": "127.0.0.1",
+            "Host": "/var/run/postgresql/",
             "MaintenanceDB": "postgres",
-            "PassFile": "/pgpassfile"
+            "PassFile": ""
         }
     }
 }
\ No newline at end of file
diff --git a/imageroot/state/pgpassfile b/imageroot/state/pgpassfile
deleted file mode 100644
index ac64446..0000000
--- a/imageroot/state/pgpassfile
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1:5432:postgres:postgres:Nethesis,1234
\ No newline at end of file
diff --git a/imageroot/systemd/user/pgadmin-app.service b/imageroot/systemd/user/pgadmin-app.service
index e6e3057..ca43782 100644
--- a/imageroot/systemd/user/pgadmin-app.service
+++ b/imageroot/systemd/user/pgadmin-app.service
@@ -24,14 +24,13 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/pgadmin-app.pid \
     --pod-id-file %t/postgresql.pod-id --replace -d --name  pgadmin-app \
     --volume pgadmin-data:/var/lib/pgadmin:Z \
     --volume ./config_server.json:/pgadmin4/config_server.json:Z \
-    --volume ./pgpassfile:/pgadmin4/pgpassfile:Z \
+    --volume socket:/var/run/postgresql:z \
     --env 'PGADMIN_DEFAULT_EMAIL=admin@nethserver.org' \
     --env 'PGADMIN_DEFAULT_PASSWORD=Nethesis,1234' \
     --env 'PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION=True' \
     --env 'PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED=False' \
     --env 'PGADMIN_CONFIG_LOGIN_BANNER="Authorised users only!"' \
     --env 'PGADMIN_CONFIG_CONSOLE_LOG_LEVEL=40' \
-    --env 'PGADMIN_CONFIG_CONFIG_DATABASE_URI="postgresql://postgres:${POSTGRES_PASSWORD}@127.0.0.1:5432/postgres"' \
     --env-file=%S/state/smarthost.env \
     ${PGADMIN4_IMAGE}
 ExecStartPost=/usr/bin/bash -c "while ! podman exec pgadmin-app /venv/bin/python3 setup.py get-users ;  do sleep 5 ; done"
diff --git a/imageroot/systemd/user/postgresql-app.service b/imageroot/systemd/user/postgresql-app.service
index 0b713e7..0e9df30 100644
--- a/imageroot/systemd/user/postgresql-app.service
+++ b/imageroot/systemd/user/postgresql-app.service
@@ -20,6 +20,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/postgresql-app.pid \
     --pod-id-file %t/postgresql.pod-id --replace -d --name postgresql-app \
     --env-file=%S/state/environment \
     --volume pgdata:/var/lib/postgresql/data:Z \
+    --volume socket:/var/run/postgresql:z \
     --env POSTGRES_USER=postgres \
     --env POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \
     ${POSTGRES_IMAGE}