diff --git a/conf/dendrite.yaml b/conf/dendrite.yaml
index ed247c7..6f7da7a 100644
--- a/conf/dendrite.yaml
+++ b/conf/dendrite.yaml
@@ -81,7 +81,7 @@ global:
 
   # Disables federation. Dendrite will not be able to communicate with other servers
   # in the Matrix federation and the federation API will not be exposed.
-  disable_federation: false
+  disable_federation: __DISABLE_FEDERATION__
 
   # Configures the handling of presence events. Inbound controls whether we receive
   # presence events from other servers, outbound controls whether we send presence
@@ -164,16 +164,16 @@ client_api:
 
   # Prevents new guest accounts from being created. Guest registration is also
   # disabled implicitly by setting 'registration_disabled' above.
-  guests_disabled: true
+  guests_disabled: __GUESTS_DISABLED__
 
   # If set, allows registration by anyone who knows the shared secret, regardless
   # of whether registration is otherwise disabled.
-  registration_shared_secret: ""
+  registration_shared_secret: __REGISTRATION_SHARED_SECRET__
 
   # Whether to require reCAPTCHA for registration. If you have enabled registration
   # then this is HIGHLY RECOMMENDED to reduce the risk of your homeserver being used
   # for coordinated spam attacks.
-  enable_registration_captcha: false
+  enable_registration_captcha: __ENABLE_REGISTRATION_CAPTCHA
 
   # Settings for ReCAPTCHA.
   recaptcha_public_key: ""
diff --git a/scripts/upgrade b/scripts/upgrade
index b71bfb0..d4f82be 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,7 +81,7 @@ fi
 # Load up registration variables
 registration=$(ynh_app_setting_get --app=$app --key=registration)
 if [ -z $registration ]; then
-registration=$registration_disabled
+	registration=$registration_disabled
 else
 	ynh_app_setting_delete --app=$app --key=registration
 	if [[ $registration -eq 1 ]]