diff --git a/deploy-chatmail/src/deploy_chatmail/acmetool/__init__.py b/deploy-chatmail/src/deploy_chatmail/acmetool/__init__.py
index a7cca8e2..3f40b9bf 100644
--- a/deploy-chatmail/src/deploy_chatmail/acmetool/__init__.py
+++ b/deploy-chatmail/src/deploy_chatmail/acmetool/__init__.py
@@ -46,8 +46,7 @@ def deploy_acmetool(nginx_hook=False, email="", domains=[]):
         mode="644",
     )
 
-    for domain in domains:
-        server.shell(
-            name=f"Request certificate for {domain}",
-            commands=[f"acmetool want {domain}"],
-        )
+    server.shell(
+        name=f"Request certificate for: { ', '.join(domains) }",
+        commands=[f"acmetool want { ' '.join(domains)}"],
+    )
diff --git a/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2 b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
index 186e2642..02bf1cae 100644
--- a/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
+++ b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
@@ -37,28 +37,6 @@ http {
 
 		server_name _;
 
-		location / {
-			# First attempt to serve request as file, then
-			# as directory, then fall back to displaying a 404.
-			try_files $uri $uri/ =404;
-		}
-	}
-	server {
-		listen 80;
-		listen [::]:80;
-		listen 443 ssl;
-		listen [::]:443 ssl;
-
-		root /var/www/html;
-
-		index index.html index.htm;
-
-		server_name mta-sts.{{ config.domain_name }};
-
-        ssl_certificate /var/lib/acme/live/mta-sts.{{ config.domain_name }}/fullchain;
-    	ssl_certificate_key /var/lib/acme/live/mta-sts.{{ config.domain_name }}/privkey;
-
-
 		location / {
 			# First attempt to serve request as file, then
 			# as directory, then fall back to displaying a 404.