diff --git a/CHANGELOG.md b/CHANGELOG.md
index dadecbba..40b0280d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -292,3 +292,10 @@
 ## v1.6.1
 
 - Drop Trusty support from meta for now (for #19)
+
+## v1.6.2
+
+- Stop reconfiguring bootstrap node as it's not really necessary and
+  spurious races cause failure to re-establish cluster quorum when doing so
+- CONSUL_VERSION environment variable
+- Deprecated default variables cleanup
diff --git a/defaults/main.yml b/defaults/main.yml
index 2ba15af6..07a0dbf1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,7 +2,7 @@
 # File: defaults/main.yml - Default variables for Consul
 
 ## Core
-consul_version: "0.7.1"
+consul_version: "{{ lookup('env','CONSUL_VERSION') | default('0.7.1', true) }}"
 consul_zip_url: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip"
 consul_checksum_file_url: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version}}_SHA256SUMS"
 consul_bin_path: "/usr/local/bin"
@@ -35,8 +35,6 @@ consul_acl_replication_token_display: "{{ lookup('env','CONSUL_ACL_REPLICATION_T
 
 ## TLS
 consul_tls_enable: "{{ lookup('env','CONSUL_TLS_ENABLE') | default(false, true) }}"
-#consul_src_def: "{{ role_path }}/files"
-#consul_src_files: "{{ lookup('env','CONSUL_SRC_FILES') | default(consul_src_def, true) }}"
 consul_src_files: "{{ lookup('env','CONSUL_SRC_FILES') | default(role_path+'/files', true) }}"
 consul_tls_dir: "{{ lookup('env','CONSUL_TLS_DIR') | default('/etc/consul/ssl', true) }}"
 consul_ca_crt: "{{ lookup('env','CONSUL_CA_CRT') | default('ca.crt', true) }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 18e644d9..6ffb5661 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -146,19 +146,6 @@
   - name: Consul up?
     wait_for: delay=5 path=/var/run/consul/consul.pid state=present
 
-  - block:
-      - name: Reconfigure bootstrap node (systemd)
-        replace: dest=/lib/systemd/system/consul.service regexp='bootstrap' replace='server' backup=no
-      - name: Reload unit configuration
-        shell: systemctl daemon-reload
-        notify:
-          - restart consul
-    when: consul_node_role == "bootstrap" and ansible_service_mgr == "systemd"
-
-  - name: Reconfigure bootstrap node (init.d)
-    replace: dest=/etc/init.d/consul regexp='bootstrap' replace='server' backup=no
-    when: consul_node_role == "bootstrap" and not ansible_service_mgr == "systemd" and ansible_distribution_major_version|int <= 7
-
   - name: Bootstrapped marker
     file: dest=/etc/consul/.consul_bootstrapped state=touch
 
diff --git a/version.txt b/version.txt
index 3fe9b76f..103ae529 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-v1.6.1
+v1.6.2