+diff -ur zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go 2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go 2024-06-13 13:24:12.415823801 +0200
+@@ -25,7 +25,7 @@
+ ListenPort string `conf:"optional,range=1024:32767,default=10053"`
+ AllowedIP string `conf:"optional"`
+ LogType string `conf:"optional,default=file"`
+- LogFile string `conf:"optional,default=/tmp/zabbix_web_service.log"`
++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_web_service.log"`
+ LogFileSize int `conf:"optional,range=0:1024,default=1"`
+ Timeout int `conf:"optional,range=1:30,default=3"`
+ DebugLevel int `conf:"range=0:5,default=3"`
+diff -ur zabbix-6.0.30.orig/src/go/conf/mock_server.conf zabbix-6.0.30/src/go/conf/mock_server.conf
+--- zabbix-6.0.30.orig/src/go/conf/mock_server.conf 2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/mock_server.conf 2024-06-13 13:24:12.415823801 +0200
+@@ -18,7 +18,7 @@
+ # Default:
+ # LogFile=
+
+-#LogFile=/tmp/zabbix_mock_server.log
++#LogFile=/var/log/zabbix/zabbix_mock_server.log
+
+ ### Option: DebugLevel
+ # Specifies debug level:
+diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.30/src/go/conf/zabbix_agent2.conf
+--- zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf 2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/zabbix_agent2.conf 2024-06-13 13:24:12.415823801 +0200
+@@ -8,7 +8,7 @@
+ #
+ # Mandatory: no
+ # Default:
+-# PidFile=/tmp/zabbix_agent2.pid
++# PidFile=/var/run/zabbix/zabbix_agent2.pid
+
+ ### Option: LogType
+ # Specifies where log messages are written to:
+@@ -25,7 +25,7 @@
+ #
+ # Mandatory: yes, if LogType is set to file, otherwise no
+ # Default:
+-# LogFile=/tmp/zabbix_agent2.log
++# LogFile=/var/log/zabbix/zabbix_agent2.log
+
+ ### Option: LogFileSize
+ # Maximum size of log file in MB.
+@@ -272,9 +272,7 @@
+ # Default:
+ # Include=
+
+-# Include=/usr/local/etc/zabbix_agent2.userparams.conf
+-# Include=/usr/local/etc/zabbix_agent2.conf.d/
+-# Include=/usr/local/etc/zabbix_agent2.conf.d/*.conf
++Include=/etc/zabbix/zabbix_agent2.conf.d/*.conf
+
+ ### Option:PluginTimeout
+ # Timeout for connections with external plugins.
+@@ -477,4 +475,4 @@
+ # ForceActiveChecksOnStart=0
+
+ # Include configuration files for plugins
+-Include=./zabbix_agent2.d/plugins.d/*.conf
++Include=/etc/zabbix/zabbix_agent2.d/plugins.d/*.conf
+diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.30/src/go/conf/zabbix_web_service.conf
+--- zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf 2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/zabbix_web_service.conf 2024-06-13 13:24:12.415823801 +0200
+@@ -18,7 +18,7 @@
+ #
+ # Mandatory: yes, if LogType is set to file, otherwise no
+ # Default:
+-# LogFile=/tmp/zabbix_web_service.log
++# LogFile=/var/log/zabbix/zabbix_web_service.log
+
+ ### Option: LogFileSize
+ # Maximum size of log file in MB.
+diff -ur zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go zabbix-6.0.30/src/go/internal/agent/options_nix.go
+--- zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go 2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/go/internal/agent/options_nix.go 2024-06-13 13:24:12.415823801 +0200
+@@ -24,7 +24,7 @@
+
+ type AgentOptions struct {
+ LogType string `conf:"optional,default=file"`
+- LogFile string `conf:"optional,default=/tmp/zabbix_agent2.log"`
++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_agent2.log"`
+ LogFileSize int `conf:"optional,range=0:1024,default=1"`
+ DebugLevel int `conf:"optional,range=0:5,default=3"`
+ PidFile string `conf:"optional"`
+diff -ur zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go 2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go 2024-06-13 13:24:12.415823801 +0200
+@@ -31,7 +31,7 @@
+
+ func createPidFile(pid int, path string) (file *os.File, err error) {
+ if path == "" {
+- path = "/tmp/zabbix_agent2.pid"
++ path = "/var/run/zabbix/zabbix_agent2.pid"
+ }
+
+ flockT := syscall.Flock_t{
+diff -ur zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c 2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c 2024-06-13 13:24:12.415823801 +0200
+@@ -609,7 +609,7 @@