diff --git a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb
index 2544123c..eaa0d6ce 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb
@@ -1,7 +1,7 @@
 ---
 services:
   telegraf:
-    image: docker.sunet.se/test-my-eid:<%= @version %>
+    image: docker.sunet.se/eduid/telegraf:<%= @version %>
     container_name: telegraf
     environment:
       - INFLUXDB2_TOKEN=<%= @influxdb2_token %>
@@ -18,8 +18,10 @@ services:
       - '/etc/ssl:/etc/ssl'
       - '/dev/log:/dev/log'
       - '/var/log:/var/log'
-      -  <%= @service_dir %>:<%= @service_dir %>
+      - '<%= @service_dir %>:<%= @service_dir %>'
       - '/var/run/utmp:/var/run/utmp:ro'
 
+<% if @ports != [] -%>
     ports:
-      - <%= @ports %>
\ No newline at end of file
+      - <%= @ports %>
+<% end -%>