diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e2e3ac..924eafd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - New script `scripts/verify_env_vars.py` to verify environment variables
 - Deployment directory with documentation and configuration files for Serra Vine deployment
+- Automatic CHANGELOG.md update process in Makefile for releases
 
 ### Removed
 
 - Minio functionality has been completely removed from the project
+
+### Changed
+
+- Updated Makefile to automatically update CHANGELOG.md during the release process
diff --git a/makefile b/makefile
index 9b21760..643b1d9 100644
--- a/makefile
+++ b/makefile
@@ -36,8 +36,12 @@ release: documentation
 		echo "Local branch is ahead of origin"; \
 		exit 1; \
 	fi
-	@git tag v$$(python -m setuptools_scm --strip-dev)
-	@git push origin main --tags
+	@NEW_VERSION=$$(python -m setuptools_scm --strip-dev) && \
+	sed -i '' "s/\[Unreleased\]/[$${NEW_VERSION}] - $$(date +%Y-%m-%d)/" CHANGELOG.md && \
+	git add CHANGELOG.md && \
+	git commit -m "Update CHANGELOG.md for version $${NEW_VERSION}" && \
+	git tag v$${NEW_VERSION} && \
+	git push origin main --tags
 docker_image:
 	docker build -t ghcr.io/serraict/vine-floriday-adapter:$(VERSION) .
 docker_push: docker_image