diff --git a/.env.development b/.env.development
index 8c1a5ad..3a8bbd1 100644
--- a/.env.development
+++ b/.env.development
@@ -55,20 +55,4 @@ MQTT_USERNAME=fems
 MQTT_PASSWORD=fems123!
 MQTT_ALLOW_ANONYMOUS=false
 
-# Kafka
-# KAFKA_BROKER=kafka:9092
-# KAFKA_TOPIC_PREFIX=wacefems-data
-
-# Node-RED
-# NODERED_PORT=1880
-# NODERED_CREDENTIAL_SECRET=wacefems-nodered-secret-PPw09!keep
-
-# Monitoring
-# PROMETHEUS_PORT=9090
-# GRAFANA_PORT=3100
-
-# Log Management
-# ELASTICSEARCH_HOST=elasticsearch
-# ELASTICSEARCH_PORT=9200
-# KIBANA_PORT=5601
 
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
index e27dc41..49a0bfb 100644
--- a/docker-compose.db.yml
+++ b/docker-compose.db.yml
@@ -49,10 +49,10 @@ services:
     env_file:
       - .env.${NODE_ENV:-development}
     ports:
-      - "${TIMESCALEDB_PORT}:5442"
+      - "${TIMESCALEDB_PORT}:5432"
     environment:
       POSTGRES_DB: ${TIMESCALEDB_DB}
-      POSTGRES_USER: ${TIMESCALEDB_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${TIMESCALEDB_PASSWORD}
     volumes:
       - fems_timescaledb:/var/lib/postgresql/data
@@ -74,12 +74,7 @@ services:
       - .env.${NODE_ENV:-development}
     ports:
       - "${REDIS_PORT}:6379"
-    command:
-      [
-        "redis-server",
-        "--requirepass",
-        "${NODE_ENV:-development:-REDIS_PASSWORD}",
-      ]
+    command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}"]
     volumes:
       - fems_redis:/data
       - ./backups/redis:/backups