diff --git a/tasks/certificate.yml b/tasks/certificate.yml
index 4115b95..1233f3b 100644
--- a/tasks/certificate.yml
+++ b/tasks/certificate.yml
@@ -1,13 +1,14 @@
 ---
 
-- include_role:
+- import_role:
     name: certificate
   vars:
-    certificate_name: nextcloud
+    certificate_name: "{{nextcloud_server_names|first}}"
+    certificate_common_name: "{{nextcloud_server_names|first}}"
     certificate_directory: /etc/ssl
     certificate_key_usage:
       - digitalSignature
       - keyEncipherment
     certificate_extended_key_usage:
       - serverAuth
-    certificate_alt_names: "{{ nextcloud_server_names | map('regex_replace', '(.*)','DNS:\\1') | list }}"
+    certificate_alt_names: "{{ nextcloud_server_names | map('regex_replace', '^(.*)$','DNS:\\1') | list }}"