diff --git a/Dockerfile b/Dockerfile
index c3f9cc4..1ea2390 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,14 @@
-FROM maxexcloo/nginx-php:latest
-MAINTAINER Max Schaefer <max@excloo.com>
-ENV VERSION 5.1
-RUN mkdir -p /data/http && \
-	cd /data/http && \
-	wget -O - "http://www.sourceforge.net/projects/phppgadmin/files/phpPgAdmin%20%5Bstable%5D/phpPgAdmin-${VERSION}/phpPgAdmin-${VERSION}.tar.gz/download" | tar --strip-components=1 -x -z && \
-	rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS
-ADD data /data
+FROM webdevops/php-nginx:7.3
+MAINTAINER Fizix <arnaud@fizix.io>
+
+ENV POSTGRESQL_HOST=postgresql
+ENV POSTGRESQL_PORT=5432
+ENV POSTGRESQL_DEFAULT_DB=pg
+
+WORKDIR /app
+
+RUN curl -L "https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/phpPgAdmin-5.6.0.tar.bz2" | tar --strip-components=1 -xj && \
+    rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS
+
+ADD config /config
+ADD app /app
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..268182a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,8 @@
+
+# Default environment variables
+
+```
+POSTGRESQL_HOST=postgresql
+POSTGRESQL_PORT=5432
+POSTGRESQL_DEFAULT_DB=pg
+```
diff --git a/data/http/conf/config.inc.php b/app/conf/config.inc.php
similarity index 78%
rename from data/http/conf/config.inc.php
rename to app/conf/config.inc.php
index cdc11b0..0499528 100644
--- a/data/http/conf/config.inc.php
+++ b/app/conf/config.inc.php
@@ -1,9 +1,9 @@
 <?php
 $conf['servers'][0]['desc'] = 'PostgreSQL';
-$conf['servers'][0]['host'] = 'postgresql';
-$conf['servers'][0]['port'] = 5432;
+$conf['servers'][0]['host'] = $_SERVER['POSTGRESQL_HOST'];
+$conf['servers'][0]['port'] = $_SERVER['POSTGRESQL_PORT'];
 $conf['servers'][0]['sslmode'] = 'allow';
-$conf['servers'][0]['defaultdb'] = 'pg';
+$conf['servers'][0]['defaultdb'] = $_SERVER['POSTGRESQL_DEFAULT_DB'];
 $conf['servers'][0]['pg_dump_path'] = '/usr/bin/pg_dump';
 $conf['servers'][0]['pg_dumpall_path'] = '/usr/bin/pg_dumpall';
 $conf['default_lang'] = 'auto';
@@ -14,7 +14,7 @@
 $conf['show_advanced'] = false;
 $conf['show_system'] = false;
 $conf['min_password_length'] = 1;
-$conf['left_width'] = 200;
+$conf['left_width'] = 340;
 $conf['theme'] = 'default';
 $conf['show_oids'] = false;
 $conf['max_rows'] = 30;
diff --git a/config/php-pgadmin.conf b/config/php-pgadmin.conf
new file mode 100644
index 0000000..24fd362
--- /dev/null
+++ b/config/php-pgadmin.conf
@@ -0,0 +1,3 @@
+env[POSTGRESQL_HOST] = $POSTGRESQL_HOST
+env[POSTGRESQL_PORT] = $POSTGRESQL_PORT
+env[POSTGRESQL_DEFAULT_DB] = $POSTGRESQL_DEFAULT_DB