diff --git a/templates/config.hcl.j2 b/templates/config.hcl.j2
index 0317ea3..4018291 100644
--- a/templates/config.hcl.j2
+++ b/templates/config.hcl.j2
@@ -3,7 +3,7 @@ bind_addr = "{{ nomad_bind_addr }}"
 datacenter = "{{ nomad_datacenter }}"
 
 server {
-  enabled = true
+enabled = {{ nomad_server |lower }}
   bootstrap_expect = {{ nomad_bootstrap_expect }}
 }
 
@@ -26,8 +26,10 @@ vault {
   enabled = true
   address = "{{ nomad_vault_address}}"
   create_from_role =  "{{ nomad_vault_role }}"
+  {% if nomad_server %}
   token = "{{ nomad_vault_token }}"
   namespace = "{{ nomad_vault_namespace}}"
   task_token_ttl = "{{ nomad_vault_token_ttl }}"
+  {% endif %}
 }
 {% endif %}