diff --git a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
index 7da59e23..8a98da9c 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
@@ -29,23 +29,23 @@ class eid::proxy (
       port => 443,
     }
 
-    file { ['/etc/eidas-proxy/',"/etc/eidas-proxy/${country}"]:
+    file { ["${proxy_directory}/","${proxy_directory}/${country}"]:
       ensure => directory,
       mode   => '0755',
       owner  => 'root',
       group  => 'root',
     }
-    file { "/etc/eidas-proxy/${country}/keystore":
+    file { "${proxy_directory}/${country}/keystore":
       ensure => directory,
       mode   => '0755',
       owner  => 'root',
       group  => 'root',
     }
-    sunet::snippets::secret_file {"/etc/eidas-proxy/${country}/metadata.p12":
+    sunet::snippets::secret_file {"${proxy_directory}/${country}/metadata.p12":
       hiera_key => 'eidas_metadata_key',
       base64    => true
     }
-    sunet::snippets::secret_file {"/etc/eidas-proxy/${country}/proxy.p12":
+    sunet::snippets::secret_file {"${proxy_directory}/${country}/proxy.p12":
       hiera_key => 'eidas_proxy_key',
       base64    => true
     }
@@ -56,7 +56,7 @@ class eid::proxy (
       group  => 'root',
     }
     if $eidas_proxy_oidc_rp_jks != '' {
-      sunet::snippets::secret_file {"/etc/eidas-proxy/${country}/keystore/oidc-rp.jks":
+      sunet::snippets::secret_file {"${proxy_directory}/${country}/keystore/oidc-rp.jks":
           hiera_key => 'eidas_proxy_oidc_rp_jks',
           base64    => true
       }
@@ -71,7 +71,7 @@ class eid::proxy (
     }
 
     sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache':
-      filename     => '/etc/eidas-proxy/se/ps-mdcache/metadata-cache.xml',
+      filename     => "${proxy_directory}/se/ps-mdcache/metadata-cache.xml",
       warning_age  => '600',
       critical_age => '172800'
     }