diff --git a/.env.sample b/.env.sample
index 760cfca..71a9f93 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,6 +5,6 @@ DOMAIN=kimai.example.com
 #EXTRA_DOMAINS=', `www.kimai.example.com`'
 LETS_ENCRYPT_ENV=production
 
-DB_PASSWORD_VERSION=v1
-DB_ROOT_PASSWORD_VERSION=v1
-ADMIN_PASSWORD_VERSION=v1
+SECRET_DB_PASSWORD_VERSION=v1
+SECRET_DB_ROOT_PASSWORD_VERSION=v1
+SECRET_ADMIN_PASSWORD_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 03d72f6..9d8eff4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -82,13 +82,13 @@ volumes:
 secrets:
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
   db_root_password:
     external: true
-    name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
   admin_password:
     external: true
-    name: ${STACK_NAME}_admin_password_${ADMIN_PASSWORD_VERSION}
+    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
 networks:
   proxy:
     external: true