diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
index ffe67ab5..789441c4 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
@@ -35,23 +35,12 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
 
    $_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf","/var/run/utmp:/var/run/utmp:ro",$volumes])
 
-  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"]
-    }
-  }
+  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"]
   }
 }