diff --git a/podman-matrix/vars.sh b/podman-matrix/vars.sh
index d4c12c0..08f16ca 100644
--- a/podman-matrix/vars.sh
+++ b/podman-matrix/vars.sh
@@ -1,19 +1,22 @@
 #!/usr/bin/env bash
-
-pod_name='podman-matrix'
-service_name="pod-${pod_name}.service"
-#version='latest'
+## vars
 synapse_image="git.garbaye.fr/garbaye/matrixdotorg-synapse"
 synapse_version='v1.63.1'
 postgres_image="docker.io/library/postgres"
 postgres_version='11.14'
+## default vars : override with ENV var
+listen_if="${GARBAYE_MATRIX_ENV_LISTENIF:-127.0.0.1}"
+listen_port="${GARBAYE_MATRIX_ENV_LISTENPORT:-8086}"
+GARBAYE_MATRIX_DOMAIN="${GARBAYE_MATRIX_DOMAIN:-garbaye.fr}"
+GARBAYE_MATRIX_URL="${GARBAYE_MATRIX_URL:-https://matrix.garbaye.fr}"
+## mandatory ENV vars
+envvars='GARBAYE_MATRIX_POSTGRES_PASSWORD GARBAYE_MATRIX_DOMAIN GARBAYE_MATRIX_URL'
+## internal vars : do not touch
+project_name=${PWD##*/}
+pod_name="${project_name}"
+service_name="pod-${pod_name}.service"
 upstream_images="${synapse_image} ${postgres_image}"
 confvolume='matrixdotorg_synapse-data'
 dbvolume='matrixdotorg_synapse-pgsql'
 container_name='synapse'
 db_container_name='synapse-db'
-listen_if="${GARBAYE_MATRIX_ENV_LISTENIF:-127.0.0.1}"
-listen_port="${GARBAYE_MATRIX_ENV_LISTENPORT:-8086}"
-GARBAYE_MATRIX_DOMAIN="${GARBAYE_MATRIX_DOMAIN:-garbaye.fr}"
-GARBAYE_MATRIX_URL="${GARBAYE_MATRIX_URL:-https://matrix.garbaye.fr}"
-envvars='GARBAYE_MATRIX_POSTGRES_PASSWORD GARBAYE_MATRIX_DOMAIN GARBAYE_MATRIX_URL'