diff --git a/pgadmin/run.sh b/pgadmin/run.sh
index e086d99..3b67d58 100755
--- a/pgadmin/run.sh
+++ b/pgadmin/run.sh
@@ -2,8 +2,8 @@
 
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-IMAGE_NAME="chorss/docker-pgadmin4"
-IMAGE_VERSION="3.0"
+IMAGE_NAME="dpage/pgadmin4"
+IMAGE_VERSION="4.1"
 
 SERVICE_NAME=pgadmin
 
@@ -15,6 +15,8 @@ source ${SCRIPT_PATH}/../common.shinc
 #
 
 DOMAIN_NAME="pgadmin.loc"
+PGADMIN_DEFAULT_EMAIL="admin"
+PGADMIN_DEFAULT_PASSWORD="admin"
 
 source ${SCRIPT_PATH}/env.shinc 2> /dev/null
 
@@ -29,8 +31,10 @@ init() {
 	docker create \
 		--name ${SERVICE_NAME} \
 		-e VIRTUAL_HOST=${DOMAIN_NAME} \
-		-e VIRTUAL_PORT=5050 \
-		-v pgadmin_data:/data \
+		-e VIRTUAL_PORT=80 \
+		-e PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL} \
+		-e PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} \
+		-v pgadmin:/var/lib/pgadmin \
 		--restart=unless-stopped \
 		${IMAGE_NAME}:${IMAGE_VERSION}