diff --git a/defaults/main.yml b/defaults/main.yml
index bac4794..fa1bd60 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -105,7 +105,3 @@ consul_statsite_enabled: false
 consul_statsite_addr: http://somesite
 
 consul_syslog_facility: LOCAL0
-
-consul_verify_incoming: '{{json_true}}'
-
-consul_verify_outgoing: '{{json_true}}'
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 8ff9868..6f9f6a3 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -4,6 +4,7 @@
     - {name: 'consul_ca.crt', dest: '{{consul_ca_file}}'}
     - {name: 'consul.crt', dest: '{{consul_cert_file}}'}
     - {name: 'consul.key', dest: '{{consul_key_file}}'}
+  when: consul_connection_verify_enabled
 
 - name: add common configuration
   template: src={{item}} dest={{consul_conf_dir}}/{{item}}