diff --git a/zabbix/docker-compose.yml b/zabbix/docker-compose.yml
index 30e69a7..dece040 100644
--- a/zabbix/docker-compose.yml
+++ b/zabbix/docker-compose.yml
@@ -1,20 +1,28 @@
 version: '3.7'
+volumes:
+  zabbix_alert_scripts:
+  zabbix_pgsql_database:
+
 services:
   postgres-server:    # The Postgres Database Service
-    image: postgres:13.5-alpine
+    image: postgres:13.5
+    container_name: zabbix-postgresql
     restart: always
     environment:   # Username, password and database name variables
       POSTGRES_USER: zabbix_user
-      POSTGRES_PASSWORD: zabbix
+      POSTGRES_PASSWORD: TheVeryVeryBigzabbixPassw0rd_TobeSafe++++
       POSTGRES_DB: zabbix_db
       PG_DATA: /var/lib/postgresql/data/pgdata #data storage
+    volumes:  # Volumes for databases
+      - zabbix_pgsql_database:/var/lib/postgresql/data/pgdata
   
   zabbix-server:     # The main Zabbix Server Software Service
     image: zabbix/zabbix-server-pgsql:ubuntu-latest
+    container_name: zabbix-mainserver
     restart: always
     environment:   # The Postgres database value variable
       POSTGRES_USER: zabbix_user
-      POSTGRES_PASSWORD: zabbix
+      POSTGRES_PASSWORD: TheVeryVeryBigzabbixPassw0rd_TobeSafe++++
       POSTGRES_DB: zabbix_db
       ZBX_HISTORYSTORAGETYPES: log,text #Zabbix configuration variables
       ZBX_DEBUGLEVEL: 1
@@ -23,24 +31,26 @@ services:
     depends_on:
       - postgres-server
     volumes:  # Volumes for scripts and related files you can add
-      - /usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts
+      - zabbix_alert_scripts:/usr/lib/zabbix/alertscripts
   
   zabbix-web:    # The main Zabbix web UI or interface 
     image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
     restart: always
+    container_name: zabbix-webserver
     environment:  # Postgre database variables
       POSTGRES_USER: zabbix_user
-      POSTGRES_PASSWORD: zabbix
+      POSTGRES_PASSWORD: TheVeryVeryBigzabbixPassw0rd_TobeSafe++++
       POSTGRES_DB: zabbix_db
       ZBX_SERVER_HOST: zabbix-server  # Zabbix related and Php variables
       ZBX_POSTMAXSIZE: 64M
-      PHP_TZ: "Asia/Kolkata"  
+      PHP_TZ: "Europe/Paris"  
       ZBX_MAXEXECUTIONTIME: 500
     depends_on:
       - postgres-server
       - zabbix-server
     ports:    # Port where Zabbix UI is available
       - 8090:80
+
   zabbix-agent:   # Zabbix agent service that tracks usage and send to zabbix server
     image: zabbix/zabbix-agent:latest
     privileged: true   #access mode for allowing resource access