diff --git a/Dockerfiles/agent/alpine/README.md b/Dockerfiles/agent/alpine/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/alpine/README.md
+++ b/Dockerfiles/agent/alpine/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/alpine/docker-entrypoint.sh b/Dockerfiles/agent/alpine/docker-entrypoint.sh
index dd580b4f1..27ffc6fd3 100755
--- a/Dockerfiles/agent/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/agent/alpine/docker-entrypoint.sh
@@ -155,6 +155,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
     update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
diff --git a/Dockerfiles/agent/centos/README.md b/Dockerfiles/agent/centos/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/centos/README.md
+++ b/Dockerfiles/agent/centos/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/centos/docker-entrypoint.sh b/Dockerfiles/agent/centos/docker-entrypoint.sh
index dd580b4f1..27ffc6fd3 100755
--- a/Dockerfiles/agent/centos/docker-entrypoint.sh
+++ b/Dockerfiles/agent/centos/docker-entrypoint.sh
@@ -155,6 +155,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
     update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
diff --git a/Dockerfiles/agent/ol/README.md b/Dockerfiles/agent/ol/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/ol/README.md
+++ b/Dockerfiles/agent/ol/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/ol/docker-entrypoint.sh b/Dockerfiles/agent/ol/docker-entrypoint.sh
index dd580b4f1..27ffc6fd3 100755
--- a/Dockerfiles/agent/ol/docker-entrypoint.sh
+++ b/Dockerfiles/agent/ol/docker-entrypoint.sh
@@ -155,6 +155,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
     update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
diff --git a/Dockerfiles/agent/rhel/README.md b/Dockerfiles/agent/rhel/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/rhel/README.md
+++ b/Dockerfiles/agent/rhel/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/rhel/docker-entrypoint.sh b/Dockerfiles/agent/rhel/docker-entrypoint.sh
index dd580b4f1..27ffc6fd3 100755
--- a/Dockerfiles/agent/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/agent/rhel/docker-entrypoint.sh
@@ -155,6 +155,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
     update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
diff --git a/Dockerfiles/agent/ubuntu/README.md b/Dockerfiles/agent/ubuntu/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/ubuntu/README.md
+++ b/Dockerfiles/agent/ubuntu/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent/ubuntu/docker-entrypoint.sh
index dd580b4f1..27ffc6fd3 100755
--- a/Dockerfiles/agent/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/agent/ubuntu/docker-entrypoint.sh
@@ -155,6 +155,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
     update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
diff --git a/Dockerfiles/agent/windows/README.md b/Dockerfiles/agent/windows/README.md
index 9e24b1fad..88b64d485 100644
--- a/Dockerfiles/agent/windows/README.md
+++ b/Dockerfiles/agent/windows/README.md
@@ -133,6 +133,7 @@ Additionally the image allows to specify many other environment variables listed
 ZBX_SOURCEIP=
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_HOSTINTERFACE= # Available since 4.4.0
 ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent/windows/docker-entrypoint.ps1 b/Dockerfiles/agent/windows/docker-entrypoint.ps1
index aaef8c29c..ea526c194 100644
--- a/Dockerfiles/agent/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent/windows/docker-entrypoint.ps1
@@ -165,6 +165,7 @@ function Prepare-Zbx-Agent-Config {
     else {
         Update-Config-Var $ZbxAgentConfig "ServerActive"
     }
+    Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY"
 
     Update-Config-Var $ZbxAgentConfig "HostInterface" "$env:ZBX_HOSTINTERFACE"
     Update-Config-Var $ZbxAgentConfig "HostInterfaceItem" "$env:ZBX_HOSTINTERFACEITEM"
diff --git a/Dockerfiles/agent2/alpine/README.md b/Dockerfiles/agent2/alpine/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/alpine/README.md
+++ b/Dockerfiles/agent2/alpine/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/alpine/docker-entrypoint.sh b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
index f1f99fcca..ca74e4e50 100755
--- a/Dockerfiles/agent2/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
@@ -152,6 +152,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/centos/README.md b/Dockerfiles/agent2/centos/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/centos/README.md
+++ b/Dockerfiles/agent2/centos/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/centos/docker-entrypoint.sh b/Dockerfiles/agent2/centos/docker-entrypoint.sh
index f1f99fcca..ca74e4e50 100755
--- a/Dockerfiles/agent2/centos/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/centos/docker-entrypoint.sh
@@ -152,6 +152,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/ol/README.md b/Dockerfiles/agent2/ol/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/ol/README.md
+++ b/Dockerfiles/agent2/ol/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/ol/docker-entrypoint.sh b/Dockerfiles/agent2/ol/docker-entrypoint.sh
index f1f99fcca..ca74e4e50 100755
--- a/Dockerfiles/agent2/ol/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ol/docker-entrypoint.sh
@@ -152,6 +152,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/rhel/README.md b/Dockerfiles/agent2/rhel/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/rhel/README.md
+++ b/Dockerfiles/agent2/rhel/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/rhel/docker-entrypoint.sh b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
index f1f99fcca..ca74e4e50 100755
--- a/Dockerfiles/agent2/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
@@ -152,6 +152,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/ubuntu/README.md b/Dockerfiles/agent2/ubuntu/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/ubuntu/README.md
+++ b/Dockerfiles/agent2/ubuntu/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
index f1f99fcca..ca74e4e50 100755
--- a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
@@ -152,6 +152,7 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/windows/README.md b/Dockerfiles/agent2/windows/README.md
index 32723fb83..b147364fe 100644
--- a/Dockerfiles/agent2/windows/README.md
+++ b/Dockerfiles/agent2/windows/README.md
@@ -128,6 +128,7 @@ ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
 ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
 ZBX_ENABLESTATUSPORT=
 ZBX_SOURCEIP=
+ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2.0
 ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 ZBX_LOGREMOTECOMMANDS=0
 ZBX_STARTAGENTS=3
diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
index 61a6f7a90..915b84efa 100644
--- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
@@ -163,6 +163,7 @@ function Prepare-Zbx-Agent-Config {
     else {
         Update-Config-Var $ZbxAgentConfig "ServerActive"
     }
+    Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY"
 
     if ([string]::IsNullOrWhitespace($env:ZBX_ENABLEPERSISTENTBUFFER)) {
         $env:ZBX_ENABLEPERSISTENTBUFFER="true"
diff --git a/env_vars/.env_agent b/env_vars/.env_agent
index 58ecf335e..6222e5741 100644
--- a/env_vars/.env_agent
+++ b/env_vars/.env_agent
@@ -2,6 +2,7 @@
 # ZBX_DEBUGLEVEL=3
 # ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 # ZBX_LOGREMOTECOMMANDS=0
+# ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2
 # ZBX_HOSTINTERFACE= # Available since 4.4.0
 # ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 # ZBX_SERVER_HOST=zabbix-server