diff --git a/ci/scripts/generate-changelog.sh b/ci/scripts/generate-changelog.sh
index d3d2b97e5db..49e96c1ff32 100755
--- a/ci/scripts/generate-changelog.sh
+++ b/ci/scripts/generate-changelog.sh
@@ -4,9 +4,14 @@ set -e
 CONFIG_DIR=git-repo/ci/config
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 
+milestone=${version}
+if [[ $RELEASE_TYPE = "RELEASE" ]]; then
+	milestone=${version%.RELEASE}
+fi
+
 java -jar /github-changelog-generator.jar \
   --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \
-  ${version} generated-changelog/changelog.md
+  ${milestone} generated-changelog/changelog.md
 
 echo ${version} > generated-changelog/version
 echo v${version} > generated-changelog/tag