diff --git a/cesnet-central/playbooks/repository-nexus.yaml b/cesnet-central/playbooks/repository-nexus.yaml
index 96c9cfb808d178fd49a688a00d5093b36c96ac65..34cb18e99330dd8609ae503ba682547d2acd8821 100644
--- a/cesnet-central/playbooks/repository-nexus.yaml
+++ b/cesnet-central/playbooks/repository-nexus.yaml
@@ -3,11 +3,14 @@
   hosts: master
   vars:
     nexus_url: "https://{{ nexus_hostname }}/service/rest/v1"
-    nexus_admin_password: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/nexus_admin_password:value', token_validate=false) }}"
-    nexus_binder_password: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/nexus_binder_password:value', token_validate=false) }}"
-    nexus_notebooks_password: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/nexus_notebooks_password:value',
+    nexus_admin_password: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'nexus_admin_password:value') | join('/'),
+      token_validate=false) }}"
+    nexus_binder_password: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'nexus_binder_password:value') | join('/'),
+      token_validate=false) }}"
+    nexus_notebooks_password: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'nexus_notebooks_password:value') | join('/'),
+      token_validate=false) }}"
+    nexus_writer_password: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'nexus_writer_password:value') | join('/'),
       token_validate=false) }}"
-    nexus_writer_password: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/nexus_writer_password:value', token_validate=false) }}"
     nexus_blobstore_name: default
     nexus_blobstore_type: file
     nexus_repository_name: container-notebooks
diff --git a/cesnet-mcc/playbooks/gateway.yaml b/cesnet-mcc/playbooks/gateway.yaml
index b538b6e11b8b5826543216125374d9aa99a3c616..decd33c41343035b02160c8a963e8d9fa2311dd4 100644
--- a/cesnet-mcc/playbooks/gateway.yaml
+++ b/cesnet-mcc/playbooks/gateway.yaml
@@ -10,7 +10,7 @@
       vars:
         name: cesnet-mcc
       set_fact:
-        secrets: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/gateway-' + name, token_validate=false) }}"
+        secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'gateway-' + name) | join('/'), token_validate=false) }}"
     - name: Enterprise Gateway Configuration
       copy:
         dest: /tmp/gateway.yaml
diff --git a/common/playbooks/k8s.yaml b/common/playbooks/k8s.yaml
index 31d9f197dbc1cb7f4091909d445fe4cf942fee3d..9573b9503d15be1d52eabc564f62b2447bed7c52 100644
--- a/common/playbooks/k8s.yaml
+++ b/common/playbooks/k8s.yaml
@@ -50,7 +50,7 @@
         mode: 0644
     - name: Mails settings
       vars:
-        fip_hostname: "{{ lookup('dig', groups['fip'][0] + '/PTR') | regex_replace('\\.$', '') }}"
+        fip_hostname: "{{ lookup('dig', (groups['fip'][0], 'PTR') | join('/')) | regex_replace('\\.$', '') }}"
       block:
         - name: Global postfix settings
           set_fact:
diff --git a/common/playbooks/notebooks.yaml b/common/playbooks/notebooks.yaml
index 6b068de2a1995dbd0e748acc23c83efce7246551..4e78571e01e6da721561c017826766e592f2c666 100644
--- a/common/playbooks/notebooks.yaml
+++ b/common/playbooks/notebooks.yaml
@@ -14,7 +14,7 @@
       vars:
         name: "{{ item | basename | splitext | first }}"
       set_fact:
-        secrets: "{{ secrets|default({}) | combine({name: lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/deployment-' + name,
+        secrets: "{{ secrets|default({}) | combine({name: lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'deployment-' + name)  | join('/'),
           token_validate=false)}) }}"
       with_fileglob:
         - "../deployments/*.yaml"
diff --git a/common/playbooks/security-assets.yaml b/common/playbooks/security-assets.yaml
index d6b041e3fb6d777b626055cf96d0b8e6d8844f61..8c90747d5cb2b3529fc4c9836a7e6f17c63dbc0b 100644
--- a/common/playbooks/security-assets.yaml
+++ b/common/playbooks/security-assets.yaml
@@ -18,7 +18,7 @@
   tasks:
     - name: Get Secrets From Vault
       set_fact:
-        secret: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/site-' + site_name, token_validate=false) }}"
+        secret: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'), token_validate=false) }}"
     - name: Debug Secrets
       debug:
         msg: "{{ item.key }} = {{ item.value }}"
diff --git a/common/playbooks/security-logs.yaml b/common/playbooks/security-logs.yaml
index a424e4276695be198a1423d084f7157f1f1b46b7..ce71315197ce2b00c78b2055fbca19b6cab8dc58 100644
--- a/common/playbooks/security-logs.yaml
+++ b/common/playbooks/security-logs.yaml
@@ -46,7 +46,7 @@
       when: "'fluent' not in ansible_local.helm_repos | map(attribute='name') | list"
     - name: Get Secrets from Vault
       set_fact:
-        secrets: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/site-' + site_name,
+        secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'),
           token_validate=false) }}"
     - name: Debug Secrets
       debug: