diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd09842c8..b987c2c59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,22 @@
 
 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).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [v21.10.2] - 2021-09-25
+### Added
+- sample templates for products (PDF, HTML, TXT, MISP)
+
+### Changed
+- multiple usability fixes across the product
 
-## [1.0.0] - 2021-09-25
+## [v21.10.1] - 2021-09-25
 ### Added
-- Initial release of TaranisNG
+- Initial release of Taranis NG
 
 ### Changed
-- Merged multiple TaranisNG repositories into one for easier understanding and management of the project
+- Merged multiple Taranis NG repositories into one for easier understanding and management of the project
 
 
-[1.0.0]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v1.0.0
\ No newline at end of file
+[v21.10.2]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.2
+[v21.10.1]: https://github.com/SK-CERT/Taranis-NG/releases/tag/v21.10.1
diff --git a/VERSION.md b/VERSION.md
index 60453e690..d093f04eb 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-v1.0.0
\ No newline at end of file
+v21.10.2
diff --git a/docker/.env b/docker/.env
index 45a65bdc2..2a4b3a04a 100644
--- a/docker/.env
+++ b/docker/.env
@@ -13,4 +13,4 @@ CPE_UPDATE_FILE=/data/cpe_dictionary.xml
 # Versions
 REDIS_TAG=6-alpine
 POSTGRES_TAG=13-alpine
-TARANIS_NG_TAG=v21.10.1
+TARANIS_NG_TAG=v21.10.2