diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e6ed23ef..91953b04a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [v2.3.0] :rocket:
+
+Overhauled app settings. Introduced onboarding/app intro.
+
+### Added
+
+- app intro
+  - added new app intro screen
+  - added new onboarding manager
+  - the onboarding manager will render either the navigator or the app intro depending on the completion state of the app intro
+- added a new NestedInfo screen to display lists of navigation links beneath a html content
+  - this allows for an easy implementation of a nested information structure for e.g. help sections
+- added option to filter POIs by opening times/open status
+
+### Changed
+
+- upgraded expo to version 43
+- settings
+  - the settings moved from inside of favourites to the drawer and the about screen
+  - settings now have multiple tabs: one for general settings and one for visual settings
+  - location settings now allow setting an alternate position that is used when the locations services are turned off
+- improved useStaticContent hook
+- refactored About/AboutScreen to reduce code redundancy
+- there can now be a notice for set for data providers, which will be displayed for e.g. POIs that they are providing
+
 ## [v2.2.0] :rocket:
 
 This version brings the new encounter feature.
diff --git a/README.md b/README.md
index 0bb24210f..9285fa9e4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Smart Village App - Mobile App
 
-![Project version](https://img.shields.io/badge/version-2.2.0-informational.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/ee77a5fd8990be0158c1/maintainability)](https://codeclimate.com/github/ikuseiGmbH/smart-village-app-app/maintainability) ![Node version](https://img.shields.io/badge/node-14.3.0-informational.svg) ![Yarn version](https://img.shields.io/badge/yarn-1.22.4-informational.svg) ![Expo version](https://img.shields.io/badge/expo-42.0.0-informational.svg)
+![Project version](https://img.shields.io/badge/version-2.3.0-informational.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/ee77a5fd8990be0158c1/maintainability)](https://codeclimate.com/github/ikuseiGmbH/smart-village-app-app/maintainability) ![Node version](https://img.shields.io/badge/node-14.3.0-informational.svg) ![Yarn version](https://img.shields.io/badge/yarn-1.22.4-informational.svg) ![Expo version](https://img.shields.io/badge/expo-42.0.0-informational.svg)
 
 The Smart Village App is a open source mobile app for villages, communities and counties. It is made with React Native for Android and iOS.
 
@@ -52,4 +52,4 @@ Have a look at the [changelog](./CHANGELOG.md) to be up to date with the develop
 
 ---
 
-###### Version: 2.2.0
+###### Version: 2.3.0
diff --git a/app.json b/app.json
index 9ac598c2c..8e588ae02 100644
--- a/app.json
+++ b/app.json
@@ -9,7 +9,7 @@
       "ios",
       "android"
     ],
-    "version": "2.2.0",
+    "version": "2.3.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "scheme": "smart-village-app",