diff --git a/changelog/unreleased/align-service-naming.md b/changelog/2.0.0_2022-05-10/align-service-naming.md
similarity index 100%
rename from changelog/unreleased/align-service-naming.md
rename to changelog/2.0.0_2022-05-10/align-service-naming.md
diff --git a/changelog/unreleased/bump-ocis-package-v2.md b/changelog/2.0.0_2022-05-10/bump-ocis-package-v2.md
similarity index 100%
rename from changelog/unreleased/bump-ocis-package-v2.md
rename to changelog/2.0.0_2022-05-10/bump-ocis-package-v2.md
diff --git a/changelog/unreleased/change-load-config-from-only-one-dir.md b/changelog/2.0.0_2022-05-10/change-load-config-from-only-one-dir.md
similarity index 100%
rename from changelog/unreleased/change-load-config-from-only-one-dir.md
rename to changelog/2.0.0_2022-05-10/change-load-config-from-only-one-dir.md
diff --git a/changelog/unreleased/change-ocis-docker-volume-permissions.md b/changelog/2.0.0_2022-05-10/change-ocis-docker-volume-permissions.md
similarity index 100%
rename from changelog/unreleased/change-ocis-docker-volume-permissions.md
rename to changelog/2.0.0_2022-05-10/change-ocis-docker-volume-permissions.md
diff --git a/changelog/unreleased/change-ocis-init.md b/changelog/2.0.0_2022-05-10/change-ocis-init.md
similarity index 100%
rename from changelog/unreleased/change-ocis-init.md
rename to changelog/2.0.0_2022-05-10/change-ocis-init.md
diff --git a/changelog/unreleased/change-remove-runtime-kill-run-commands.md b/changelog/2.0.0_2022-05-10/change-remove-runtime-kill-run-commands.md
similarity index 100%
rename from changelog/unreleased/change-remove-runtime-kill-run-commands.md
rename to changelog/2.0.0_2022-05-10/change-remove-runtime-kill-run-commands.md
diff --git a/changelog/unreleased/deleteSpacePermissions.md b/changelog/2.0.0_2022-05-10/deleteSpacePermissions.md
similarity index 100%
rename from changelog/unreleased/deleteSpacePermissions.md
rename to changelog/2.0.0_2022-05-10/deleteSpacePermissions.md
diff --git a/changelog/unreleased/fix-configure-idp-secrets-env.md b/changelog/2.0.0_2022-05-10/fix-configure-idp-secrets-env.md
similarity index 100%
rename from changelog/unreleased/fix-configure-idp-secrets-env.md
rename to changelog/2.0.0_2022-05-10/fix-configure-idp-secrets-env.md
diff --git a/changelog/unreleased/fix-thumbnails-dav.md b/changelog/2.0.0_2022-05-10/fix-thumbnails-dav.md
similarity index 100%
rename from changelog/unreleased/fix-thumbnails-dav.md
rename to changelog/2.0.0_2022-05-10/fix-thumbnails-dav.md
diff --git a/changelog/unreleased/graph-me-drives.md b/changelog/2.0.0_2022-05-10/graph-me-drives.md
similarity index 100%
rename from changelog/unreleased/graph-me-drives.md
rename to changelog/2.0.0_2022-05-10/graph-me-drives.md
diff --git a/changelog/unreleased/idp-cert-wait.md b/changelog/2.0.0_2022-05-10/idp-cert-wait.md
similarity index 100%
rename from changelog/unreleased/idp-cert-wait.md
rename to changelog/2.0.0_2022-05-10/idp-cert-wait.md
diff --git a/changelog/unreleased/libregraph-idm-switch.md b/changelog/2.0.0_2022-05-10/libregraph-idm-switch.md
similarity index 100%
rename from changelog/unreleased/libregraph-idm-switch.md
rename to changelog/2.0.0_2022-05-10/libregraph-idm-switch.md
diff --git a/changelog/unreleased/metadata-gateway.md b/changelog/2.0.0_2022-05-10/metadata-gateway.md
similarity index 100%
rename from changelog/unreleased/metadata-gateway.md
rename to changelog/2.0.0_2022-05-10/metadata-gateway.md
diff --git a/changelog/unreleased/metadatauserid-systemuserid.md b/changelog/2.0.0_2022-05-10/metadatauserid-systemuserid.md
similarity index 100%
rename from changelog/unreleased/metadatauserid-systemuserid.md
rename to changelog/2.0.0_2022-05-10/metadatauserid-systemuserid.md
diff --git a/changelog/unreleased/new-space-id-functions.md b/changelog/2.0.0_2022-05-10/new-space-id-functions.md
similarity index 100%
rename from changelog/unreleased/new-space-id-functions.md
rename to changelog/2.0.0_2022-05-10/new-space-id-functions.md
diff --git a/changelog/unreleased/ocs-cs3-fatal.md b/changelog/2.0.0_2022-05-10/ocs-cs3-fatal.md
similarity index 100%
rename from changelog/unreleased/ocs-cs3-fatal.md
rename to changelog/2.0.0_2022-05-10/ocs-cs3-fatal.md
diff --git a/changelog/unreleased/ocs-version-product-field.md b/changelog/2.0.0_2022-05-10/ocs-version-product-field.md
similarity index 100%
rename from changelog/unreleased/ocs-version-product-field.md
rename to changelog/2.0.0_2022-05-10/ocs-version-product-field.md
diff --git a/changelog/unreleased/search-extension.md b/changelog/2.0.0_2022-05-10/search-extension.md
similarity index 100%
rename from changelog/unreleased/search-extension.md
rename to changelog/2.0.0_2022-05-10/search-extension.md
diff --git a/changelog/unreleased/serviceUser-systemUser.md b/changelog/2.0.0_2022-05-10/serviceUser-systemUser.md
similarity index 100%
rename from changelog/unreleased/serviceUser-systemUser.md
rename to changelog/2.0.0_2022-05-10/serviceUser-systemUser.md
diff --git a/changelog/unreleased/single-file-edit.md b/changelog/2.0.0_2022-05-10/single-file-edit.md
similarity index 100%
rename from changelog/unreleased/single-file-edit.md
rename to changelog/2.0.0_2022-05-10/single-file-edit.md
diff --git a/changelog/unreleased/spaces-capabilities.md b/changelog/2.0.0_2022-05-10/spaces-capabilities.md
similarity index 100%
rename from changelog/unreleased/spaces-capabilities.md
rename to changelog/2.0.0_2022-05-10/spaces-capabilities.md
diff --git a/changelog/unreleased/split-machineauth-and-systemuserauth.md b/changelog/2.0.0_2022-05-10/split-machineauth-and-systemuserauth.md
similarity index 100%
rename from changelog/unreleased/split-machineauth-and-systemuserauth.md
rename to changelog/2.0.0_2022-05-10/split-machineauth-and-systemuserauth.md
diff --git a/changelog/unreleased/update-linkshare-capabilities.md b/changelog/2.0.0_2022-05-10/update-linkshare-capabilities.md
similarity index 100%
rename from changelog/unreleased/update-linkshare-capabilities.md
rename to changelog/2.0.0_2022-05-10/update-linkshare-capabilities.md
diff --git a/changelog/unreleased/update-reva.md b/changelog/2.0.0_2022-05-10/update-reva.md
similarity index 100%
rename from changelog/unreleased/update-reva.md
rename to changelog/2.0.0_2022-05-10/update-reva.md
diff --git a/changelog/unreleased/update-web-5.5.0.md b/changelog/2.0.0_2022-05-10/update-web-5.5.0.md
similarity index 100%
rename from changelog/unreleased/update-web-5.5.0.md
rename to changelog/2.0.0_2022-05-10/update-web-5.5.0.md
diff --git a/changelog/unreleased/urlencoding-graph-api.md b/changelog/2.0.0_2022-05-10/urlencoding-graph-api.md
similarity index 100%
rename from changelog/unreleased/urlencoding-graph-api.md
rename to changelog/2.0.0_2022-05-10/urlencoding-graph-api.md
diff --git a/changelog/CHANGELOG.tmpl b/changelog/CHANGELOG.tmpl
index 88783f246df..c95ccf876e3 100644
--- a/changelog/CHANGELOG.tmpl
+++ b/changelog/CHANGELOG.tmpl
@@ -1,19 +1,24 @@
 {{ $allVersions := . }}
 {{- range $index, $changes := . }}{{ with $changes -}}
