diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index a7403441d5f..98157459162 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -196,6 +196,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Collect metrics when EC2 instances are not in running state. {issue}11008[11008] {pull}11023[11023]
 - Change ECS field cloud.provider to aws. {pull}11023[11023]
 - Add documentation about jolokia autodiscover fields. {issue}10925[10925] {pull}10979[10979]
+- Add missing aws.ec2.instance.state.name into fields.yml. {issue}11219[11219] {pull}11221[11221]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 243d791f81c..b75801a5f0b 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -1073,6 +1073,16 @@ type: integer
 The state of the instance, as a 16-bit unsigned integer.
 
 
+--
+
+*`aws.ec2.instance.state.name`*::
++
+--
+type: keyword
+
+The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
+
+
 --
 
 *`aws.ec2.instance.threads_per_core`*::
@@ -1080,7 +1090,7 @@ The state of the instance, as a 16-bit unsigned integer.
 --
 type: integer
 
-The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
+The number of threads per CPU core.
 
 
 --
diff --git a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml
index 1aaefab58f7..45c76e7ac2f 100644
--- a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml
+++ b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml
@@ -100,7 +100,11 @@
       type: integer
       description: >
         The state of the instance, as a 16-bit unsigned integer.
+    - name: instance.state.name
+      type: keyword
+      description: >
+        The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
     - name: instance.threads_per_core
       type: integer
       description: >
