diff --git a/docker-compose-azerothcore-database.env b/docker-compose-azerothcore-database.env
index c58efd0..337d322 100644
--- a/docker-compose-azerothcore-database.env
+++ b/docker-compose-azerothcore-database.env
@@ -17,11 +17,15 @@ TZ=UTC
 # ==============================================
 # USER MAPPING CONFIGURATION (for NFS compatibility)
 # ==============================================
-# User and group IDs for container processes
+# User and group IDs for container processes (PUID/PGID pattern)
 # Set these to match your NFS server's user mapping
 # Default: 1001:1000 (matches 'sharing' user on most systems)
-CONTAINER_USER_ID=1001
-CONTAINER_GROUP_ID=1000
+PUID=1001
+PGID=1000
+SHARING_USER=${PUID}:${PGID}
+# Legacy compatibility
+CONTAINER_USER_ID=${PUID}
+CONTAINER_GROUP_ID=${PGID}
 CONTAINER_USER=${CONTAINER_USER_ID}:${CONTAINER_GROUP_ID}
 
 # ==============================================
diff --git a/docker-compose-azerothcore-modules.env b/docker-compose-azerothcore-modules.env
index b6a747d..516a4e9 100644
--- a/docker-compose-azerothcore-modules.env
+++ b/docker-compose-azerothcore-modules.env
@@ -15,11 +15,15 @@ STORAGE_PATH=${STORAGE_ROOT}/azerothcore
 # ==============================================
 # USER MAPPING CONFIGURATION (for NFS compatibility)
 # ==============================================
-# User and group IDs for container processes
+# User and group IDs for container processes (PUID/PGID pattern)
 # Set these to match your NFS server's user mapping
 # Default: 1001:1000 (matches 'sharing' user on most systems)
-CONTAINER_USER_ID=1001
-CONTAINER_GROUP_ID=1000
+PUID=1001
+PGID=1000
+SHARING_USER=${PUID}:${PGID}
+# Legacy compatibility
+CONTAINER_USER_ID=${PUID}
+CONTAINER_GROUP_ID=${PGID}
 CONTAINER_USER=${CONTAINER_USER_ID}:${CONTAINER_GROUP_ID}
 # GIT
 GIT_EMAIL=uprightbass360@gmail.com
diff --git a/docker-compose-azerothcore-services.env b/docker-compose-azerothcore-services.env
index 51cb93e..cd95c8d 100644
--- a/docker-compose-azerothcore-services.env
+++ b/docker-compose-azerothcore-services.env
@@ -14,11 +14,15 @@ STORAGE_PATH=${STORAGE_ROOT}/azerothcore
 # ==============================================
 # USER MAPPING CONFIGURATION (for NFS compatibility)
 # ==============================================
-# User and group IDs for container processes
+# User and group IDs for container processes (PUID/PGID pattern)
 # Set these to match your NFS server's user mapping
 # Default: 1001:1000 (matches 'sharing' user on most systems)
-CONTAINER_USER_ID=1001
-CONTAINER_GROUP_ID=1000
+PUID=1001
+PGID=1000
+SHARING_USER=${PUID}:${PGID}
+# Legacy compatibility
+CONTAINER_USER_ID=${PUID}
+CONTAINER_GROUP_ID=${PGID}
 CONTAINER_USER=${CONTAINER_USER_ID}:${CONTAINER_GROUP_ID}
 
 # ==============================================
diff --git a/docker-compose-azerothcore-tools.env b/docker-compose-azerothcore-tools.env
index 2dbf80c..fb56397 100644
--- a/docker-compose-azerothcore-tools.env
+++ b/docker-compose-azerothcore-tools.env
@@ -15,11 +15,15 @@ STORAGE_PATH=${STORAGE_ROOT}/azerothcore
 # ==============================================
 # USER MAPPING CONFIGURATION (for NFS compatibility)
 # ==============================================
-# User and group IDs for container processes
+# User and group IDs for container processes (PUID/PGID pattern)
 # Set these to match your NFS server's user mapping
 # Default: 1001:1000 (matches 'sharing' user on most systems)
-CONTAINER_USER_ID=1001
-CONTAINER_GROUP_ID=1000
+PUID=1001
+PGID=1000
+SHARING_USER=${PUID}:${PGID}
+# Legacy compatibility
+CONTAINER_USER_ID=${PUID}
+CONTAINER_GROUP_ID=${PGID}
 CONTAINER_USER=${CONTAINER_USER_ID}:${CONTAINER_GROUP_ID}
 
 # ==============================================