diff --git a/podman-hedgedoc/docker-compose.yml b/podman-hedgedoc/docker-compose.yml
index e0d671e..6e46b0e 100644
--- a/podman-hedgedoc/docker-compose.yml
+++ b/podman-hedgedoc/docker-compose.yml
@@ -4,6 +4,7 @@
 version: '3'
 services:
   database:
+    container_name: database
     # Don't upgrade PostgreSQL by simply changing the version number
     # You need to migrate the Database to the new PostgreSQL version
     image: ${database_image}:${database_version}
@@ -46,6 +47,7 @@ services:
   #    restart: always
 
   app:
+    container_name: app
     # Uncomment the following section to build the image yourself:
     #build:
     #  context: .
diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh
index 6290f51..14b9157 100644
--- a/podman-hedgedoc/vars.sh
+++ b/podman-hedgedoc/vars.sh
@@ -14,5 +14,5 @@ upstream_images="${hedgedoc_image} ${postgres_image}"
 datavolume='podman-hedgedoc_data'
 dbvolume='podman-hedgedoc_database'
 uploadsvolume='podman-hedgedoc_uploads'
-container_name='podman-hedgedoc_app'
-db_container_name='podman-hedgedoc_database'
+container_name='app'
+db_container_name='database'