diff --git a/roles/hashistack_ca/defaults/main.yml b/roles/hashistack_ca/defaults/main.yml
index 9020363..e670f71 100644
--- a/roles/hashistack_ca/defaults/main.yml
+++ b/roles/hashistack_ca/defaults/main.yml
@@ -3,7 +3,7 @@
 hashistack_ca_directory: "/etc/hashistack/certificates"
 hashistack_ca_use_cryptography: false
 hashistack_ca_action: "noop"
-hashistack_ca_domain: example.com
+hashistack_ca_domain: "*"
 hashistack_ca_directory_owner: root
 
 ##############################
diff --git a/roles/hashistack_ca/tasks/main.yml b/roles/hashistack_ca/tasks/main.yml
index 00a8b62..1e0f793 100644
--- a/roles/hashistack_ca/tasks/main.yml
+++ b/roles/hashistack_ca/tasks/main.yml
@@ -45,3 +45,15 @@
   when:
     - hashistack_ca_renew_leaf
     - "('consul_servers' in group_names) or ('consul_agents' in group_names)"
+
+- name: "Nomad leaf certificates | Import renew_nomad.yml"
+  ansible.builtin.include_tasks: renew/renew_nomad.yml
+  when:
+    - hashistack_ca_renew_leaf
+    - "('nomad_servers' in group_names) or ('nomad_clients' in group_names)"
+
+- name: "Vault leaf certificates | Import renew_vault.yml"
+  ansible.builtin.include_tasks: renew/renew_vault.yml
+  when:
+    - hashistack_ca_renew_leaf
+    - "'vault_servers' in group_names"