diff --git a/manifests/default.xml b/manifests/default.xml
index 9befdfeab81530591a51ca03e298ff741e29e507..c885cbaaba3c1b8b92f488950a18913e730be6e7 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -54,12 +54,12 @@ SPDX-FileCopyrightText: Huawei Inc.
 		likely to a git tag in the repository.
 	-->
 
-	<project name="oniro-core/oniro.git" remote="eclipse" revision="kirkstone" path="oniro">
+	<project name="oniro-core/oniro.git" remote="eclipse" revision="refs/tags/v2.0.0" path="oniro">
 		<linkfile src="README.md" dest="README.md"/>
 	</project>
-	<project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" />
-	<project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" />
-	<project name="oniro-core/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ledge-secure" />
-	<project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ts" />
-	<project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
+	<project name="oniro-core/meta-clang.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-clang" />
+	<project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-zephyr" />
+	<project name="oniro-core/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-ledge-secure" />
+	<project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-ts" />
+	<project name="oniro-core/docs.git" remote="eclipse" revision="refs/tags/v2.0.0" path="docs" />
 </manifest>
diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf
index d77ca139705cba71f478a3103daaba6763c1b43d..0eedd28d47af27a0ecf6e19f5c4b6cf5706605ab 100644
--- a/meta-oniro-core/conf/distro/oniro-freertos.conf
+++ b/meta-oniro-core/conf/distro/oniro-freertos.conf
@@ -6,4 +6,4 @@ require conf/distro/freertos.conf
 require conf/distro/include/oniro.inc
 
 ONIRO_FLAVOUR_PRETTY = "FreeRTOS"
-DISTRO_VERSION = "2.0.0-beta"
+DISTRO_VERSION = "2.0.0"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 9be326fac6a8c7ff961cbe997143971ca8ccdc08..7aaf9843d4b0eb5d0fc66615c886e732a35b6653 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: MIT
 
 ONIRO_FLAVOUR_PRETTY = "Linux"
-DISTRO_VERSION = "2.0.0-beta"
-DISTRO_CODENAME = "dev"
+DISTRO_VERSION = "2.0.0"
+DISTRO_CODENAME = "2.0.0"
 SDK_VENDOR = "-onirosdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"
 
diff --git a/meta-oniro-core/conf/distro/oniro-zephyr.conf b/meta-oniro-core/conf/distro/oniro-zephyr.conf
index 661d1a22408f80317b94789976963639ca1c2bc4..de8381e61b8d1992334d38bd324edad1b2a9dd09 100644
--- a/meta-oniro-core/conf/distro/oniro-zephyr.conf
+++ b/meta-oniro-core/conf/distro/oniro-zephyr.conf
@@ -6,4 +6,4 @@ require conf/distro/include/oniro.inc
 require conf/distro/zephyr.conf
 
 ONIRO_FLAVOUR_PRETTY = "Zephyr"
-DISTRO_VERSION = "2.0.0-beta"
+DISTRO_VERSION = "2.0.0"
diff --git a/scripts/upgrade_oniro/upgrade_oniro.py b/scripts/upgrade_oniro/upgrade_oniro.py
index 4149781ad0a78549460b33180eff7df5ad2d5ffa..9ebb6f9bbd95597e7cd4fb5a14d72c4bd87a90d4 100755
--- a/scripts/upgrade_oniro/upgrade_oniro.py
+++ b/scripts/upgrade_oniro/upgrade_oniro.py
@@ -102,6 +102,7 @@ def init_script_options():
         "v2.0.0-alpha",
         "v2.0.0-alpha2",
         "v2.0.0-beta",
+        "v2.0.0",
         "kirkstone",
     ]