diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 533d7a495fd..000eaf8415a 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -215,8 +215,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fixed documentation for commands in beats dev guide {pull}22194[22194]
 - Fix parsing of expired licences. {issue}21112[21112] {pull}22180[22180]
 - Fix duplicated pod events in kubernetes autodiscover for pods with init or ephemeral containers. {pull}22438[22438]
+- Fix FileVersion contained in Windows exe files. {pull}22581[22581]
 - Fix index template loading when the new index format is selected. {issue}22482[22482] {pull}22682[22682]
 
+
 *Auditbeat*
 
 - system/socket: Fixed compatibility issue with kernel 5.x. {pull}15771[15771]
diff --git a/dev-tools/mage/common.go b/dev-tools/mage/common.go
index e4b93625b75..dd0a2fd56c2 100644
--- a/dev-tools/mage/common.go
+++ b/dev-tools/mage/common.go
@@ -782,7 +782,7 @@ func binaryExtension(goos string) string {
 	return ""
 }
 
-var parseVersionRegex = regexp.MustCompile(`(?m)^[^\d]*(?P<major>\d)+\.(?P<minor>\d)+(?:\.(?P<patch>\d)+.*)?$`)
+var parseVersionRegex = regexp.MustCompile(`(?m)^[^\d]*(?P<major>\d+)\.(?P<minor>\d+)(?:\.(?P<patch>\d+).*)?$`)
 
 // ParseVersion extracts the major, minor, and optional patch number from a
 // version string.
diff --git a/dev-tools/mage/common_test.go b/dev-tools/mage/common_test.go
index e4ce81505ad..8b6ac8bd732 100644
--- a/dev-tools/mage/common_test.go
+++ b/dev-tools/mage/common_test.go
@@ -33,6 +33,8 @@ func TestParseVersion(t *testing.T) {
 		{"1.2.3-SNAPSHOT", 1, 2, 3},
 		{"1.2.3rc1", 1, 2, 3},
 		{"1.2", 1, 2, 0},
+		{"7.10.0", 7, 10, 0},
+		{"10.01.22", 10, 1, 22},
 	}
 
 	for _, tc := range tests {