diff --git a/Dockerfile b/Dockerfile
index 89f0c27..4ed28f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,11 @@ LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 ARG POSTGRESQL_LIB
-ARG POSTGRESQL_DATA
+ARG POSTGRESQL_LOG
 ARG POSTGRESQL_PORT
 ARG POSTSQL_LOG_DIR
 
+ARG POSTGRESQL_DATA="${POSTGRESQL_LIB}/data"
 ARG POSTSQL_LOG_FILE="${POSTSQL_LOG_DIR}/postsql.log"
 
 
@@ -114,5 +115,6 @@ RUN    urpmi --force postgresql15 postgresql15-server postgresql15-pl
 
 
 VOLUME ${POSTGRESQL_LIB}
+VOLUME ${POSTGRESQL_LOG}
 
-EXPOSE 5432
+EXPOSE ${POSTGRESQL_PORT}
diff --git a/ReadMe.txt b/ReadMe.txt
index ce47f17..90b2403 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Welcome to Rx3-Docker/PostgreSQL docker image!
 This project aims to build a PostgreSQL docker image used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3/server-mga9:1.1.2 image,
+    - Curtently based on rx3-docker/server:1.2.1-mga9 image,
     - Following env vars supported:
        - POSTGRESQL_UID & POSTGRESQL_GID,
        - POSTGRESQL_POSTGRES_PASSWORD,
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 0c0a6f0..22458a8 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,13 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/PostgreSQL-Mga9 V 1.1.0 - A. GIBERT - 2024/11/12
+Rx3-Docker/PostgreSQL V 1.1.1 - A. GIBERT - 2025/03/08
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3-docker/server:1.2.1-mga9 image.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PostgreSQL V 1.1.0 - A. GIBERT - 2024/11/12
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Move & Rename repo from Rx3/PostgreSQL-MGA9 to Rx3-Docker/PostgreSQL,
diff --git a/compose.yaml b/compose.yaml
index 318cda2..c7cd2e3 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,31 +1,31 @@
 # Rx3-Docker/PostgreSQL Docker Image
 #-------------------------------------------------------------------------------
 
-name:                           ${IMG_NAME}
+name:                               ${IMG_NAME}
 
 services:
 
   database:
-    container_name:             ${IMG_NAME}
-    hostname:                   ${IMG_NAME}
+    container_name:                 ${IMG_NAME}
+    hostname:                       ${IMG_NAME}
 
-    image:                      ${IMG_URL}
+    image:                          ${IMG_URL}
 
     build:
-      context:                  .
+      context:                      .
       args:
-        IMG_NAME:               ${IMG_NAME}
-        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        IMG_VERSION:            ${IMG_VERSION}
-        IMG_MAINTAINER:         ${IMG_MAINTAINER}
-        IMG_FROM_URL:           ${IMG_FROM_URL}
+        IMG_NAME:                   ${IMG_NAME}
+        IMG_NAME_FULL:              ${IMG_NAME_FULL}
+        IMG_VERSION:                ${IMG_VERSION}
+        IMG_MAINTAINER:             ${IMG_MAINTAINER}
+        IMG_FROM_URL:               ${IMG_FROM_URL}
 
-        POSTGRESQL_LIB:         ${DATABASE_LIB_DIR}
-        POSTGRESQL_DATA:        ${DATABASE_DATA_DIR}
-        POSTGRESQL_PORT:        ${DATABASE_PORT_MAIN_INT}
-        POSTSQL_LOG_DIR:        ${DATABASE_LOG_POSTSQL_DIR}
+        POSTGRESQL_LIB:             ${DATABASE_LIB_DIR}
+        POSTGRESQL_LOG:             ${DATABASE_LOG_POSTGRES_DIR}
+        POSTGRESQL_PORT:            ${DATABASE_PORT_MAIN_INT}
+        POSTSQL_LOG_DIR:            ${DATABASE_LOG_POSTSQL_DIR}
         
-    restart: unless-stopped
+    restart:                        unless-stopped
     
     environment:
       POSTGRESQL_UID:               ${POSTGRESQL_UID}
@@ -36,13 +36,13 @@ services:
       POSTGRESQL_PASSWORD:          ${POSTGRESQL_PASSWORD}
       
     healthcheck:
-      test: ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE}'"]
-      interval: 10s
-      timeout: 3s
-      retries: 3
+      test:                         ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE}'"]
+      interval:                     10s
+      timeout:                      3s
+      retries:                      3
       
     volumes:
-      - ./var/lib/pgsql/data:/var/lib/pgsql/data
+      - ./var/lib/pgsql/data:${DATABASE_DATA_DIR}
       - ./var/log/init:${DATABASE_LOG_INIT_DIR}
       - ./var/log/supervisor:${DATABASE_LOG_SV_DIR}
       - ./var/log/postgres:${DATABASE_LOG_POSTGRES_DIR}
diff --git a/env.dist b/env.dist
index 0b19164..94a5b81 100644
--- a/env.dist
+++ b/env.dist
@@ -18,13 +18,13 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 
 IMG_NAME="postgresql"
 IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
-IMG_VERSION="1.1.0-mga9"
+IMG_VERSION="1.1.1-mga9"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 IMG_URL_PREFIX="${ORG_URL_PREFIX}"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 
-IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
+IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9"