diff --git a/.drone.yml b/.drone.yml
index 769f0d0..a4ab828 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,9 +15,9 @@ steps:
       DOMAIN: keycloak.swarm-test.autonomic.zone
       STACK_NAME: keycloak
       LETS_ENCRYPT_ENV: production
-      ADMIN_PASSWD_VERSION: v1
-      DB_PASSWD_VERSION: v1
-      DB_ROOT_PASSWD_VERSION: v1
+      SECRET_ADMIN_PASSWORD_VERSION: v1
+      SECRET_DB_PASSWORD_VERSION: v1
+      SECRET_DB_ROOT_PASSWORD_VERSION: v1
 trigger:
   branch:
     - master
diff --git a/.env.sample b/.env.sample
index 070324b..4ac97c2 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,6 +7,6 @@ LETS_ENCRYPT_ENV=production
 
 ADMIN_USERNAME=admin
 
-DB_ROOT_PASSWORD_VERSION=v1
-DB_PASSWORD_VERSION=v1
-ADMIN_PASSWORD_VERSION=v1
+SECRET_DB_ROOT_PASSWORD_VERSION=v1
+SECRET_DB_PASSWORD_VERSION=v1
+SECRET_ADMIN_PASSWORD_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 91a8e86..35e1422 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,15 +8,15 @@ services:
       - proxy
       - internal
     secrets:
-      - admin_passwd
-      - db_passwd
+      - admin_password
+      - db_password
     environment:
       - DB_ADDR=db
       - DB_DATABASE=keycloak
-      - DB_PASSWORD_FILE=/run/secrets/db_passwd
+      - DB_PASSWORD_FILE=/run/secrets/db_password
       - DB_USER=keycloak
       - DB_VENDOR=mariadb
-      - KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_passwd
+      - KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password
       - KEYCLOAK_USER=${ADMIN_USERNAME}
       - PROXY_ADDRESS_FORWARDING=true
     healthcheck:
@@ -46,11 +46,11 @@ services:
     environment:
       - MYSQL_DATABASE=keycloak
       - MYSQL_USER=keycloak
-      - 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:
       - "mariadb:/var/lib/mysql"
     networks:
@@ -62,14 +62,14 @@ networks:
     external: true
 
 secrets:
-  admin_passwd:
-    name: ${STACK_NAME}_admin_passwd_${ADMIN_PASSWD_VERSION}
+  admin_password:
+    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
     external: true
-  db_passwd:
-    name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}
+  db_password:
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
     external: true
-  db_root_passwd:
-    name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
+  db_root_password:
+    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
     external: true
 
 volumes: