diff --git a/.env.sample b/.env.sample
index 9815866..f9ea412 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,6 +5,10 @@ DOMAIN=wireguard-ui.example.com
 #EXTRA_DOMAINS=', `www.wireguard-ui.example.com`'
 LETS_ENCRYPT_ENV=production
 
+SECRET_SESSION_VERSION=v1
+SECRET_ADMIN_PASSWORD_VERSION=v1
+SECRET_SMTP_PASSWORD_VERSION=v1
+
 ##
 ## Please check https://github.com/ngoduykhanh/wireguard-ui for up-to-date information regarding default values and environment variables
 
diff --git a/compose.smtp.yml b/compose.smtp.yml
index ff667cd..91844ca 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -16,4 +16,4 @@ services:
 secrets:
   smtp_password:
     external: true
-    name: ${STACK_NAME}_smtp_password
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
diff --git a/compose.yml b/compose.yml
index 2598984..c88cc91 100644
--- a/compose.yml
+++ b/compose.yml
@@ -53,6 +53,14 @@ networks:
   proxy:
     external: true
 
+secrets:
+  session_secret:
+    external: true
+    name: ${STACK_NAME}_session_secret_${SECRET_SESSION_VERSION}
+  admin_password:
+    external: true
+    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
+
 volumes:
   wgconfig:
   wguiconfig: