diff --git a/nomad/roles/requirements.yml b/nomad/roles/requirements.yml
index a33ec80..f241456 100644
--- a/nomad/roles/requirements.yml
+++ b/nomad/roles/requirements.yml
@@ -4,10 +4,10 @@ roles:
     name: ansible-consul
     scm: git
     version: my-main
-  - src: https://github.com/ansible-community/ansible-nomad.git
+  - src: https://github.com/IamTheFij/ansible-nomad.git
     name: ansible-nomad
     scm: git
-    version: master
+    version: install-repo
   - src: https://github.com/ansible-community/ansible-vault.git
     name: ansible-vault
     scm: git
diff --git a/nomad/setup-cluster.yml b/nomad/setup-cluster.yml
index b5d5bae..a5dab1a 100644
--- a/nomad/setup-cluster.yml
+++ b/nomad/setup-cluster.yml
@@ -3,12 +3,14 @@
   hosts: consul_instances
   any_errors_fatal: true
 
+  vars_files:
+    - consul_values.yml
+
   roles:
     - role: ansible-consul
       vars:
-        consul_version: "1.11.3"
+        consul_version: "1.12.3-1"
         consul_install_upgrade: true
-        # consul_install_remotely: true
         consul_install_from_repo: true
         consul_os_repo_prerequisites: []
 
@@ -84,10 +86,10 @@
   roles:
     - name: ansible-vault
       vars:
-        # Doesn't support multi-arch installs
+        vault_version: 1.10.0
         vault_install_hashi_repo: true
-        vault_bin_path: /usr/bin
         vault_harden_file_perms: true
+        vault_bin_path: /usr/bin
         vault_address: 0.0.0.0
 
         vault_backend: consul
@@ -249,16 +251,19 @@
   roles:
     - name: ansible-nomad
       vars:
-        nomad_version: "1.3.1"
+        nomad_version: "1.3.2-1"
         nomad_install_remotely: true
         nomad_install_upgrade: true
         nomad_allow_purge_config: true
 
+        # Where nomad gets installed to
+        nomad_bin_dir: /usr/bin
+        nomad_install_from_repo: true
 
-        nomad_user: root
-        nomad_manage_user: true
-        nomad_group: bin
-        nomad_manage_group: true
+        # nomad_user: root
+        # nomad_manage_user: true
+        # nomad_group: bin
+        # nomad_manage_group: true
 
         # Properly map install arch
         nomad_architecture_map:
@@ -283,6 +288,7 @@
         nomad_docker_dmsetup: false
         # nomad_podman_enable: true
 
+        # Merge shared host volumes with node volumes
         nomad_host_volumes: "{{ shared_host_volumes + (nomad_unique_host_volumes | default([])) }}"
 
         # Customize docker plugin