diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1460c5c9..ec754bf80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ 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.6.0-rc.0] - Unreleased
+
 ## [0.6.0-beta.1] - 2024-02-28
 
 ### Added
diff --git a/version.cmake b/version.cmake
index 107469da9..8d15ce2c4 100644
--- a/version.cmake
+++ b/version.cmake
@@ -18,5 +18,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
 #
 
-set(ATOMVM_BASE_VERSION "0.6.0-beta.1")
-set(ATOMVM_DEV FALSE)
+set(ATOMVM_BASE_VERSION "0.6.0-rc.0")
+set(ATOMVM_DEV TRUE)