diff --git a/charts/zabbix/Chart.yaml b/charts/zabbix/Chart.yaml
index 0f043be..4036c12 100644
--- a/charts/zabbix/Chart.yaml
+++ b/charts/zabbix/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2 # Don't change this
 name: zabbix
-version: 5.0.1 # helm chart version
+version: 5.0.2 # helm chart version
 # LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
 appVersion: 7.0.0 # zabbix version
 description: Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics.
diff --git a/charts/zabbix/templates/deployment-zabbix-server.yaml b/charts/zabbix/templates/deployment-zabbix-server.yaml
index 7434ae3..0357a58 100644
--- a/charts/zabbix/templates/deployment-zabbix-server.yaml
+++ b/charts/zabbix/templates/deployment-zabbix-server.yaml
@@ -139,8 +139,10 @@ spec:
             {{- with .Values.zabbixServer.extraEnv }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
+            {{- if gt (.Values.zabbixServer.replicaCount | int) 1 }}
             - name: ZBX_AUTOHANODENAME
               value: "hostname"
+            {{- end }}
             - name: ZBX_NODEADDRESS
               valueFrom:
                 fieldRef:
diff --git a/charts/zabbix/templates/job-init-db-schema.yaml b/charts/zabbix/templates/job-init-db-schema.yaml
index cdd8a8b..f96f776 100644
--- a/charts/zabbix/templates/job-init-db-schema.yaml
+++ b/charts/zabbix/templates/job-init-db-schema.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.zabbixServer.enabled (gt (.Values.zabbixServer.replicaCount | int) 1) }}
+{{- if and .Values.zabbixServer.enabled (gt (.Values.zabbixServer.replicaCount | int) 1) false }}
 {{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}
 apiVersion: batch/v1
 {{- else }}