diff --git a/.env.sample b/.env.sample
index 92120b8..6ff4f53 100644
--- a/.env.sample
+++ b/.env.sample
@@ -14,8 +14,8 @@ SYNAPSE_ADMIN_EMAIL=admin@example.com
 
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_FORM_SECRET_VERSION=v1
-SECRET_MACAROON_SECRET_KEY_VERSION=v1
-SECRET_REGISTRATION_SHARED_SECRET_VERSION=v1
+SECRET_MACAROON_VERSION=v1
+SECRET_REGISTRATION_VERSION=v1
 
 ## Federation
 
diff --git a/compose.yml b/compose.yml
index 7a76782..f54176c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -128,10 +128,10 @@ secrets:
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
   registration_shared_secret:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_REGISTRATION_SHARED_SECRET_VERSION}
+    name: ${STACK_NAME}_registration_${SECRET_REGISTRATION_VERSION}
   macaroon_secret_key:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_MACAROON_SECRET_KEY_VERSION}
+    name: ${STACK_NAME}_macaroon_${SECRET_MACAROON_VERSION}
   form_secret:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_FORM_SECRET_VERSION}
+    name: ${STACK_NAME}_form_secret_${SECRET_FORM_SECRET_VERSION}
diff --git a/release/next b/release/next
new file mode 100644
index 0000000..8fb0078
--- /dev/null
+++ b/release/next
@@ -0,0 +1,2 @@
+Copy the secrets registration_shared_secret to registration and macaroon_secret_key to macaroon.
+Regeneration of these secrets should also work.