diff --git a/.env b/.env
index aaf858a51..ffd1c8a4f 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
 COMPOSE_PROJECT_NAME=artemis
 DB_VERSION=22
 GUI_ENABLED=true
-SYSTEM_VERSION=latest
+SYSTEM_VERSION=release-1.6.0
 HISTORIC=false
 
 # Redis config
diff --git a/artemis-chart/templates/configmap.yaml b/artemis-chart/templates/configmap.yaml
index dd4859859..9f69f8ca9 100644
--- a/artemis-chart/templates/configmap.yaml
+++ b/artemis-chart/templates/configmap.yaml
@@ -6,7 +6,7 @@ metadata:
 {{ include "artemis.labels" . | indent 4 }}
 data:
   guiEnabled: {{ .Values.guiEnable | default "true" | quote }}
-  systemVersion: {{ .Values.systemVersion | default "latest" | quote }}
+  systemVersion: {{ .Values.systemVersion | default "release-1.6.0" | quote }}
   historic: {{ .Values.historic | default "false" | quote }}
   redisHost: {{ .Release.Name }}-{{ .Values.redisHost | default "backend" }}-svc
   redisPort: {{ .Values.redisPort | default "6379" | quote }}
diff --git a/artemis-chart/values.yaml b/artemis-chart/values.yaml
index d658d0be5..59c99d118 100644
--- a/artemis-chart/values.yaml
+++ b/artemis-chart/values.yaml
@@ -1,6 +1,6 @@
 # general
 guiEnabled: true
-systemVersion: latest
+systemVersion: release-1.6.0
 historic: false
 replicaCount: 1
 # redis
diff --git a/docs/changelog.md b/docs/changelog.md
index 4bfd62abf..802b86cbc 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -5,7 +5,26 @@ 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).
 
-## master (latest) - YYYY-MM-DD
+## [UNRELEASED] (latest) - YYYY-MM-DD
+### Added
+- TBD (Added a new feature)
+
+### Changed
+- TBD (Changed existing functionality)
+
+### Fixed
+- TBD (bug-fix)
+
+### Removed
+- TBD (removed a feature)
+
+### Deprecated
+- TBD (soon-to-be removed feature)
+
+### Security
+- TBD (addressing vulnerability)
+
+## [1.6.0] (Achilles) - 2020-11-02
 ### Added
 - Redirection to login page when session is expired (#404)
 - Support RADIUS integration for user authentication (#409)