diff --git a/.gitlab/changelog_config.yml b/.gitlab/changelog_config.yml
index 75f047d7f76cc586989866308125868cdf69496f_LmdpdGxhYi9jaGFuZ2Vsb2dfY29uZmlnLnltbA==..fa2a2431980a5b9a0254a4d31411d0b707374424_LmdpdGxhYi9jaGFuZ2Vsb2dfY29uZmlnLnltbA== 100644
--- a/.gitlab/changelog_config.yml
+++ b/.gitlab/changelog_config.yml
@@ -33,3 +33,13 @@
   {% else %}
   No changes.
   {% end %}
+# The format for tags that Omnibus uses isn't semver compliant, so we need to
+# specify a custom format here.
+#
+# We only match EE tags in this regex. Release tools tags CE first, then EE.
+# While it doesn't really matter which of the two we match, we opted to go with
+# EE tags here so we have the same behaviour; regardless of the tagging order.
+#
+# This does not affect the commits included in the range, as no changelog
+# commits are introduced between the tag commits.
+tag_format: '^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\+(?P<pre>rc\d+))?((\.|\+)(?P<meta>ee\.\d+))?$'