diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index be4cea624..969d6aff2 100644
--- a/ansible/lemmy.yml
+++ b/ansible/lemmy.yml
@@ -42,7 +42,7 @@
     when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
 
   - name: request initial letsencrypt certificate
-    command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'
+    command: certbot certonly --nginx --agree-tos --cert-name '{{ domain }}' -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'
     args:
       creates: '/etc/letsencrypt/live/{{domain}}/privkey.pem'
 
@@ -116,4 +116,4 @@
       special_time: daily
       name: certbot-renew-lemmy
       user: root
-      job: "certbot certonly --nginx -d '{{ domain }}' --deploy-hook 'nginx -s reload'"
+      job: "certbot certonly --nginx --cert-name '{{ domain }}' -d '{{ domain }}' --deploy-hook 'nginx -s reload'"
diff --git a/ansible/lemmy_dev.yml b/ansible/lemmy_dev.yml
index 3fd8cf722..141900a35 100644
--- a/ansible/lemmy_dev.yml
+++ b/ansible/lemmy_dev.yml
@@ -31,7 +31,7 @@
         - 'python-certbot-nginx'
 
   - name: request initial letsencrypt certificate
-    command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'
+    command: certbot certonly --nginx --agree-tos --cert-name '{{ domain }}' -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'
     args:
       creates: '/etc/letsencrypt/live/{{domain}}/privkey.pem'
 
@@ -146,4 +146,4 @@
       special_time: daily
       name: certbot-renew-lemmy
       user: root
-      job: "certbot certonly --nginx -d '{{ domain }}' --deploy-hook 'nginx -s reload'"
+      job: "certbot certonly --nginx --cert-name '{{ domain }}' -d '{{ domain }}' --deploy-hook 'nginx -s reload'"