diff --git a/templates/docker-service-mariadb.yml.j2 b/templates/docker-service-mariadb.yml.j2
index 98b6c2a5..9043d29a 100644
--- a/templates/docker-service-mariadb.yml.j2
+++ b/templates/docker-service-mariadb.yml.j2
@@ -1,7 +1,7 @@
 # This template needs to be included in docker-compose.yml, which depend on a mariadb database
 {% if not enable_central_database | bool %}
   database:
-    container_name: {{docker_compose_project_name}}-mariadb
+    container_name: {{docker_compose_project_name}}-database
     logging:
       driver: journald
     image: mariadb
diff --git a/templates/docker-service-postgres.yml.j2 b/templates/docker-service-postgres.yml.j2
index f7a24ae4..07066a0a 100644
--- a/templates/docker-service-postgres.yml.j2
+++ b/templates/docker-service-postgres.yml.j2
@@ -2,7 +2,7 @@
 {% if not enable_central_database | bool %}  
   database:
     image: postgres:{{database_version}}-alpine
-    container_name: {{docker_compose_project_name}}-postgres
+    container_name: {{docker_compose_project_name}}-database
     environment:
       - POSTGRES_PASSWORD={{database_password}}
       - POSTGRES_USER={{database_username}}