diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0b18cc32aed..31df834eae5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -65,6 +65,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Fix relative paths in the prospector definitions. {pull}5443[5433]
 - Fix `recursive_globe.enabled` option. {pull}5443[5443]
 - Change pipeline delimiter to `{<` and `>}`. {pull}5702[5702]
+- Fix variable name for `convert_timezone` in the system module. {pull}5936[5936]
 
 *Heartbeat*
 
diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml
index 7c683d137a8..5d0b2cb1e0d 100644
--- a/filebeat/filebeat.reference.yml
+++ b/filebeat/filebeat.reference.yml
@@ -22,7 +22,7 @@ filebeat.modules:
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
     # Prospector configuration (advanced). Any prospector configuration option
     # can be added under this section.
@@ -37,7 +37,7 @@ filebeat.modules:
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
     # Prospector configuration (advanced). Any prospector configuration option
     # can be added under this section.
diff --git a/filebeat/module/system/_meta/config.reference.yml b/filebeat/module/system/_meta/config.reference.yml
index dc222d2a44c..6f243887bc5 100644
--- a/filebeat/module/system/_meta/config.reference.yml
+++ b/filebeat/module/system/_meta/config.reference.yml
@@ -8,7 +8,7 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
     # Prospector configuration (advanced). Any prospector configuration option
     # can be added under this section.
@@ -23,7 +23,7 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
     # Prospector configuration (advanced). Any prospector configuration option
     # can be added under this section.
diff --git a/filebeat/module/system/_meta/config.yml b/filebeat/module/system/_meta/config.yml
index 4513d921894..34d3bb35df2 100644
--- a/filebeat/module/system/_meta/config.yml
+++ b/filebeat/module/system/_meta/config.yml
@@ -8,7 +8,7 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
   # Authorization logs
   auth:
@@ -19,4 +19,4 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
diff --git a/filebeat/modules.d/system.yml.disabled b/filebeat/modules.d/system.yml.disabled
index 4513d921894..34d3bb35df2 100644
--- a/filebeat/modules.d/system.yml.disabled
+++ b/filebeat/modules.d/system.yml.disabled
@@ -8,7 +8,7 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false
 
   # Authorization logs
   auth:
@@ -19,4 +19,4 @@
     #var.paths:
 
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
-    #convert_timezone: false
+    #var.convert_timezone: false