diff --git a/postgresql/16.4-alpine/docker-compose.yml b/postgresql/16.4-alpine/docker-compose.yml
index 5df3b87fd..a58ad03f4 100644
--- a/postgresql/16.4-alpine/docker-compose.yml
+++ b/postgresql/16.4-alpine/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   postgresql:
     image: postgres:16.4-alpine
-    container_name: pg16-alpine-${CONTAINER_NAME}
+    container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
     restart: always
diff --git a/postgresql/16.4/docker-compose.yml b/postgresql/16.4/docker-compose.yml
index f7cee895f..0c3b7123c 100644
--- a/postgresql/16.4/docker-compose.yml
+++ b/postgresql/16.4/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   postgresql:
     image: postgres:16.4
-    container_name: pg16-${CONTAINER_NAME}
+    container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
     restart: always
diff --git a/postgresql/17.0-alpine/docker-compose.yml b/postgresql/17.0-alpine/docker-compose.yml
index 0b13ccb6b..341a66c3f 100644
--- a/postgresql/17.0-alpine/docker-compose.yml
+++ b/postgresql/17.0-alpine/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   postgresql:
     image: postgres:17.0-alpine
-    container_name: pg17-alpine-${CONTAINER_NAME}
+    container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
     restart: always
diff --git a/postgresql/17.0/docker-compose.yml b/postgresql/17.0/docker-compose.yml
index ab32343be..e09692a3b 100644
--- a/postgresql/17.0/docker-compose.yml
+++ b/postgresql/17.0/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   postgresql:
     image: postgres:17.0
-    container_name: pg17-${CONTAINER_NAME}
+    container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
     restart: always