diff --git a/.env.development b/.env.development
index 5231a2c..26a47c0 100644
--- a/.env.development
+++ b/.env.development
@@ -27,6 +27,7 @@ JWT_EXPIRES_IN=1d
 
 # REALTIME API
 REALTIME_API_PORT=3004
+REALTIME_BACKEND_API_URL=http://localhost:3004
 
 # Database
 POSTGRES_HOST=fems-postgres
diff --git a/.env.production b/.env.production
index 86f17ee..41a5097 100644
--- a/.env.production
+++ b/.env.production
@@ -32,6 +32,10 @@ CORS_ORIGIN=*
 JWT_SECRET=wacefems-secret-work-in-progress-PPw09!keep
 JWT_EXPIRES_IN=1d
 
+# REALTIME API
+REALTIME_API_PORT=3004
+REALTIME_BACKEND_API_URL=http://localhost:3004
+
 # Database
 POSTGRES_HOST=fems-postgres
 POSTGRES_PORT=5432
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
index 77f4ec3..c42c0c7 100644
--- a/docker-compose.db.yml
+++ b/docker-compose.db.yml
@@ -27,15 +27,6 @@ services:
       - "max_connections=100"
       - "-c"
       - "shared_buffers=128MB"
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-postgres}",
-        ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
     # healthcheck:
     #   test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
     #   interval: 30s
@@ -100,11 +91,6 @@ services:
   #   build:
   #     context: ./docker/mqtt
   #     dockerfile: Dockerfile
-  #     args:
-  #       - MQTT_USERNAME=fems
-  #       - MQTT_PASSWORD=fems123!
-  #       - NODE_RED_USERNAME=nodered_user
-  #       - NODE_RED_PASSWORD=nodered_password123!
   #   container_name: fems-mqtt
   #   env_file:
   #     - .env.${NODE_ENV:-development}