diff --git a/docker-compose.yml b/docker-compose.yml
index 4da0a1d..c8a8d31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
           - node.labels.openhab == true
 
   influxdb:
-    image: influxdb
+    image: influxdb:2.0.7
     container_name: mon_influxdb
     ports:
       - '8083:8083'
diff --git a/influxdb.env b/influxdb.env
index 3f99bef..a881ea8 100644
--- a/influxdb.env
+++ b/influxdb.env
@@ -1,10 +1,6 @@
-INFLUXDB_DATA_ENGINE=tsm1
-INFLUXDB_REPORTING_DISABLED=false
-INFLUXDB_DB=OpenHAB3_DB
-INFLUXDB_HTTP_AUTH_ENABLED=TRUE
-INFLUXDB_ADMIN_USER=admin
-INFLUXDB_ADMIN_PASSWORD=#gentoo#
-INFLUXDB_WRITE_USER=openhab
-INFLUXDB_WRITE_USER_PASSWORD=openhab
-INFLUXDB_READ_USER=grafana
-INFLUXDB_READ_USER_PASSWORD=grafana
\ No newline at end of file
+DOCKER_INFLUXDB_INIT_MODE=setup
+DOCKER_INFLUXDB_INIT_USERNAME=admin
+DOCKER_INFLUXDB_INIT_PASSWORD=#gentoo#
+DOCKER_INFLUXDB_INIT_ORG=realm.local
+DOCKER_INFLUXDB_INIT_BUCKET=openhab
+DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=mytoken
\ No newline at end of file