diff --git a/nomad/setup-cluster.yml b/nomad/setup-cluster.yml
index c13ed95..239e696 100644
--- a/nomad/setup-cluster.yml
+++ b/nomad/setup-cluster.yml
@@ -360,6 +360,9 @@
               - "traefik.consulcatalog.connect=true"
               - "traefik.http.routers.nomadclient.entrypoints=websecure"
 
+- name: Bootstrap Nomad ACLs and scheduler
+  hosts: nomad_instances
+
   tasks:
     - name: Start Nomad
       systemd:
@@ -378,11 +381,6 @@
       changed_when: false
       run_once: true
 
-
-- name: Bootstrap Nomad ACLs and scheduler
-  hosts: nomad_instances
-
-  tasks:
     - name: Bootstrap ACLs
       command:
         argv:
@@ -475,3 +473,11 @@
           nomad_secret_id: "{{ read_secretid.stdout }}"
       delegate_to: localhost
       run_once: true
+      notify:
+        - Restart Nomad
+
+  handlers:
+    - name: Restart Nomad
+      systemd:
+        state: restarted
+        name: nomad