diff --git a/compose.keycloak.yml b/compose.keycloak.yml
index ac72742..8acf3bb 100644
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@@ -7,8 +7,8 @@ services:
       - db_password
       - form_secret
       - keycloak_client_secret
-      - macaroon_secret_key
-      - registration_shared_secret
+      - macaroon
+      - registration
     environment:
       - KEYCLOAK_CLIENT_DOMAIN
       - KEYCLOAK_CLIENT_ID
diff --git a/compose.smtp.yml b/compose.smtp.yml
index d38ca03..592dc36 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -6,8 +6,8 @@ services:
     secrets:
       - db_password
       - form_secret
-      - macaroon_secret_key
-      - registration_shared_secret
+      - macaroon
+      - registration
       - smtp_password
     environment:
       - SMTP_APP_NAME
diff --git a/compose.turn.yml b/compose.turn.yml
index ae213e3..8711ec4 100644
--- a/compose.turn.yml
+++ b/compose.turn.yml
@@ -6,8 +6,8 @@ services:
     secrets:
       - db_password
       - form_secret
-      - macaroon_secret_key
-      - registration_shared_secret
+      - macaroon
+      - registration
       - turn_shared_secret
     environment:
       - TURN_ALLOW_GUESTS
diff --git a/compose.yml b/compose.yml
index 6fae057..d924e1d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -39,8 +39,8 @@ services:
       - "data:/data"
     secrets:
       - db_password
-      - registration_shared_secret
-      - macaroon_secret_key
+      - registration
+      - macaroon
       - form_secret
     environment:
       - ALLOWED_LIFETIME_MAX
@@ -156,10 +156,10 @@ secrets:
   db_password:
     external: true
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-  registration_shared_secret:
+  registration:
     external: true
     name: ${STACK_NAME}_registration_${SECRET_REGISTRATION_VERSION}
-  macaroon_secret_key:
+  macaroon:
     external: true
     name: ${STACK_NAME}_macaroon_${SECRET_MACAROON_VERSION}
   form_secret:
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index d2d5f35..45dc224 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -139,7 +139,7 @@ enable_3pid_lookup: {{ env "ENABLE_3PID_LOOKUP" }}
 allow_guest_access: false
 
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#registration_shared_secret
-registration_shared_secret: {{ secret "registration_shared_secret" }}
+registration_shared_secret: {{ secret "registration" }}
 
 {{ if eq (env "AUTO_JOIN_ROOM_ENABLED") "1" }}
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#auto_join_rooms
@@ -156,7 +156,7 @@ app_service_config_files: {{ env "APP_SERVICE_CONFIGS" }}
 {{ end }}
 
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#macaroon_secret_key
-macaroon_secret_key: "{{ secret "macaroon_secret_key" }}"
+macaroon_secret_key: "{{ secret "macaroon" }}"
 
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#form_secret
 form_secret: "{{ secret "form_secret" }}"
diff --git a/release/next b/release/next
new file mode 100644
index 0000000..744c636
--- /dev/null
+++ b/release/next
@@ -0,0 +1,8 @@
+We had to rename some secrets: https://git.coopcloud.tech/coop-cloud/matrix-synapse/issues/35
+
+Copy the secrets:
+
+* `registration_shared_secret` to `registration`
+* `macaroon_secret_key` to `macaroon`
+
+Regeneration of these secrets should also work.