diff --git a/roles/nomad/defaults/main.yml b/roles/nomad/defaults/main.yml
index dda987f..b50cabb 100644
--- a/roles/nomad/defaults/main.yml
+++ b/roles/nomad/defaults/main.yml
@@ -62,6 +62,10 @@ nomad_base_conf:
   client:
     # Should client be enabled
     enabled: "{{ (inventory_hostname in nomad_servers | map('regex_replace', ':\\d+$', '')) | ternary(False, True) }}"
+
+    # Node pool
+    # node_pool: gateways
+
     # host_volumes:
     #   - name: mysql
     #     path: /data/mysql
diff --git a/roles/nomad/templates/nomad.hcl.j2 b/roles/nomad/templates/nomad.hcl.j2
index 4999cc7..5b99f70 100644
--- a/roles/nomad/templates/nomad.hcl.j2
+++ b/roles/nomad/templates/nomad.hcl.j2
@@ -73,6 +73,9 @@ client {
     "{{ server }}",
 {% endfor %}
   ]
+{% if nomad_conf.client.node_pool is defined %}
+  node_pool = "{{ nomad_conf.client.node_pool }}"
+{% endif %}
 {% for volume in nomad_conf.client.host_volumes %}
   host_volume "{{ volume.name }}" {
     path = "{{ volume.path }}"
diff --git a/roles/nomad_bin/defaults/main.yml b/roles/nomad_bin/defaults/main.yml
index e2a3e9e..049bd86 100644
--- a/roles/nomad_bin/defaults/main.yml
+++ b/roles/nomad_bin/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 
 # Version of Nomad to install
-nomad_version: 1.5.6
+nomad_version: 1.6.0
 # URL of the archive
 nomad_archive_url: https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-nomad_archive_sha256: 65a7d5a4c6ade01a44292901b05a7c985b4459e0a079b5eb55f5d61474ee98e5
+nomad_archive_sha256: c67a4874439b74a25751ebc5549f9873bc9db937d4509403c84e32cef4dae001