diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index b3c9df014..39a41c455 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
 #Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.0 rc4
+Pkg.Revision=24.0.0
 
diff --git a/sdk/doc_source.prop_template b/sdk/doc_source.prop_template
index d3cdfd5ee..21228cc0a 100644
--- a/sdk/doc_source.prop_template
+++ b/sdk/doc_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
 Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
-AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
+#AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 7917136a5..ecc86cbe1 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
 #Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.0 rc3
+Pkg.Revision=24.0.0
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 03548fb19..530324627 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,9 +2,9 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
-AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
+#AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=16
 Layoutlib.Revision=2
 Platform.MinToolsRev=22
diff --git a/sdk/source_source.prop_template b/sdk/source_source.prop_template
index d3cdfd5ee..21228cc0a 100644
--- a/sdk/source_source.prop_template
+++ b/sdk/source_source.prop_template
@@ -1,4 +1,4 @@
 Pkg.UserSrc=false
 Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
-AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
+#AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}