diff --git a/ansible_playbooks/stop-cluster b/ansible_playbooks/stop-cluster.yml
similarity index 68%
rename from ansible_playbooks/stop-cluster
rename to ansible_playbooks/stop-cluster.yml
index 26f26e8..0570472 100644
--- a/ansible_playbooks/stop-cluster
+++ b/ansible_playbooks/stop-cluster.yml
@@ -1,7 +1,6 @@
 ---
-- name: Stop cluster
-  hosts: consul_instances
-  serial: 1
+- name: Stop Nomad
+  hosts: nomad_instances
 
   tasks:
     - name: Stop Nomad
@@ -10,14 +9,22 @@
         state: stopped
       become: true
 
+- name: Stop Vault
+  hosts: nomad_instances
+
+  tasks:
     - name: Stop Vault
       systemd:
         name: vault
         state: stopped
       become: true
-      
+
+- name: Stop Consul
+  hosts: consul_instances
+
+  tasks:
     - name: Stop Consul
       systemd:
         name: consul
         state: stopped
-      become: true
\ No newline at end of file
+      become: true