diff --git a/odoo/golem/Dockerfile.master.dev b/odoo/golem/Dockerfile.master.dev
index cbea077..1c82504 100644
--- a/odoo/golem/Dockerfile.master.dev
+++ b/odoo/golem/Dockerfile.master.dev
@@ -1,6 +1,10 @@
 FROM registry.yaltik.net/golem:yaltikmaster
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
+# PostgreSQL CLI
+RUN pip install --user pgcli
+COPY pgcli.sh ./
+# Odoo specific
 RUN pip install --user watchdog
 COPY shell10.sh ./
 COPY launch10.dev.sh ./launch10.sh
diff --git a/odoo/golem/Dockerfile.v3.dev b/odoo/golem/Dockerfile.v3.dev
index cf1067c..9787f4e 100644
--- a/odoo/golem/Dockerfile.v3.dev
+++ b/odoo/golem/Dockerfile.v3.dev
@@ -1,6 +1,10 @@
 FROM registry.yaltik.net/golem:yaltikstable
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
+# PostgreSQL CLI
+RUN pip install --user pgcli
+COPY pgcli.sh ./
+# Odoo specific
 RUN pip install --user watchdog
 COPY shell10.sh ./
 COPY launch10.dev.sh ./launch10.sh
diff --git a/odoo/golem/pgcli.sh b/odoo/golem/pgcli.sh
new file mode 100644
index 0000000..1799bbd
--- /dev/null
+++ b/odoo/golem/pgcli.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./.local/bin/pgcli postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@${DB_HOST:=postgres}