diff --git a/.gitlab/issue_templates/release.md b/.gitlab/issue_templates/release.md
index 02c76bc791398a5ce7beee03882eb5e270ec15e6..133154c308630349d6c72b07270d6c3cf71545d5 100644
--- a/.gitlab/issue_templates/release.md
+++ b/.gitlab/issue_templates/release.md
@@ -16,7 +16,7 @@ Make these changes in the master branch before releasing:
 
 ## In the release merge request
 
-* [ ] update [CHANGELOG.md](https://keepachangelog.com/en/1.0.0/)
+* [ ] update [CHANGELOG.md](https://keepachangelog.com)
   * [ ] Include `Known issues`
 * [ ] Update the version number in the `VERSION` file
 * [ ] Commit (signed)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index defb8bf78b3c431c6a1d26e4a45cd94c8f659cf6..e957710fdb45f6f2e6ef4832b688209951e5c5fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,50 @@
 # Changelog
+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).
 
-## [0.7.0] - Unreleased
+## [Unreleased]
 
-* **BREAKING**: the `oas-secrets` helm chart has been removed. Because of this
-  `flux` will remove your existing secrets when you change the tracking branch
-  from `v0.6` to `v0.7`. Follow our [upgrade
-  guide](https://docs.openappstack.net/en/latest/upgrading.html) to prevent data
-  loss
-* TODO INSERT MORE HERE
+* Nothing yet!
+
+## [0.7.0] - 2021-08-19
+
+### Removed
+
+* **BREAKING**: The `oas-secrets` helm chart has been removed (#891)
+  Because of this `flux` will remove your existing secrets when you change the
+  tracking branch from `v0.6` to `v0.7`.
+  Follow our [upgrade guide](https://docs.openappstack.net/en/latest/upgrading.html)
+  to prevent data loss!
+* Unused flux notification-controller (#840)
+
+### Changed
+
+* Docuementation overhaul (especially for installatation instructions)
+* Increase cpu limits for eventrouter (#920)
+* Increase mem limits for loki (#910)
+* Retry taiko CI test until success
+* Enable startupProbe for Nextcloud, remove initialDelaySeconds (#914)
+* Reduce loki retention to 8 days because it uses too much disk space
+* Update:
+  * Taiko to 1.2.6
+  * OAS Nextcloud chart to 0.3.2 (Nextcloud app to 20.0)
+  * Dockerfile packages
+* Pytest now tests cluster resources like deployments, statfulsets for readiness
+* Optimize taiko chrome instances for parallel runs (#854)
+
+### Added
+
+* Apps:
+  * Wekan 5.41 (chart 5.42)
+  * Nextcloud passwords 2021.7.23
+  * Nextcloud Calendar 2.3.12
+* Wekan, NC passwords and NC calendar to documentation
+
+### Fixed
+
+* Helm chart values overrdides (#873)
+* Prometheus CI test (#766)
 
 ## [0.6.0] - 2021-07-14
 
@@ -16,7 +53,7 @@
 * Option to use a container image mirror
 * .sourceignore file for flux
 * Eventrouter to aggregate k8s events in loki
-* Fine-tuned app resource limits
+* Fine-tune app resource limits
 * Configure outgoing mail for alertmanager
 * Code of conduct (CONTRIBUTING.md)
 * Contribution docs (CONTRIBUTING.md)
@@ -206,3 +243,14 @@ Known issues:
 ## [0.1.0] - 2019-07-31
 
 This is the version for the alpha test.
+
+[Unreleased]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.7.0...master
+[0.7.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.6.0...0.7.0
+[0.6.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.5.0...0.6.0
+[0.5.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.4.0...0.5.0
+[0.4.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.3.1...0.4.0
+[0.3.1]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.3.0...0.3.1
+[0.3.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.2.1...0.3.0
+[0.2.1]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.2.0...0.2.1
+[0.2.0]: https://open.greenhost.net/openappstack/openappstack/-/compare/0.1.0...0.2.0
+[0.1.0]: https://open.greenhost.net/openappstack/openappstack/-/commits/0.1.0
diff --git a/VERSION b/VERSION
index a918a2aa18d5bec6a8bb93891a7a63c243111796..faef31a4357c48d6e4c55e84c8be8e3bc9055e20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.0
+0.7.0