diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15ba95cf..4945a3d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 4.35.4 - 2020-05-29
 ### Changed
 - Changed default parameter `compute.elb_cipher_suite` to `AOCELBSecurityPolicy-TLS-1-2-2017-01`
 - Disable TLS 1.0 & TLS 1.1 support for Author-Dispatcher, Publish-Dispatcher & Author ELB
diff --git a/Makefile b/Makefile
index 7cf1deba..e88e1081 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-version ?= 4.35.4-pre.0
+version ?= 4.35.4
 aem_stack_manager_messenger_version = 2.11.0
 aem_test_suite_version = 1.15.0
 aem_helloworld_custom_stack_provisioner_version = 0.14.0