diff --git a/group_vars/HashicorpStack b/group_vars/HashicorpStack
new file mode 100644
index 0000000..0187285
--- /dev/null
+++ b/group_vars/HashicorpStack
@@ -0,0 +1,9 @@
+consul_client_addr: "0.0.0.0"
+consul_datacenter: "homelab"
+consul_gossip_encryption_key: "{{vault_consul_encryption}}"
+consul_backup_location: "/mnt/diskstation/git/backup/consul"
+consul_ansible_group: HashicorpStack
+nomad_vault_enabled: true
+nomad_vault_address: "http://active.vault.service.consul:8200"
+nomad_vault_role: "nomad-cluster"
+nomad_vault_token: "{{  vault_nomad_vault_token }}"
diff --git a/group_vars/consul b/group_vars/consul
deleted file mode 100644
index bbeaa6f..0000000
--- a/group_vars/consul
+++ /dev/null
@@ -1,4 +0,0 @@
-consul_client_addr: "0.0.0.0"
-consul_datacenter: "homelab"
-consul_gossip_encryption_key: "{{vault_consul_encryption}}"
-consul_backup_location: "/mnt/diskstation/git/backup/consul"
diff --git a/playbooks/HashicorpStack.yml b/playbooks/HashicorpStack.yml
new file mode 100644
index 0000000..f73ea4c
--- /dev/null
+++ b/playbooks/HashicorpStack.yml
@@ -0,0 +1,8 @@
+- hosts: HashicorpStack
+  roles:
+    - role: ansible-consul
+      become: true
+    - role: ansible-hashicorp-vault
+      become: true
+    - role: ansible-nomad
+      become: true
diff --git a/playbooks/consul.yml b/playbooks/consul.yml
deleted file mode 100644
index df8c639..0000000
--- a/playbooks/consul.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: consul
-  roles:
-    - role: ansible-consul
-      become: true
diff --git a/playbooks/nomad.yml b/playbooks/nomad.yml
deleted file mode 100644
index 4b73e23..0000000
--- a/playbooks/nomad.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts:
-    - VPS
-    - server
-    - dhcp
-  roles:
-    - role: ansible-nomad
-      become: true
diff --git a/playbooks/vault.yml b/playbooks/vault.yml
deleted file mode 100644
index f488282..0000000
--- a/playbooks/vault.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: vault
-  roles:
-    - role: ansible-hashicorp-vault
-      become: true
diff --git a/production b/production
index 264dd89..8740a92 100644
--- a/production
+++ b/production
@@ -21,10 +21,7 @@ corwin
 corwin
 oscar
 
-[consul:children]
+[HashicorpStack:children]
 server
 VPS
-
-[vault]
-gerard
-oscar
+dhcp
diff --git a/site.yml b/site.yml
index f157170..b3593d1 100644
--- a/site.yml
+++ b/site.yml
@@ -1,8 +1,7 @@
 ---
 - import_playbook: playbooks/global.yml
 - import_playbook: playbooks/wireguard.yml
-- import_playbook: playbooks/consul.yml
-- import_playbook: playbooks/vault.yml
+- import_playbook: playbooks/HashicorpStack.yml
 - import_playbook: playbooks/music-player.yml
 - import_playbook: playbooks/server.yml
 - import_playbook: playbooks/build.yml