diff --git a/roles/repo_zabbix/defaults/main.yml b/roles/repo_zabbix/defaults/main.yml
index 009553f..9298bca 100644
--- a/roles/repo_zabbix/defaults/main.yml
+++ b/roles/repo_zabbix/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-zabbix_major_version: 7.0
+zabbix_major_version: 7.2
diff --git a/roles/zabbix_server/templates/httpd.conf.j2 b/roles/zabbix_server/templates/httpd.conf.j2
index bb26567..e0fe7ed 100644
--- a/roles/zabbix_server/templates/httpd.conf.j2
+++ b/roles/zabbix_server/templates/httpd.conf.j2
@@ -1,5 +1,5 @@
 
-<Directory "/usr/share/zabbix">
+<Directory "/usr/share/zabbix{% if zabbix_major_version is version('7.2', '>=') %}/ui{% endif %}">
     Options FollowSymLinks
     AllowOverride All
 {% if zabbix_server_web_src_ip is defined %}
diff --git a/roles/zabbix_server/templates/php.conf.j2 b/roles/zabbix_server/templates/php.conf.j2
index d0a0860..42906f8 100644
--- a/roles/zabbix_server/templates/php.conf.j2
+++ b/roles/zabbix_server/templates/php.conf.j2
@@ -27,7 +27,7 @@ php_admin_value[upload_tmp_dir] = /tmp
 php_admin_value[post_max_size] = 32M
 php_admin_value[upload_max_filesize] = 5M
 php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
-php_admin_value[open_basedir] = /usr/share/zabbix:/etc/zabbix:/tmp:/var/lib/zabbix/sessions:/etc/alternative/:/usr/share/fonts/dejavu/:/usr/share/zabbix/assets/fonts/graphfont.ttf
+php_admin_value[open_basedir] = /usr/share/zabbix:/etc/zabbix:/tmp:/var/lib/zabbix/sessions:/etc/alternative/:/usr/share/fonts/dejavu/:/usr/share/zabbix{% if zabbix_major_version is version('7.2', '>=') %}/ui{% endif %}/assets/fonts/graphfont.ttf
 php_admin_value[max_execution_time] = 600
 php_admin_value[max_input_time] = 600
 php_admin_flag[allow_url_include] = off
diff --git a/roles/zimbra/templates/pre_backup.sh.j2 b/roles/zimbra/templates/pre_backup.sh.j2
index bec3949..6d50ad5 100644
--- a/roles/zimbra/templates/pre_backup.sh.j2
+++ b/roles/zimbra/templates/pre_backup.sh.j2
@@ -44,7 +44,8 @@ for MAILBOX in $(/usr/local/bin/zmprov getQuotaUsage $(hostname --fqdn) | awk '{
       continue
     fi
     DIR=$(echo $LINE | perl -ne 'm/\s*\d+\s+(\w{4})\s+\d+\s+\d+\s+(\/.*)/ && print "$2\n"')
-    if echo $DIR | grep -qiP '\([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}:\d+\)$'; then
+    if echo $DIR | grep -qiP '\(([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}|null):\d+\)$'; then
+      echo "Skipping dir $DIR as it's a shared folder"
       continue
     fi
     TYPE=$(echo $LINE | perl -ne 'm/\s*\d+\s+(\w{4})\s+\d+\s+\d+\s+(\/.*)/ && print "$1\n"')