diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddaf607e7586d27099da61004dd1f911569d5b91..0d94ff5f6d730050d2b3925f8bad96df01de01eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,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.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+### Documentation
+
 ## [0.8.1] - 2022-11-07
 (Timm Fitschen)
 
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index fff7dac583213ca4d1b79c68dbd66cdee83ed78b..58484d51565a87d98929a37e842c7040fc08cabf 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -43,5 +43,5 @@ guidelines of the CaosDB Project
     ```md
 # Changelog
 
-[See full changelog](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/v0.7.3/CHANGELOG.md)
+[See full changelog](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/${TAG}/CHANGELOG.md)
     ```
diff --git a/pom.xml b/pom.xml
index bf7e8c795a447e76de06a413a14efde55badf5eb..c76d397b8fc1e655f1cf0fbf675e3b549eea876a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.8.1</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>
diff --git a/src/doc/conf.py b/src/doc/conf.py
index 315c47a024cc0db50870256c2ccdd0cde2a22a81..02576662d8d15acec8d5cacef2126e6b0102339b 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -25,9 +25,9 @@ copyright = '2022, IndiScale GmbH'
 author = 'Daniel Hornung, Timm Fitschen'
 
 # The short X.Y version
-version = '0.8.1'
+version = '0.9.0'
 # The full version, including alpha/beta/rc tags
-release = '0.8.1'
+release = '0.9.0-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------