+{{ $version := .Version -}}
+{{/* ocis beta program */ -}}
+{{ if eq .Version "2.0.0" -}}
+{{ $version = (printf  "%v-%v" $version "beta1") -}}
+{{ end -}}
 {{ if gt (len $allVersions) 1 -}}
-# Changelog for [{{ .Version }}] ({{ .Date }})
+# Changelog for [{{ $version }}] ({{ .Date }})
 
-The following sections list the changes for {{ .Version }}.
+The following sections list the changes for {{ $version }}.
 
 {{/* creating version compare links */ -}}
 {{ $next := add1 $index -}}
 {{ if ne (len $allVersions) $next -}}
 {{ $previousVersion := (index $allVersions $next).Version -}}
 {{ if eq .Version "unreleased" -}}
-[{{ .Version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...master
+[{{ $version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...master
 
 {{ else -}}
-[{{ .Version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...v{{ .Version }}
+[{{ $version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...v{{ $version }}
 
 {{ end -}}
 {{ end -}}
@@ -24,7 +29,7 @@ The following sections list the changes for {{ .Version }}.
 
 {{ end -}}
 {{ else -}}
-# Changes in {{ .Version }}
+# Changes in {{ $version }}
 
 {{ end -}}
 
diff --git a/sonar-project.properties b/sonar-project.properties
index cb6e40fd93a..bac73e84511 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
 sonar.projectKey=owncloud_ocis
 sonar.organization=owncloud-1
 sonar.projectName=ocis
-sonar.projectVersion=1.20.0
+sonar.projectVersion=2.0.0-beta1
 sonar.host.url=https://sonarcloud.io
 
 # =====================================================