-        The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
+        The number of threads per CPU core.
diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go
index 0eb1abe1e91..90d188ed156 100644
--- a/x-pack/metricbeat/module/aws/fields.go
+++ b/x-pack/metricbeat/module/aws/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetAws returns asset data.
 // This is the base64 encoded gzipped contents of module/aws.
 func AssetAws() string {
-	return "eJzsWs1uIzcSvs9TFHJKgHFjMzPZgw8LTDzGxkA28cYe5KgpkSU112yyh0VKljEPvyj2jyy5Zcu2WrlEB8MQW6zvK9Y/+wRuaHUKuOQ3ANFES6fwHS75uzcAmlgFU0fj3Sn86w0AwBdc8heovE6WQHlrSUWGj39eQeWdiT4YN4eKYjCKYRZ8ldfOrE96iVGVxRuAQJaQ6RTm+AZgZshqPs27n4DDijo08omrWh4MPtXtNwOgNje5vxGpd/13Q5vt3LD5fCH17gso7yIaxxBL6rnFEiMsKRCwCliT3mL7p7CFZWlUud5gQEdMLsJ0lX94fvauuCd/U0/dZ5vqfbqqTkX0EW1Rq7jxREeeFVrSk5n1uP3AI3qQz3VJUFNQ5CLOCfwM0FqvMJIW4KB8VadIkJyJrXowEKgUArloV2AcJCbwLuvROI7oFBU7iahA2sRJYpzTCFxcqqYUhMfZ5WdohDFw3Z7HfYww8yE/laKx5g5l2ydxT9HKb0dFThgc6Q0CjeLdGnuJDKhUSKSBjXxjIiyRwWJyqiQNPgBHDJH0blKcQm0TT45IrhW5yazEBcGUyK1PCh0kZ01lxBJ72suSHMjPzi4/n+Udfm4wwwJtIjAMdxT8vox5okoMc9LjUs6cBomLLzkfoUajQfulE+oPz/8toNNt2IllYjBOpSA6Qq2NoEALDZVh6o7i0oebwriiRnVDkUdl3MqAQIrMQozRSVzpYIBxkcIMFfG2Uz4O36d4VPw5jPsUD4XfuGK6ijQu+CxhFNUfC/uh1K4N3xhfBEI9CvafW01jWyYI1j5UcfSBYOFtqogBF2gsTi1B9PsjXwYTaUTosn8kJ5gOjj1r3deHBn7mq9qSJIWsd19TyJmbX34EUsOgRGllZoa01EPGazHHaKp9DmhMllnCfZovPKuXkOSIMXGhSlI3kxkauyNRWu/mz+P3B9U+RJZ8HksKm0iltqmRmTRMfSw3FxtMkDHlrCirvOJI1eaaaSpSixyhMi7F/UlOmv2OzHUMIp2cv4DK8IntS6YPMcoH+ZPccOcjKWFO4dWNgg/EuSF4Or71q6bCORVm2CduaLX0YXttD2AXn7JTCgzZX7orLc7cFPbPwbfuSws5g2EjeBHOC6eN9IhrS9AUs8Xdb4YNAzmJRTs6kB5oHcwCIxXa8USWDqvQdnf49NtVFtyp90FVsSdKUw9b4vbXz4B2cbn4IKV8IGZAZq9M7sCXpg1/z8aaptaosRSaN3+gzz2tsoV2QC12imtxnEtwMQouLvuV70XBP8DUJ6e7xPhclWYXKpTXw9p8cSDK+27r8C1Ifw8//vNkaiIkx2buch+chTyBNJZSGvGkpjCRwHYEvPB9TU6L03+DkJxr/uMyxWjc/CR3tt8gUqiMy5b9TeqWum6fk39J/1A8mPTx+4lGY1cTqXI2J0bPH/ttb7Y1A8xr0K6NOhG8ej84EJxS3HckOE3SoBaH9e3fWmdGuHrfSXhMOpu7cZqT7NSV5HyBozGi1A1tbyjlrm6q2ccwNvl94mcTP/0fqVEGBnkoe6+SaCUNYMylhZTtnXkpK5USD1p8oK+JOL7W1ttt7ll5+83ftv2I3bQ64mbifqC6echYfrm+vuylQYU6t2zo4GOFd96tcb6FQHMM2nY5blXvyFU99jkNV8svQ76F+d/n11u4xbg72xejf8jhCbx1GhHv5eeD49Ukzfl4kD+d/3p+fX5o1CXhofr3Acy/nH/8tJc9P2ULnsc0ht+vtq3hRSiZLO24jHstzjWSq/Nfz8+u4fd86HDmXZRAe2CraJhMWKFzNM6cdGjG2yX2Vm7T6uxN/TVMA8UU/gqqneBjcLVmTC/qseUKQmTlClo10LlJtI/hlIbAetTjn0JzBGt52WH2S7vLUkojIRaIa+9Y+h1lkybpzaZer4bJpfqY1DppzVm0ZRpgX+wJzrfPj3QUgg9cfLi9Hc+MPtzegrJGrD2L60eFXtNeZ9R4EraXv34GZPI06h/gA/z4KLGfxiT20+0tMIUFhSMSsxjJqVUxM4HjRIyjqIat72UcawonnVFFU1HTLDR+39xWrG2OpD3oryCb6/wHHKNv7vM3PCy/s5BvOabUR8zHCefKumt3DsuZLNbc3Jbs4J61nV1xzbedMOUhd17JDdJT3td3gF/5da3fVz7i201X/716bcPnrSaOk4qYcU4TnFPBpA54iljXwd+aCiNB+5aTqKWRC867k6ag19Bi6K4pviZKO3qt9sncC+DqYBdj15vRpJOyAWj96kgrO9+DOR/v3f41WQ7zSM5UFWmDkeyOhNVzcT5OFobN1I7T3PR0egbGwcyaebkjC/XIjoJqW30xGFqgXTv7nvYgpjQu0s5en4Wsi0/jQuur3OkKFFrLXTj8oxH/n9bFUO1+4a6HLJFm5DPXuonY+JgOqarjatIq8JAJZo1oSz0fLy869YmvaNN4eKNdwI7Ajqtgcut4+sSYdgD3zIcK4ykM/WifGwJzR0/o+P8BAAD//6Jy35Y="
+	return "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"
 }