diff --git a/templates/env.j2 b/templates/env.j2
index 2a97db8..fe6666d 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -17,11 +17,11 @@ DB_PORT={{ db_port }}
 # Federation
 # Note: Changing LOCAL_DOMAIN or LOCAL_HTTPS at a later time will cause unwanted side effects.
 # LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com.
-LOCAL_DOMAIN={{ local_domain }}
+LOCAL_DOMAIN={{ mastodon_host }}
 LOCAL_HTTPS={{ local_https }}
 
 {% if web_domain %}
-WEB_DOMAIN={{ web_domain }}
+WEB_DOMAIN={{ mastodon_host }}
 {% endif %}
 
 {% if alternate_domains %}
@@ -30,9 +30,9 @@ ALTERNATE_DOMAINS={{ alternate_domains }}
 
 # Application secrets
 # Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
-PAPERCLIP_SECRET={{ paperclip_secret }}
-SECRET_KEY_BASE={{ secret_key_base }}
-OTP_SECRET={{ otp_secret }}
+#PAPERCLIP_SECRET=
+#SECRET_KEY_BASE=
+#OTP_SECRET=
 
 # VAPID keys (used for push notifications
 # You can generate the keys using the following command (first is the private key, second is the public one)
@@ -42,8 +42,8 @@ OTP_SECRET={{ otp_secret }}
 # Generate with `RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
 #
 # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
-VAPID_PRIVATE_KEY={{ vapid_private_key }}
-VAPID_PUBLIC_KEY=({ vapid_public_key })
+#VAPID_PRIVATE_KEY=
+#VAPID_PUBLIC_KEY=
 
 {% if single_user_mode %}
 # Registrations