diff --git a/Docker/Docker-Compose/Monitioring/docker-compose.yml b/Docker/Docker-Compose/Monitioring/docker-compose.yml
index ede2974..60c71a2 100644
--- a/Docker/Docker-Compose/Monitioring/docker-compose.yml
+++ b/Docker/Docker-Compose/Monitioring/docker-compose.yml
@@ -44,8 +44,7 @@ services:
 # Docker Hub: https://hub.docker.com/_/influxdb
 ##############################################
   influxdb:
-    image: influxdb:2.7 # Using 2.7 as per your previous config
-    container_name: influxdb_v2
+    image: influxdb:2.7 # Using 2.x for the flux query language.
     environment:
       INFLUXDB_REPORTING_DISABLED: "true"
       INFLUXDB_HTTP_AUTH_ENABLED: "true" # This setting is primarily for the InfluxDB 1.x compatibility API
@@ -53,12 +52,12 @@ services:
       # --- InfluxDB 2.x Initialization Environment Variables ---
       # These variables will initialize the InfluxDB instance on first startup.
       # They will be ignored on subsequent startups if initialization has already occurred.
-      INFLUXDB_INIT_MODE: setup
-      INFLUXDB_INIT_USERNAME: "Aroy"
-      INFLUXDB_INIT_PASSWORD: "Ds2agYKwwBS3kzX"
-      INFLUXDB_INIT_ORG: "Main" # Corresponds to your old `--org Main`
-      INFLUXDB_INIT_BUCKET: "Main-Bucket" # Corresponds to your old `--bucket Main-Bucket`
-      INFLUXDB_INIT_ADMIN_TOKEN: "mysecretinittoken" # IMPORTANT: Choose a strong, unique token here.
+      INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE:-"setup"} # The mode to start the InfluxDB instance in. Must be "setup" or "bootstrap". Default: setup
+      INFLUXDB_INIT_USERNAME: ${INFLUXDB_INIT_USERNAME:-"admin"}
+      INFLUXDB_INIT_PASSWORD: ${INFLUXDB_INIT_PASSWORD:-"adminpassword"}
+      INFLUXDB_INIT_ORG: ${INFLUXDB_INIT_ORG:-"Main"} # Corresponds to your old `--org Main`
+      INFLUXDB_INIT_BUCKET: ${INFLUXDB_INIT_BUCKET:-"Main-Bucket"} # Corresponds to your old `--bucket Main-Bucket`
+      INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_INIT_ADMIN_TOKEN:-"mysecretinittoken"} # IMPORTANT: Choose a strong, unique token here.
                                                      # This is the actual value of the token, not just a name.
                                                      # This token will have all-access to the new org/bucket.
                                                      # Store this securely.
@@ -67,11 +66,10 @@ services:
       # compatibility with the InfluxDB 1.x compatibility API.
       # If your primary data sources use the InfluxDB 2.x API (tokens),
       # these are less critical for core functionality but good for compatibility.
-      INFLUXDB_USER: "pfsense"
-      INFLUXDB_USER_PASSWORD: "E6oyiFqGaFzpuQ84"
-      INFLUXDB_DB: "pfsense" # This will set up a DB/Retention Policy for the 1.x compatibility API.
-                             # Data written via 1.x API to this DB will go to a bucket named "pfsense"
-
+      INFLUXDB_USER: ${INFLUXDB_USER:-"influxdb-v1-api"} # This will set up a user named "influxdb-v1-api"
+      INFLUXDB_USER_PASSWORD: ${INFLUXDB_USER_PASSWORD:-"mysecretinittoken"} # This will set up a password for the "influxdb-v1-api" user to login with. This is the actual password, not just a name.
+      INFLUXDB_DB: ${INFLUXDB_DB:-"Main-V1-API"} # This will set up a DB/Retention Policy for the 1.x compatibility API.
+                                                 # Data written via 1.x API to this DB will go to a bucket named "Main-V1-API"
     volumes:
       # Persistent storage for InfluxDB 2.x data and configuration
       - ${BASE_DIR:-.}/InfluxDB2/Data:/var/lib/influxdb2