diff --git a/class/defaults.yml b/class/defaults.yml
index 5badd5e..acc62d3 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -13,7 +13,9 @@ parameters:
         repository: banzaicloud/bank-vaults
         version: 1.15.2
     charts:
-      vault: 0.19.0
+      vault:
+        source: https://helm.releases.hashicorp.com
+        version: 0.19.0
     namespace: ${_instance}
     name: ${_instance}
     ingress:
diff --git a/class/vault.yml b/class/vault.yml
index 7613c2b..81a32ad 100644
--- a/class/vault.yml
+++ b/class/vault.yml
@@ -2,23 +2,23 @@ parameters:
   kapitan:
     dependencies:
       - type: helm
-        source: https://helm.releases.hashicorp.com
+        source: ${vault:charts:vault:source}
         chart_name: vault
-        version: ${vault:charts:vault}
-        output_path: dependencies/vault/helmcharts/v${vault:charts:vault}
+        version: ${vault:charts:vault:version}
+        output_path: ${_base_directory}/helmcharts/v${vault:charts:vault}
     compile:
       - input_paths:
-          - vault/component/app.jsonnet
+          - ${_base_directory}/component/app.jsonnet
         input_type: jsonnet
         output_path: apps/
       - input_paths:
-          - vault/component/main.jsonnet
+          - ${_base_directory}/component/main.jsonnet
         input_type: jsonnet
         output_path: ${_instance}/
       - input_type: helm
         output_type: yaml
         input_paths:
-          - vault/helmcharts/v${vault:charts:vault}
+          - ${_base_directory}/helmcharts/v${vault:charts:vault}
         output_path: ${_instance}/10_vault
         helm_values: ${vault:helm_values}
         helm_params:
@@ -27,15 +27,15 @@ parameters:
           api_versions: networking.k8s.io/v1beta1/Ingress
           kube_version: ${vault:kubernetes_version}
       - input_paths:
-          - vault/component/unseal.jsonnet
+          - ${_base_directory}/component/unseal.jsonnet
         input_type: jsonnet
         output_path: ${_instance}/
       - input_paths:
-          - vault/component/config.jsonnet
+          - ${_base_directory}/component/config.jsonnet
         input_type: jsonnet
         output_path: ${_instance}/
       - input_paths:
-          - vault/component/backup.jsonnet
+          - ${_base_directory}/component/backup.jsonnet
         input_type: jsonnet
         output_path: ${_instance}/30_backup
   commodore: