diff --git a/ansible/consul-debug-1598770949.tar.gz b/ansible/consul-debug-1598770949.tar.gz
new file mode 100644
index 0000000..16534d8
Binary files /dev/null and b/ansible/consul-debug-1598770949.tar.gz differ
diff --git a/ansible/roles/consul/templates/consul.hcl.j2 b/ansible/roles/consul/templates/consul.hcl.j2
index 025bc6f..1ab6ad8 100644
--- a/ansible/roles/consul/templates/consul.hcl.j2
+++ b/ansible/roles/consul/templates/consul.hcl.j2
@@ -1,5 +1,7 @@
 datacenter          = "{{ main_dc_name }}"
+primary_datacenter  = "{{ main_dc_name }}"
 domain              = "{{ consul_domain }}"
+node_name           = "{{ inventory_hostname_short }}"
 
 encrypt             = "{{ lookup('hashi_vault', 'secret=kv/data/consul:data')['gossip'] }}"
 
@@ -28,6 +30,6 @@ acl {
   default_policy = "deny"
   enable_token_persistence = true
   tokens {
-    agent   = "{{ lookup('hashi_vault', 'secret=kv/data/consul:data')['server-acl-token'] }}"
+    default = "{{ lookup('hashi_vault', 'secret=kv/data/consul:data')['server-acl-token'] }}"
   }
 }
diff --git a/ansible/roles/consul_server/templates/consul.hcl.j2 b/ansible/roles/consul_server/templates/consul.hcl.j2
index acea632..f232a57 100644
--- a/ansible/roles/consul_server/templates/consul.hcl.j2
+++ b/ansible/roles/consul_server/templates/consul.hcl.j2
@@ -1,5 +1,7 @@
 datacenter          = "{{ main_dc_name }}"
+primary_datacenter  = "{{ main_dc_name }}"
 domain              = "{{ consul_domain }}"
+node_name           = "{{ inventory_hostname_short }}"
 server              = true
 bootstrap_expect    = 3
 ui                  = true
@@ -37,6 +39,6 @@ acl {
   default_policy = "deny"
   enable_token_persistence = true
   tokens {
-    agent   = "{{ lookup('hashi_vault', 'secret=kv/data/consul:data')['server-acl-token'] }}"
+    default = "{{ lookup('hashi_vault', 'secret=kv/data/consul:data')['server-acl-token'] }}"
   }
 }