diff --git a/aws_env_setup.sh b/aws_env_setup.sh
new file mode 100644
index 0000000..d3ef2a9
--- /dev/null
+++ b/aws_env_setup.sh
@@ -0,0 +1,4 @@
+export AWS_SECRET_ACCESS_KEY=password
+export AWS_ACCESS_KEY_ID=user
+export AWS_ENDPOINT_URL=http://127.0.0.1:7070
+export AWS_REGION=us-east-1
diff --git a/docker-compose.yml b/docker-compose.yml
index 267d40e..1369580 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,22 +5,24 @@ services:
     restart: always
     volumes:
     - ./telegraf.conf:/etc/telegraf/telegraf.conf:ro
-    - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       - influxdb
     links:
       - influxdb
     ports:
-    - '8125:8125'
+    - '8125:8125/udp'
 
   influxdb:
-    image: influxdb:1.8.10
+    image: influxdb
     container_name: influxdb
     restart: always
     environment:
-      - INFLUXDB_DB=influx
-      - INFLUXDB_ADMIN_USER=admin
-      - INFLUXDB_ADMIN_PASSWORD=admin
+      - DOCKER_INFLUXDB_INIT_MODE=setup
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=adminpass
+      - DOCKER_INFLUXDB_INIT_ORG=myorg
+      - DOCKER_INFLUXDB_INIT_BUCKET=metrics
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token
     ports:
       - '8086:8086'
     volumes:
diff --git a/grafana/provisioning/datasources/influxdb.yml b/grafana/provisioning/datasources/influxdb.yml
deleted file mode 100644
index aeeb458..0000000
--- a/grafana/provisioning/datasources/influxdb.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-cat provisioning/datasources/influxdb.yml 
-apiVersion: 1
-
-datasources:
-  - name: InfluxDB
-    type: influxdb
-    access: proxy
-    url: http://influxdb:8086
-    isDefault: true
-    database: mydb
-    user: admin
-    password: adminpass
-    jsonData:
-      httpMode: POST
diff --git a/grafana_data/.keep b/grafana_data/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/influxdb_data/.keep b/influxdb_data/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/provisioning/dashboards/.keep b/provisioning/dashboards/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/provisioning/datasources/influxdb.yml b/provisioning/datasources/influxdb.yml
new file mode 100644
index 0000000..dc3dfdb
--- /dev/null
+++ b/provisioning/datasources/influxdb.yml
@@ -0,0 +1,13 @@
+apiVersion: 1
+
+datasources:
+  - name: influxdb
+    type: influxdb
+    isDefault: true
+    access: proxy
+    url: http://influxdb:8086
+    jsonData:
+      dbName: 'metrics'
+      httpHeaderName1: 'Authorization'
+    secureJsonData:
+      httpHeaderValue1: 'Token my-super-secret-auth-token'
diff --git a/telegraf/telegraf.conf b/telegraf.conf
similarity index 69%
rename from telegraf/telegraf.conf
rename to telegraf.conf
index 050deea..14f647c 100644
--- a/telegraf/telegraf.conf
+++ b/telegraf.conf
@@ -1,7 +1,9 @@
 [global_tags]
 
 [agent]
-  interval =           "60s"
+  debug = true
+  quiet = false
+  interval = "60s"
   round_interval = true
   metric_batch_size = 1000
   metric_buffer_limit = 10000
@@ -9,17 +11,21 @@
   flush_interval = "10s"
   flush_jitter = "0s"
   precision = ""
-  hostname = "127.0.0.1"
+  hostname = "versitygw"
   omit_hostname = false
 
-[[outputs.influxdb]]
+[[outputs.file]]
+  files = ["stdout"]
+
+[[outputs.influxdb_v2]]
   urls = ["http://influxdb:8086"]
-  database = "influx"
   timeout = "5s"
-  username = "telegraf"
-  password = "metricsmetricsmetricsmetrics"
+  token = "my-super-secret-auth-token"
+  organization = "myorg"
+  bucket = "metrics"
 
 [[inputs.statsd]]
+  protocol = "udp4"
   service_address = ":8125"
   delete_gauges = false
   delete_counters = false
diff --git a/test.sh b/test.sh
old mode 100644
new mode 100755
index 8ee02d0..7af95c1
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,6 @@
-export AWS_SECRET_ACCESS_KEY=password
-export AWS_ACCESS_KEY_ID=user
-export AWS_ENDPOINT_URL=http://127.0.0.1:7070
-export AWS_REGION=us-east-1
+#!/usr/bin/env bash
+
+. ./aws_env_setup.sh
 
 aws s3 mb s3://test
 aws s3 cp docker-compose.yml s3://test/test.yaml