diff --git a/.env b/.env
index a8a6668..5bd5577 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@
 # CLUSTERCOCKPIT SETTINGS
 ########################################################################
 CLUSTERCOCKPIT_BRANCH=develop
-APP_CLUSTERCOCKPIT_INIT=true
+APP_CLUSTERCOCKPIT_INIT=false
 APP_ENVIRONMENT=dev
 APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629
 
@@ -32,6 +32,8 @@ MYSQL_PASSWORD=symfony
 INFLUXDB_PORT=8086
 INFLUXDB_PASSWORD=2RPJpkrduLgkpfQCpcBe1jYv
 INFLUXDB_ADMIN_TOKEN=egLfcf7fx0FESqFYU3RpAAbj
+INFLUXDB_ORG=ClusterCockpit
+INFLUXDB_BUCKET=ClusterCockpit/data
 
 ########################################################################
 # LDAP
diff --git a/docker-compose.yml b/docker-compose.yml
index d6bf881..59815f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,8 +22,8 @@ services:
       DOCKER_INFLUXDB_INIT_MODE: setup
       DOCKER_INFLUXDB_INIT_USERNAME: symfony
       DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
-      DOCKER_INFLUXDB_INIT_ORG: ClusterCockpit
-      DOCKER_INFLUXDB_INIT_BUCKET: ClusterCockpit
+      DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG}
+      DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET}
       DOCKER_INFLUXDB_INIT_RETENTION: 100w
       DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
     ports: