diff --git a/docker-compose.yaml b/docker-compose.yaml
index 79285ff..68ea2d8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -142,6 +142,33 @@ services:
             - arlas-server            
             - arlas-persistence-server
             - arlas-permissions-server
+    postgis:
+        container_name: postgis
+        restart: unless-stopped
+        image: postgis/postgis:latest
+        environment:
+            POSTGRES_PASSWORD: postgres
+        ports:
+        - "5432:5432"
+        volumes:
+        #- /home/user/projects/postgis/data:/var/lib/postgresql/data
+        - ${PG_DATADIR}:/var/lib/postgresql/data
+    pgadmin:
+        image: dpage/pgadmin4:latest
+        container_name: pgadmin
+        restart: always
+        environment:
+            PGADMIN_DEFAULT_EMAIL: tech@gisaia.com
+            PGADMIN_DEFAULT_PASSWORD: secret
+            PGADMIN_LISTEN_PORT: 80
+        ports:
+        - "8080:80"
+        volumes:
+        # on your local host: chmod -R 777 /home/user/projects/postgis/pgadmin
+        #- /home/user/projects/postgis/pgadmin/servers.json:/pgadmin4/servers.json
+        #- /home/user/projects/postgis/pgadmin/data:/var/lib/pgadmin
+        - ${PGA_CONFIG}:/pgadmin4/servers.json
+        - ${PGA_DATADIR}:/var/lib/pgadmin
 volumes:
     esdata1:
         driver: local
diff --git a/start.sh b/start.sh
index b68544f..88e529d 100755
--- a/start.sh
+++ b/start.sh
@@ -32,6 +32,8 @@ ready_message(){
         echo $arlas_server_running_msg
         echo "############################################"
         echo "                                            "
+        if [ "$ignore_es" = false ];
+        then
         echo "############################################"
         echo $es_running_msg
         echo $es_running_node_msg
@@ -39,6 +41,11 @@ ready_message(){
         echo $es_enable_ssl_msg
         echo $es_credentials_msg
         echo $es_index_msg
+        echo "############################################"
+        echo "                                            "
+        fi
+        echo "############################################"
+        echo "pgAdmin is running on http://localhost:8080/browser/"
 }
 
 usage(){
@@ -74,7 +81,7 @@ unset ES_SNIFFING
 unset ES_CREDENTIALS
 unset ARLAS_ELASTIC_INDEX
 
-docker_compose_services="arlas-wui, arlas-builder, arlas-hub, nginx, arlas-server, elasticsearch, arlas-persistence-server, arlas-permissions-server"
+docker_compose_services="arlas-wui, arlas-builder, arlas-hub, nginx, arlas-server, elasticsearch, arlas-persistence-server, arlas-permissions-server, postgis, pgadmin"
 IFS=', ' read -r -a docker_compose_services_array <<< "$docker_compose_services"
 
 ignore_es=false
@@ -174,7 +181,7 @@ fi
 if [ ! -z ${ES_CLUSTER+x} ];
     then
         if [ "$ignore_es" != false ]; then
-            echo "WARNING : You have setted an arlas-server url, all the paramaters link to elasticsearch are ignored. "
+            echo "WARNING : You have set an arlas-server url, all the paramaters link to elasticsearch are ignored. "
         else
             if [  -z ${ES_NODE+x} ];
                 then
@@ -264,9 +271,8 @@ if [ "$ignore_arlas" = true ];
         eval "docker-compose -f $SCRIPT_DIRECTORY/docker-compose.yaml stop arlas-server"
         eval "docker-compose -f $SCRIPT_DIRECTORY/docker-compose.yaml rm --force arlas-server"
         #No local service to waiting for
-        ready_message
-        exit 0
 fi
+
 if [ "$ignore_es" = true ]; 
     then
         eval "docker-compose -f $SCRIPT_DIRECTORY/docker-compose.yaml stop elasticsearch"