diff --git a/manifests/oidf_service.pp b/manifests/oidf_service.pp
index 86b77e3..869f0c8 100644
--- a/manifests/oidf_service.pp
+++ b/manifests/oidf_service.pp
@@ -31,4 +31,11 @@ class eidas::oidf_service(
         onlyif  => "test ! -f /opt/oidf_service/oidf_service.p12"
       }
     }
+    sunet::docker_compose { 'oidf_service':
+      content          => template('eidas/oidf_service/docker-compose.yml.erb'),
+      service_name     => 'oidf_service',
+      compose_dir      => '/opt/',
+      compose_filename => 'docker-compose.yml',
+      description      => 'oidf_service',
+    }
 }
diff --git a/templates/oidf_service/docker-compose.yml.yrb b/templates/oidf_service/docker-compose.yml.erb
similarity index 60%
rename from templates/oidf_service/docker-compose.yml.yrb
rename to templates/oidf_service/docker-compose.yml.erb
index 2173b26..4d8460f 100644
--- a/templates/oidf_service/docker-compose.yml.yrb
+++ b/templates/oidf_service/docker-compose.yml.erb
@@ -1,10 +1,10 @@
 services:
   oidf:
-    image: ghcr.io/swedenconnect/openid-federation-services:<%= @version %>
+    image: ghcr.io/swedenconnect/openid-federation-services:<%= @image_tag %>
     ports:
       - "443:<%= @service_port %>/tcp"
     environment:
-      SPRING_CONFIG_IMPORT: <%= @config_file %>
+      SPRING_CONFIG_IMPORT: /opt/oidf/application-<%= @environment %>.yml
     volumes:
-      - <%= @service_dir %>:/opt/oidf
+      - /opt/oidf_service:/opt/oidf
       - /etc/ssl:/etc/ssl