diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cd6dd464..50c6cbcd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,31 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.36.0] - 2025-06-29
+
 ### Added
 
 - Add URI evidence type
+- Add link dialog for measure evidences
+- Add default security header to API
+- Add support for extra header
+
+### Fixed
+
+- Fix tasks deadline
+- Fix order people by kind
+- Fix missing people role order
+
+### Security
+
+- Remove all data after logout
+- Enforce maximum password limit
+- Mitigate timing attack on signin
+
+### Changed
+
+- Use httplogger on GraphQL error
+- Returns internal error when error is known
 
 ## [0.35.0] - 2025-06-20
 
diff --git a/GNUmakefile b/GNUmakefile
index f156e7006..e39fd4ab2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,7 +9,7 @@ DOCKER_BUILD=	DOCKER_BUILDKIT=1 $(DOCKER) build $(DOCKER_BUILD_FLAGS)
 
 DOCKER_COMPOSE=	$(DOCKER) compose -f compose.yaml $(DOCKER_COMPOSE_FLAGS)
 
-VERSION=	0.35.0
+VERSION=	0.36.0
 LDFLAGS=	-ldflags "-X 'main.version=$(VERSION)' -X 'main.env=prod'"
 GCFLAGS=	-gcflags="-e"