diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a16aad1c35e..471f8c1373b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -80,6 +80,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
 - Fix dropwizard module parsing of metric names. {issue}8365[8365] {pull}6385[8385]
 - Fix issue that would prevent kafka module to find a proper broker when port is not set {pull}8613[8613]
 - Fix range colors in multiple visualizations. {issue}8633[8633] {pull}8634[8634]
+- Fix incorrect header parsing on http metricbeat module {issue}8564[8564] {pull}8585[8585]
 
 *Packetbeat*
 
diff --git a/libbeat/tests/system/beat/beat.py b/libbeat/tests/system/beat/beat.py
index e6fdac2d1f8..cc255bd8a5e 100644
--- a/libbeat/tests/system/beat/beat.py
+++ b/libbeat/tests/system/beat/beat.py
@@ -61,6 +61,8 @@ def start(self):
                 stderr=subprocess.STDOUT,
                 bufsize=0,
             )
+            # If a "No such file or directory" error points you here, run
+            # "make metricbeat.test" on metricbeat folder
         return self.proc
 
     def kill(self):
@@ -501,7 +503,8 @@ def extract_fields(doc_list, name):
 
         global yaml_cache
 
-        # TODO: Make fields_doc path more generic to work with beat-generator
+        # TODO: Make fields_doc path more generic to work with beat-generator. If it can't find file
+        # "fields.yml" you should run "make update" on metricbeat folder
         with open(fields_doc, "r") as f:
             path = os.path.abspath(os.path.dirname(__file__) + "../../../../fields.yml")
             if not os.path.isfile(path):
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 0f95c5ddefd..fc9d383fa4a 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -6933,7 +6933,7 @@ HTTP request information
 
 
 
-*`http.request.header`*::
+*`http.request.headers`*::
 +
 --
 type: object
@@ -6970,7 +6970,7 @@ HTTP response information
 
 
 
-*`http.response.header`*::
+*`http.response.headers`*::
 +
 --
 type: object
diff --git a/metricbeat/module/http/_meta/fields.yml b/metricbeat/module/http/_meta/fields.yml
index 674b407a54c..50a60a9dcc6 100644
--- a/metricbeat/module/http/_meta/fields.yml
+++ b/metricbeat/module/http/_meta/fields.yml
@@ -14,7 +14,7 @@
           description: >
               HTTP request information
           fields:
-            - name: header
+            - name: headers
               type: object
               description: >
                 The HTTP headers sent
@@ -31,7 +31,7 @@
           description: >
               HTTP response information
           fields:
-            - name: header
+            - name: headers
               type: object
               description: >
                 The HTTP headers received
diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go
index 52ce1899f7a..70ea222bf5e 100644
--- a/metricbeat/module/http/fields.go
+++ b/metricbeat/module/http/fields.go
@@ -31,5 +31,5 @@ func init() {
 
 // Asset returns asset data
 func Asset() string {
-	return "eJzMlDFv4zAMhXf/igfPF+CGTB5uvqnokK3ooFhMrMSWVJFO639fKK7d2FGKBm2KchTl7z2KNBfYU1egEvEZIEZqKpD/X63u8wzQxGUwXoyzBf5lABBTaJxua8qAQDUppgJblQFMIsZuucBDzlznf5BHcP6YARtDtebiyFjAqoZG1RjS+UgJrh1OEtpTyikp0FNLLON5CngROsSxtDcSjN240Kh48+TaXH9SDSlNYcbsbbj1jkqZpT70Aqwq6h31XAaTlaRwQ1I5nRTeU/fswjz3WeUejJZJJ4XXTnc3kPWqq53S04LfO83eWaZvaXWP+oW9DlSSOVx49tJpusGzsyhpOUWnF9X4uBiWf5dJR74Kiq/xNBLvnGDjWvtF0wkDPzSkZ50adHc8maarhzR+H//AYEqm03ma7twhLm1GpnCYTOrVRs4Io4E1ScrCawAAAP//d3yXhQ=="
+	return "eJzMlDFTwzAMhff8Cl1mesfQKQMzE8fQjWNw49fGbRIbSynk33NumtCkLkevlEOj5XzvyVI0oy3ajAoRlxCJkRIZpY+LxXOaEGlw7o0TY+uMHhIiopCiyuqmRELkUUIxMlqrhIghYuo1Z/SSMpfpHaUBnL4mRCuDUnO2Z8yoVhUG1RDSukDxtulPItpjyjHJ460By3AeA56F9rEv7UAiU6+sr1S4eXRtqj+qBkrD8wTa+bDLDXKZpL41Q7Qo0Fk6gIlRS1S5ghRWR4W3aN+tn+Z+qtyBqWHoqPDS6vYGsk61pVV6XPBXq9nZmvErve5Q/7HZHjnM7sy751bjBu/OoqThGB0fqnJhNczv51FHrvCKL/E0EJ+s0Mo29ZWmIwb+aEpPOtXrbng0ThdPafg+/ILe5IzjeRpv3T7O7UaG38FfY+SEMBhYQmIWPgMAAP//T4yYaw=="
 }