diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml
index df991bf..66cf2a7 100644
--- a/firefoxsync/docker-compose.yaml
+++ b/firefoxsync/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
 
 
   db:
-    image: postgres:13
+    image: postgres:${POSTGRES_VERSION}
     restart: unless-stopped
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
@@ -40,7 +40,6 @@ services:
       - firefoxsync
     volumes:
       - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data
-    user: ${UID}:${GID}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
       interval: 10s
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index f247051..9b22731 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -28,14 +28,13 @@ services:
       - GF_DATABASE_TYPE=postgres
       - GF_DATABASE_HOST=grafanadb:5432
       - GF_DATABASE_SSL_MODE=disable
-      - GF_DATABASE_NAME=grafana
+      - GF_DATABASE_NAME=${POSTGRES_DB}
       - GF_DATABASE_USER=${POSTGRES_USER}
       - GF_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
       - GF_INSTALL_PLUGINS=flant-statusmap-panel,redis-datasource
     depends_on:
       - influxdb
       - grafanadb
-      
 
 
   grafanadb:
@@ -46,11 +45,11 @@ services:
       - grafana
     restart: unless-stopped
     environment:
-      - POSTGRES_DB=grafana
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 10s
       timeout: 5s
     labels: