diff --git a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
index 074b2977..28a8da87 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
@@ -29,12 +29,14 @@ class eid::proxy (
       port => 443,
     }
 
-    file { "${proxy_directory}":
-      ensure => directory,
-      mode   => '0755',
-      owner  => 'root',
-      group  => 'root',
+    sunet::docker_compose { 'eidas-proxy':
+      content          => template('eid/proxy/docker-compose.yml.erb'),
+      service_name     => 'eidas-proxy',
+      compose_dir      => '/opt/',
+      compose_filename => 'docker-compose.yml',
+      description      => 'eidas proxy'
     }
+
     file { "${proxy_directory}/${country}":
       ensure => directory,
       mode   => '0755',
@@ -55,12 +57,6 @@ class eid::proxy (
       hiera_key => 'eidas_proxy_key',
       base64    => true
     }
-    file { ['/etc/luna','/etc/luna/cert']:
-      ensure => directory,
-      mode   => '0755',
-      owner  => 'root',
-      group  => 'root',
-    }
     if $eidas_proxy_oidc_rp_jks != '' {
       sunet::snippets::secret_file {"${proxy_directory}/${country}/keystore/oidc-rp.jks":
           hiera_key => 'eidas_proxy_oidc_rp_jks',
@@ -68,12 +64,11 @@ class eid::proxy (
       }
     }
 
-    sunet::docker_compose { 'eidas-proxy':
-      content          => template('eid/proxy/docker-compose.yml.erb'),
-      service_name     => 'eidas-proxy',
-      compose_dir      => '/opt/',
-      compose_filename => 'docker-compose.yml',
-      description      => 'eidas proxy'
+    file { ['/etc/luna','/etc/luna/cert']:
+      ensure => directory,
+      mode   => '0755',
+      owner  => 'root',
+      group  => 'root',
     }
 
     sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache':