diff --git a/.env.example b/.env.example
index e46aeab5..ffdcf8aa 100644
--- a/.env.example
+++ b/.env.example
@@ -28,7 +28,7 @@ ATOMA_DAEMON_PORT=3001
 # Currently available docker compose profiles:
 #
 # All possible values are:
-#   
+#
 # 1. chat_completions_vllm
 # 2. chat_completions_mistralrs_cpu
 # 3. chat_completions_vllm_cpu, running this profile requires a CPU with AVX2 support
@@ -39,7 +39,7 @@ ATOMA_DAEMON_PORT=3001
 #
 # Setting the COMPOSE_PROFILES environment variable will start all services listed in the value, e.g.
 # COMPOSE_PROFILES=chat_completions_vllm will start the chat completions server and the postgres database
-# 
+#
 # Please change it accordingly to which inference services you want to run, and which database you want to use (either PostgresSQL or SQLite)
 COMPOSE_PROFILES=chat_completions_vllm
 
@@ -51,6 +51,7 @@ PROMETHEUS_PORT=9090
 
 # Grafana Configuration
 GRAFANA_PORT=30001
+GF_SERVER_ROOT_URL=http://localhost:30001/
 
 # ----------------------------------------------------------------------------------
 # chat completions server
diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 41fe4bd9..18687052 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -58,7 +58,7 @@ services:
     networks:
       - atoma-network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} -p ${POSTGRES_PORT} || exit 1"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} -p 5432 || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1b054fc4..bd9406d4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -69,15 +69,15 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    ports:
-      - "${POSTGRES_PORT:-5432}:5432"
     volumes:
       - postgres-data:/var/lib/postgresql/data
+    ports:
+      - "${POSTGRES_PORT:-5432}:5432"
     env_file: .env
     networks:
       - atoma-network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} -p ${POSTGRES_PORT} || exit 1"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} -p 5432 || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -115,6 +115,8 @@ services:
     volumes:
       - grafana_data:/var/lib/grafana
     env_file: .env
+    environment:
+      - GF_SERVER_ROOT_URL=http://${GRAFANA_DOMAIN}:${GRAFANA_PORT:-30001}/
     networks:
       - atoma-network
     healthcheck: