diff --git a/demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/POSeIDAS.xml.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
similarity index 100%
rename from demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/POSeIDAS.xml.sh
rename to demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
diff --git a/demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/application.properties.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
similarity index 100%
rename from demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/application.properties.sh
rename to demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
diff --git a/demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/eidasmiddleware.properties.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
similarity index 100%
rename from demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/eidasmiddleware.properties.sh
rename to demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
diff --git a/demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/metadata-signature-certificate.crt b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/metadata-signature-certificate.crt
similarity index 100%
rename from demw-1.qa.sveidas.se/overlay/etc/eidas-middleware/configuration/metadata-signature-certificate.crt
rename to demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/metadata-signature-certificate.crt
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index bea9b9aa..e0d1d78b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -257,12 +257,12 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
    $spring_datasource_password = safe_hiera('spring_datasource_password')
    $middleware_crypt_pin = safe_hiera('middleware_crypt_pin')
    $middleware_sign_pin = safe_hiera('middleware_sign_pin')
-   file {['/etc/eidas-middleware','/etc/eidas-middleware/configuration','/etc/eidas-middleware/database']: ensure => directory } ->
-   sunet::snippets::secret_file {"/etc/eidas-middleware/configuration/eidasmw-signature-keystore.jks":
+   file {['/opt/eidas-middleware','/opt/eidas-middleware/configuration','/opt/eidas-middleware/database']: ensure => directory } ->
+   sunet::snippets::secret_file {"/opt/eidas-middleware/configuration/eidasmw-signature-keystore.jks":
       hiera_key => 'eidasmw-signature-keystore',
       base64    => true
    } ->
-   sunet::snippets::secret_file {"/etc/eidas-middleware/configuration/eidasmw-crypto-keystore.jks":
+   sunet::snippets::secret_file {"/opt/eidas-middleware/configuration/eidasmw-crypto-keystore.jks":
       hiera_key => 'eidasmw-crypto-keystore',
       base64    => true
    } ->
@@ -272,7 +272,7 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
       hostname => "${::fqdn}",
       ports    => ['443:8443'],
       volumes  => ['/var/log/eidas-middleware:/var/log/eidas-middleware',
-                   '/etc/eidas-middleware:/etc/eidas-middleware',
+                   '/opt/eidas-middleware:/opt/eidas-middleware',
                    '/dev/log:/dev/log',
                    '/etc/ssl:/etc/ssl'],
       env      => ["CERTNAME=$_hostname",