diff --git a/compose.yml b/compose.yml
index 5cf6c93..1d31edb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,8 +8,8 @@ services:
       - internal
       - proxy
     secrets:
-      - db_passwd
-      - shared_lists_db_passwd
+      - db_password
+      - shared_lists_db_password
     configs:
       - source: app_config
         target: /usr/src/app/config/app_config.yml
@@ -48,7 +48,7 @@ services:
       - SHARED_LISTS_USER
       - SMTP_ADDRESS
       - SMTP_DOMAIN
-      - SMTP_PASSWORD_FILE=/var/run/secrets/smtp_passwd
+      - SMTP_PASSWORD_FILE=/var/run/secrets/smtp_password
       - SMTP_PORT
       - SMTP_USER_NAME
     healthcheck:
@@ -96,11 +96,11 @@ services:
     environment:
       - MYSQL_DATABASE=foodsoft
       - MYSQL_USER=foodsoft
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
     secrets:
-      - db_passwd
-      - db_root_passwd
+      - db_password
+      - db_root_password
     volumes:
       - "database:/var/lib/mysql"
     networks:
@@ -134,16 +134,16 @@ configs:
     template_driver: golang
 
 secrets:
-  db_passwd:
-    name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION}
+  db_password:
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
     external: true
-  db_root_passwd:
-    name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION}
+  db_root_password:
+    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
     external: true
-  shared_lists_db_passwd:
-    name: ${STACK_NAME}_shared_lists_db_passwd_${SECRET_SHARED_LISTS_DB_PASSWORD_VERSION}
+  shared_lists_db_password:
+    name: ${STACK_NAME}_shared_lists_db_password_${SECRET_SHARED_LISTS_DB_PASSWORD_VERSION}
     external: true
-  smtp_passwd:
+  smtp_password:
     name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
     external: true
   secret_key_base: