diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
index 95854ae8..3d71a4a4 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
@@ -16,8 +16,8 @@ class eid::telegraf2 (
   # Get influx values
   $influxdb2_token = hiera(influxdb2_token,'NOT_SET_IN_HIERA')
   $influx2_token = hiera(influx2_token,'NOT_SET_IN_HIERA')
-  $influxdb2_org = hiera(influxdb2_org,'NOT_SET_IN_HIERA')
-  $influxdb2_bucket = hiera(influxdb2_bucket,'NOT_SET_IN_HIERA')
+#  $influxdb2_org = hiera(influxdb2_org,'NOT_SET_IN_HIERA')
+#  $influxdb2_bucket = hiera(influxdb2_bucket,'NOT_SET_IN_HIERA')
   $influxdb2_bucket_proxy = hiera(influxdb2_bucket_proxy,'NOT_SET_IN_HIERA')
 
   sunet::docker_compose { 'telegraf':
@@ -55,11 +55,11 @@ class eid::telegraf2 (
   #  }
   #}
 
-  file { "${service_dir}/telegraf.conf.d/telegraf.conf":
+  file { "${service_dir}/telegraf.conf":
     ensure  => file,
     owner   => 'root',
     group   => 'root',
-    path    => "${service_dir}/telegraf.conf.d/telegraf.conf",
+    path    => "${service_dir}/telegraf.conf",
     mode    => '0644',
     content => template('eid/telegraf2/telegraf.conf.erb'),
   }