diff --git a/playbooks/group_vars/all/all.yml b/playbooks/group_vars/all/all.yml
index bd2035b..d5b9469 100644
--- a/playbooks/group_vars/all/all.yml
+++ b/playbooks/group_vars/all/all.yml
@@ -3,7 +3,7 @@
 # helper options #
 ##################
 
-manage_pip_packages_allow_break_system_packages: true
+manage_pip_packages_allow_break_system_packages: "{{ ansible_distribution == 'Debian' and ansible_distribution_version == '12' }}"
 
 vault_versions:
   host: "{{ vault_version if vault_version != 'latest' else vault_version + '*' }}"
@@ -19,12 +19,14 @@ nomad_versions:
 
 configuration_directory: "{{ lookup('env', 'PWD') }}/etc/hashistack"
 sub_configuration_directories:
+  secrets: "{{ configuration_directory }}/secrets"
   certificates: "{{ configuration_directory }}/certificates"
   nomad_servers: "{{ configuration_directory }}/nomad_servers"
   vault_servers: "{{ configuration_directory }}/vault_servers"
   consul_servers: "{{ configuration_directory }}/consul_servers"
 
 configuration_global_vars_file: "globals.yml"
+configuration_credentials_vars_file: "credentials.yml"
 
 hashistack_remote_config_dir: "/etc/hashistack"
 hashistack_remote_data_dir: "/opt/hashistack"
diff --git a/playbooks/group_vars/all/consul.yml b/playbooks/group_vars/all/consul.yml
index ce65dda..1914609 100644
--- a/playbooks/group_vars/all/consul.yml
+++ b/playbooks/group_vars/all/consul.yml
@@ -83,7 +83,7 @@ hashi_consul_configuration:
   dns_config: "{{ consul_dns_configuration }}"
   ports:
     dns: 8600
-    http: "{{ ('8500'|int) if not  }}"
+    http: 8500 # "{{ ('8500'|int) if not  }}"
     https: -1
     grpc: 8502
     grpc_tls: 8503
diff --git a/playbooks/group_vars/all/vault.yml b/playbooks/group_vars/all/vault.yml
index 1287b32..0e4901e 100644
--- a/playbooks/group_vars/all/vault.yml
+++ b/playbooks/group_vars/all/vault.yml
@@ -60,12 +60,11 @@ hashi_vault_env_variables: {}
 hashi_vault_config_dir: "/etc/vault.d"
 hashi_vault_data_dir: "/opt/vault"
 hashi_vault_extra_files: true
-hashi_vault_extra_files_list: "{{ ([] +
-  (vault_certificates_extra_files_dir if vault_enable_tls else []) +
-  (vault_plugin_extra_files_dir if vault_enable_plugins else []) +
-  vault_extra_files_list)
-  | unique
-  }}"
+hashi_vault_extra_files_set:
+  "{{ (vault_certificates_extra_files_dir if vault_enable_tls else []) |
+  union(vault_plugin_extra_files_dir if vault_enable_plugins else []) |
+  union(vault_extra_files_list) |
+  list }}"
 hashi_vault_extra_files_src: "{{ sub_configuration_directories.vault_servers }}/config"
 hashi_vault_extra_files_dst: "{{ hashi_vault_config_dir }}/config"
 hashi_vault_extra_container_volumes: "{{ default_container_extra_volumes | union(extra_vault_container_volumes) | unique }}"