diff --git a/site-cookbooks/kosmos-mastodon/recipes/default.rb b/site-cookbooks/kosmos-mastodon/recipes/default.rb
index 40b4eef..9e8e9bf 100644
--- a/site-cookbooks/kosmos-mastodon/recipes/default.rb
+++ b/site-cookbooks/kosmos-mastodon/recipes/default.rb
@@ -64,13 +64,13 @@ application mastodon_path do
     group "mastodon"
     variables redis_db: 1,
               redis_actioncable_db: 2,
-              domain: "kosmos.social",
+              domain: node["kosmos-mastodon"]["server_name"],
               paperclip_secret: mastodon_credentials['paperclip_secret'],
               secret_key_base: mastodon_credentials['secret_key_base'],
               otp_secret: mastodon_credentials['otp_secret'],
               smtp_login: mastodon_credentials['smtp_user_name'],
               smtp_password: mastodon_credentials['smtp_password'],
-              smtp_from_address: "mail@kosmos.social",
+              smtp_from_address: "mail@#{node["kosmos-mastodon"]["server_name"]}",
               s3_bucket: "kosmos-social",
               aws_access_key_id: mastodon_credentials['aws_access_key_id'],
               aws_secret_access_key: mastodon_credentials['aws_secret_access_key'],
diff --git a/site-cookbooks/kosmos-mastodon/recipes/nginx.rb b/site-cookbooks/kosmos-mastodon/recipes/nginx.rb
index 8f314a6..c7db150 100644
--- a/site-cookbooks/kosmos-mastodon/recipes/nginx.rb
+++ b/site-cookbooks/kosmos-mastodon/recipes/nginx.rb
@@ -38,7 +38,7 @@ end
 
 unless node.chef_environment == "development"
   include_recipe "kosmos-base::letsencrypt"
-  execute "letsencrypt cert for kosmos.social" do
+  execute "letsencrypt cert for #{server_name}" do
     command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/mastodon -d #{server_name} -n"
     cwd "/usr/local/certbot"
     not_if { File.exist? "/etc/letsencrypt/live/#{server_name}/fullchain.pem" }