diff --git a/TODO.on.site b/TODO.on.site
index e9ae803..56a0960 100644
--- a/TODO.on.site
+++ b/TODO.on.site
@@ -21,6 +21,7 @@
 * Add account or alias for 'postmaster@'
 
 When the containers are up run `certbot`:
+* Make sure to set SA_DOMAIN_CONTACT in `environment`
 * Once `docker-compose -f sa-certbot.yml run new`
 * Every x < 30 days `docker-compose -f sa-certbot.yml run renew`
 * Always reload nginx `docker-compose exec nginx nginx -s reload`
diff --git a/environment.template b/environment.template
index b435fa5..6641797 100644
--- a/environment.template
+++ b/environment.template
@@ -1,2 +1,5 @@
 # Set to public (sub)domain name
 SA_PUBLIC_DOMAIN_NAME=miau.local
+
+# Set to email address as responsible domain contact (used by certbot)
+# SA_DOMAIN_CONTACT=
diff --git a/sa-certbot.yml b/sa-certbot.yml
index 0ac238c..1632cc6 100644
--- a/sa-certbot.yml
+++ b/sa-certbot.yml
@@ -1,5 +1,4 @@
 version: "3"
-name: sourcearcade-certbot
 services:
   new:
     build:
@@ -11,7 +10,7 @@
       - ./certbot/www/:/var/www/certbot/:rw
       - ./certbot/lib/:/var/lib/letsencrypt/:rw
       - ./logs/certbot/:/var/log/letsencrypt/:rw
-    command: certonly -n -m nico.h@gmx.de --webroot --webroot-path /var/www/certbot
+    command: certonly -m ${SA_DOMAIN_CONTACT} --webroot --webroot-path /var/www/certbot
               -d "${SA_PUBLIC_DOMAIN_NAME},id.${SA_PUBLIC_DOMAIN_NAME},mail.${SA_PUBLIC_DOMAIN_NAME},review.${SA_PUBLIC_DOMAIN_NAME}"
   renew:
     image: certbot/certbot