diff --git a/podman-hedgedoc/10_install.sh b/podman-hedgedoc/10_install.sh
index 8d843d8..45a3ffa 100755
--- a/podman-hedgedoc/10_install.sh
+++ b/podman-hedgedoc/10_install.sh
@@ -64,8 +64,8 @@ export hedgedoc_image
 export hedgedoc_version
 export database_image
 export database_version
-export dbvolume
-export datavolume
+export container_name
+export db_container_name
 
 if ! podman image exists ${hedgedoc_image}:${hedgedoc_version}; then
     podman image pull ${hedgedoc_image}:${hedgedoc_version} || exit 1
diff --git a/podman-hedgedoc/docker-compose.yml b/podman-hedgedoc/docker-compose.yml
index 51fccb8..f59e72f 100644
--- a/podman-hedgedoc/docker-compose.yml
+++ b/podman-hedgedoc/docker-compose.yml
@@ -4,7 +4,7 @@
 version: '3'
 services:
   database:
-    container_name: database
+    container_name: ${db_container_name}
     # 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}
@@ -47,7 +47,7 @@ services:
   #    restart: always
 
   app:
-    container_name: app
+    container_name: ${container_name}
     # Uncomment the following section to build the image yourself:
     #build:
     #  context: .