diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index 5248a86d..02288df3 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -74,7 +74,5 @@ redis_sentinel_ips:
     - 94.176.224.9
     - 94.176.224.10
 
-#influxdb2_org: SwedenConnect
-#influxdb2_bucket: eidas
-influxdb2_org: Test
-influxdb2_bucket: TestBucket
+influxdb2_org: SwedenConnect
+influxdb2_bucket: eidas
diff --git a/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf b/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
index b632bf33..034b2c54 100644
--- a/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
+++ b/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
@@ -1,5 +1,5 @@
 [[outputs.influxdb_v2]]
   urls = ["https://metrics.sunet.se:9999"]
-  token = "${INFLUXDB2_TOKEN}"
-  organization = "${INFLUXDB2_ORG}"
-  bucket = "${INFLUXDB2_BUCKET}"
+  token = "$INFLUXDB2_TOKEN"
+  organization = "$INFLUXDB2_ORG"
+  bucket = "$INFLUXDB2_BUCKET"