diff --git a/molecule/no_tls_multi_node/etc/hashistack/globals.yml b/molecule/no_tls_multi_node/etc/hashistack/globals.yml
index 11dc568..6b66406 100644
--- a/molecule/no_tls_multi_node/etc/hashistack/globals.yml
+++ b/molecule/no_tls_multi_node/etc/hashistack/globals.yml
@@ -1,4 +1,12 @@
 ---
+# Molecule specific variables
+
+hashistack_ca_action: "root_ca,int_ca,leaf_cert,renew_root,"
+hashistack_ca_directory: "{{ hashistack_sub_configuration_directories['certificates'] }}"
+hashistack_ca_directory_owner: "{{ lookup('env', 'USER') }}"
+hashistack_ca_domain: ednz.lab
+hashistack_ca_intermediate_name_constraints_critical: false
+
 ##########################
 # General options ########
 ##########################
@@ -9,7 +17,7 @@
 # enable_nomad: "yes"
 
 # haproxy_version: "2.8"
-# nomad_version: "1.8.1"
+nomad_version: "1.8.2"
 # consul_version: "1.18.1"
 # vault_version: "1.16.2"
 
@@ -264,16 +272,16 @@ vault_enable_tls: true
 ######################
 
 nomad_enable_tls: true
-nomad_tls_configuration:
-  http: true
-  rpc: true
-  ca_file: "/etc/ssl/certs/ca-certificates.crt"
-  cert_file: "{{ nomad_certificates_directory }}/cert.pem"
-  key_file: "{{ nomad_certificates_directory }}/key.pem"
-  verify_server_hostname: true
+# nomad_tls_configuration:
+#   http: true
+#   rpc: true
+#   ca_file: "/etc/ssl/certs/ca-certificates.crt"
+#   cert_file: "{{ nomad_certificates_directory }}/cert.pem"
+#   key_file: "{{ nomad_certificates_directory }}/key.pem"
+#   verify_server_hostname: true
 # nomad_certificates_directory: "{{ hashicorp_nomad_config_dir }}/tls"
 # nomad_certificates_extra_files_dir:
-#   - src: "{{ sub_configuration_directories['certificates'] }}/nomad/{{ inventory_hostname }}"
+#   - src: "{{ hashistack_sub_configuration_directories['certificates'] }}/nomad/{{ inventory_hostname }}"
 #     dest: "{{ nomad_certificates_directory }}"
 
 #############################
diff --git a/molecule/no_tls_multi_node/etc/hashistack/haproxy_servers/globals.yml b/molecule/no_tls_multi_node/etc/hashistack/haproxy_servers/globals.yml
new file mode 100644
index 0000000..5d6ecdc
--- /dev/null
+++ b/molecule/no_tls_multi_node/etc/hashistack/haproxy_servers/globals.yml
@@ -0,0 +1,8 @@
+---
+nomad_client_configuration:
+  enabled: "{{ nomad_enable_client }}"
+  state_dir: "{{ nomad_data_dir }}/client"
+  cni_path: "{{ cni_plugins_install_path | default('/opt/cni/bin') }}"
+  bridge_network_name: nomad
+  bridge_network_subnet: "172.26.64.0/20"
+  node_pool: ingress
diff --git a/molecule/no_tls_multi_node/etc/hashistack/vault_servers/config/plugin/vault-plugin-auth-openstack b/molecule/no_tls_multi_node/etc/hashistack/vault_servers/config/plugin/vault-plugin-auth-openstack
deleted file mode 100755
index 1fd6777..0000000
Binary files a/molecule/no_tls_multi_node/etc/hashistack/vault_servers/config/plugin/vault-plugin-auth-openstack and /dev/null differ
diff --git a/molecule/no_tls_multi_node/molecule.yml b/molecule/no_tls_multi_node/molecule.yml
index d645f94..c517f69 100644
--- a/molecule/no_tls_multi_node/molecule.yml
+++ b/molecule/no_tls_multi_node/molecule.yml
@@ -8,7 +8,7 @@ driver:
   provider:
     name: libvirt
 platforms:
-  - name: proxy01
+  - name: proxy01.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 2
     memory: 2048
@@ -20,8 +20,9 @@ platforms:
     groups:
       - common
       - haproxy_servers
+      - nomad_clients
       - consul_agents
-  - name: proxy02
+  - name: proxy02.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 2
     memory: 2048
@@ -33,8 +34,9 @@ platforms:
     groups:
       - common
       - haproxy_servers
+      - nomad_clients
       - consul_agents
-  - name: hashistack01
+  - name: hashistack01.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 4
     memory: 2048
@@ -48,7 +50,7 @@ platforms:
       - vault_servers
       - consul_servers
       - nomad_servers
-  - name: hashistack02
+  - name: hashistack02.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 4
     memory: 2048
@@ -62,7 +64,7 @@ platforms:
       - vault_servers
       - consul_servers
       - nomad_servers
-  - name: hashistack03
+  - name: hashistack03.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 4
     memory: 2048
@@ -76,7 +78,7 @@ platforms:
       - vault_servers
       - consul_servers
       - nomad_servers
-  - name: hashistack04
+  - name: hashistack04.ednz.lab
     box: generic/${MOLECULE_TEST_OS}
     cpus: 4
     memory: 2048
diff --git a/molecule/no_tls_multi_node/prepare.yml b/molecule/no_tls_multi_node/prepare.yml
index f5a76e2..9973f22 100644
--- a/molecule/no_tls_multi_node/prepare.yml
+++ b/molecule/no_tls_multi_node/prepare.yml
@@ -2,9 +2,6 @@
 - name: Include certificate generation playbook
   ansible.builtin.import_playbook: ednz_cloud.hashistack.generate_certs.yml
 
-# - name: Include credentials generation playbook
-#   ansible.builtin.import_playbook: ednz_cloud.hashistack.generate_credentials.yml
-
 - name: Include bootstrap playbook
   ansible.builtin.import_playbook: ednz_cloud.hashistack.bootstrap.yml
 
diff --git a/molecule/no_tls_multi_node/requirements.yml b/molecule/no_tls_multi_node/requirements.yml
index ae8019d..3dd371e 100644
--- a/molecule/no_tls_multi_node/requirements.yml
+++ b/molecule/no_tls_multi_node/requirements.yml
@@ -5,9 +5,6 @@ roles:
   - name: ednz_cloud.manage_apt_packages
   - name: ednz_cloud.manage_pip_packages
   - name: ednz_cloud.install_docker
-  - name: ednz_cloud.docker_systemd_service
-#  - name: ednz_cloud.deploy_haproxy
-#  - name: ednz_cloud.deploy_keepalived
 
 collections:
   - name: ednz_cloud.hashistack