diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 85d9b47..3ed3bf4 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -114,7 +114,7 @@
         openssl_csr:
           path: "/etc/pki/cert/csr/{{ nextcloud_url }}.csr"
           common_name: "{{ nextcloud_url }}"
-          privatekey_path: /etc/pki/cert/private/account.key
+          privatekey_path: /etc/pki/cert/private/{{ nextcloud_url }}.key
           email_address: "rehashedsalt@cock.li"
       - name: Create well-known directory
         file:
@@ -140,7 +140,9 @@
         when: com_challenge is changed
       - name: Create certificate
         acme_certificate:
-          account_key: /etc/pki/cert/private/{{ nextcloud_url }}.key
+          acme_directory: "https://acme-staging-v02.api.letsencrypt.org/directory"
+          acme_version: 2
+          account_key: /etc/pki/cert/private/account.key
           csr: "/etc/pki/cert/csr/{{ nextcloud_url }}.csr"
           dest: "/etc/pki/cert/crt/{{ nextcloud_url }}.crt"
           fullchain_dest: "/etc/pki/cert/crt/{{ nextcloud_url }}-fullchain.crt"