diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
index 789441c4..2d1868d5 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
@@ -14,33 +14,44 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
       notify    => Sunet::Docker_run['telegraf']
    }
 
-  # Below not pretty but I'm piggy-backing on this class to add a secondary output to test the new influx2-server
-  if ($influx2_token != 'NOT_SET_IN_HIERA') {
-    file { "/etc/telegraf/telegraf.conf.d/95-telegraf.conf":
-        ensure  => file,
-        owner   => 'root',
-        group   => 'root',
-        path    => "/etc/telegraf/telegraf.conf.d/95-telegraf.conf",
-        mode    => '0644',
-        content => template('eid/telegraf/95-telegraf.conf.erb'),
-    }
-  }
+   # Below not pretty but I'm piggy-backing on this class to add a secondary output to test the new influx2-server
+   if ($influx2_token != 'NOT_SET_IN_HIERA') {
+     file { "/etc/telegraf/telegraf.conf.d/95-telegraf.conf":
+       ensure  => file,
+       owner   => 'root',
+       group   => 'root',
+       path    => "/etc/telegraf/telegraf.conf.d/95-telegraf.conf",
+       mode    => '0644',
+       content => template('eid/telegraf/95-telegraf.conf.erb'),
+     }
+   }
 
    eid_glob(["/etc/telegraf/telegraf.conf.d/*.conf"]).each |String $file| {
-      concat::fragment { $file:
-         target => "/etc/telegraf/telegraf.conf",
-         source => $file,
-      }
+     concat::fragment { $file:
+        target => "/etc/telegraf/telegraf.conf",
+        source => $file,
+     }
    }
 
    $_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf","/var/run/utmp:/var/run/utmp:ro",$volumes])
 
-  sunet::docker_run {"telegraf":
-    hostname => "${::fqdn}",
-    image     => "docker.sunet.se/eduid/telegraf",
-    imagetag  => $version,
-    volumes   => $_volumes,
-    ports     => $ports,
-    env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
-  }
+   if ($influx2_token != 'NOT_SET_IN_HIERA') {
+     sunet::docker_run {"telegraf":
+       hostname => "${::fqdn}",
+       image     => "docker.sunet.se/eduid/telegraf",
+       imagetag  => "latest",
+       volumes   => $_volumes,
+       ports     => $ports,
+       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
+     }
+   } else {
+     sunet::docker_run {"telegraf":
+       hostname => "${::fqdn}",
+       image     => "docker.sunet.se/eduid/telegraf",
+       imagetag  => $version,
+       volumes   => $_volumes,
+       ports     => $ports,
+       env       => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
+     }
+   }
 }