diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index de0865099..5d623074d 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,5 +1,3 @@
 Pkg.UserSrc=false
-// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now.
-//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=23.0.0 rc4
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
 
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 6177214c8..e846b1c00 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,4 +1,2 @@
 Pkg.UserSrc=false
-// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now.
-//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=23.0.0 rc5
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 09d123d2b..86d67c21f 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -1,8 +1,8 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
-Platform.CodeName=MNC
-Pkg.Revision=3
+Platform.CodeName=
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=15
diff --git a/sdk/source_source.prop_template b/sdk/source_source.prop_template
index 3d4fac528..d3cdfd5ee 100644
--- a/sdk/source_source.prop_template
+++ b/sdk/source_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
-Pkg.Revision=3
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}