diff --git a/Makefile b/Makefile
index fc29fc759..d80e42644 100644
--- a/Makefile
+++ b/Makefile
@@ -350,7 +350,7 @@ changelog:
 	docker run --rm \
 		-e CHANGELOG_GITHUB_TOKEN=$(shell cat ~/.arangodb/github-token) \
 		-v "$(ROOTDIR)":/usr/local/src/your-app \
-		ferrarimarco/github-changelog-generator \
+		ferrarimarco/github-changelog-generator:1.14.3 \
 		--user arangodb \
 		--project kube-arangodb \
 		--no-author
diff --git a/tools/release/release.go b/tools/release/release.go
index 9ece3e682..c4f47e689 100644
--- a/tools/release/release.go
+++ b/tools/release/release.go
@@ -78,8 +78,8 @@ func main() {
 	createSHA256Sums()
 	gitCommitAll(fmt.Sprintf("Updated manifest to %s", version)) // Commit manifest
 	gitTag(version)
-	//make("changelog", nil)
-	//gitCommitAll(fmt.Sprintf("Updated changelog for %s", version)) // Commit CHANGELOG.md
+	make("changelog", nil)
+	gitCommitAll(fmt.Sprintf("Updated changelog for %s", version)) // Commit CHANGELOG.md
 	githubCreateRelease(version)
 	bumpVersion("devel")
 }