diff --git a/zabbix/init_zabbix.sh b/zabbix/init_zabbix.sh
index 68ef8a2..38cf989 100755
--- a/zabbix/init_zabbix.sh
+++ b/zabbix/init_zabbix.sh
@@ -13,6 +13,7 @@ EOF
 zcat /usr/share/doc/zabbix-server-mysql*/create.sql.gz | mysql -u${DB_USER} -p${DB_PASSWORD} ${DB_NAME}
 
 echo "DBPassword=${DB_PASSWORD}" >> /etc/zabbix/zabbix_server.conf.d/db.conf
+sed -i "s@^\$DB['PASSWORD'].*$@\$DB['PASSWORD'] = \'${DB_PASSWORD}\';@g" /etc/zabbix/web/zabbix.conf.php
 
 systemctl --now enable zabbix-server zabbix-agent nginx php7.3-fpm
 
diff --git a/zabbix/zabbix-init.service b/zabbix/zabbix-init.service
new file mode 100644
index 0000000..26f61ce
--- /dev/null
+++ b/zabbix/zabbix-init.service
@@ -0,0 +1,12 @@
+[Unit]
+# The script needs to execute after:
+# network interfaces are configured
+Wants=mariadb.service
+After=mariadb.service
+
+[Service]
+Type=oneshot
+ExecStart=/etc/zabbix/init_zabbix.sh
+
+[Install]
+WantedBy=multi-user.target