diff --git a/.drone.yml b/.drone.yml
index c1ff27a..538bd09 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,8 +15,8 @@ steps:
       DOMAIN: wordpress.swarm-test.autonomic.zone
       STACK_NAME: wordpress
       LETS_ENCRYPT_ENV: production
-      DB_PASSWORD_VERSION: v1
-      DB_ROOT_PASSWORD_VERSION: v1
+      SECRET_DB_PASSWORD_VERSION: v1
+      SECRET_DB_ROOT_PASSWORD_VERSION: v1
       PHP_UPLOADS_CONF_VERSION: v1
       ENTRYPOINT_CONF_VERSION: v1
 trigger:
diff --git a/.envrc.sample b/.envrc.sample
index 63ef21e..44ac2aa 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -8,8 +8,8 @@ export LETS_ENCRYPT_ENV=production
 ## Additional extensions
 #export PHP_EXTENSIONS="calendar"
 
-export DB_ROOT_PASSWORD_VERSION=v1
-export DB_PASSWORD_VERSION=v1
+export SECRET_DB_ROOT_PASSWORD_VERSION=v1
+export SECRET_DB_PASSWORD_VERSION=v1
 export PHP_UPLOADS_CONF_VERSION=v1
 export ENTRYPOINT_CONF_VERSION=v1
 
diff --git a/compose.yml b/compose.yml
index e34db0e..8768fe7 100644
--- a/compose.yml
+++ b/compose.yml
@@ -76,10 +76,10 @@ volumes:
 secrets:
   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}
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
 
 configs:
   entrypoint_conf: