diff --git a/.env.development b/.env.development
index dc83c80..8c1a5ad 100644
--- a/.env.development
+++ b/.env.development
@@ -38,7 +38,7 @@ POSTGRES_PASSWORD=wacefems-pg-password-PPw09!keep
 # TimescaleDB
 TIMESCALEDB_HOST=fems-timescaledb
 TIMESCALEDB_PORT=5433
-TIMESCALEDB_DB=fems_timeseries_da
+TIMESCALEDB_DB=fems_timeseries_db
 TIMESCALEDB_USER=wacefems-tsdb-user
 TIMESCALEDB_PASSWORD=wacefems-tsdb-password-PPw09!keep
 
diff --git a/.env.production b/.env.production
index 60dc919..04d2f1b 100644
--- a/.env.production
+++ b/.env.production
@@ -33,43 +33,45 @@ JWT_SECRET=wacefems-secret-work-in-progress-PPw09!keep
 JWT_EXPIRES_IN=1d
 
 # Database
-POSTGRES_HOST=postgres
+POSTGRES_HOST=fems-postgres
 POSTGRES_PORT=5432
 POSTGRES_DB=wacefems-database
 POSTGRES_USER=wacefems_database_user
 POSTGRES_PASSWORD=wacefems-pg-password-PPw09!keep
 
 # TimescaleDB
-TIMESCALEDB_HOST=timescaledb
-TIMESCALEDB_PORT=5432
-TIMESCALEDB_DB=wacefems-timeseries-database
+TIMESCALEDB_HOST=fems-timescaledb
+TIMESCALEDB_PORT=5433
+TIMESCALEDB_DB=fems_timeseries_db
 TIMESCALEDB_USER=wacefems-tsdb-user
 TIMESCALEDB_PASSWORD=wacefems-tsdb-password-PPw09!keep
 
 # Redis
-REDIS_HOST=redis
+REDIS_HOST=fems-redis
 REDIS_PORT=6379
 REDIS_PASSWORD=wacefems-redis-password-PPw09!keep
 
 # MQTT Broker
-MQTT_PORT=1883
-MQTT_WS_PORT=9001
-MQTT_USERNAME=mqtt_user
-MQTT_PASSWORD=mqtt-password-PPw09!keep
+MQTT_BROKER_URL=mqtt://fems-mqtt:1883
+MQTT_PORT=1884
+MQTT_WSS_PORT=8883
+MQTT_USERNAME=fems
+MQTT_PASSWORD=fems123!
+MQTT_ALLOW_ANONYMOUS=false
 
-# Kafka
-KAFKA_BROKER=kafka:9092
-KAFKA_TOPIC_PREFIX=wacefems-data
+# # Kafka
+# KAFKA_BROKER=kafka:9092
+# KAFKA_TOPIC_PREFIX=wacefems-data
 
-# Node-RED
-NODERED_PORT=1880
-NODERED_CREDENTIAL_SECRET=wacefems-nodered-secret-PPw09!keep
+# # Node-RED
+# NODERED_PORT=1880
+# NODERED_CREDENTIAL_SECRET=wacefems-nodered-secret-PPw09!keep
 
-# Monitoring
-PROMETHEUS_PORT=9090
-GRAFANA_PORT=3100
+# # Monitoring
+# PROMETHEUS_PORT=9090
+# GRAFANA_PORT=3100
 
-# Log Management
-ELASTICSEARCH_HOST=elasticsearch
-ELASTICSEARCH_PORT=9200
-KIBANA_PORT=5601
\ No newline at end of file
+# # Log Management
+# ELASTICSEARCH_HOST=elasticsearch
+# ELASTICSEARCH_PORT=9200
+# KIBANA_PORT=5601
\ No newline at end of file