diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 5d623074d..fe505730a 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,3 +1,5 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+// due to the codename this resolve to 20 instead of 21, so replace it with hardcoded version for now.
+//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+Pkg.Revision=21.0.0 rc1
 
diff --git a/sdk/support_source.prop_template b/sdk/support_source.prop_template
index ba7e6fb1a..f5b217eec 100644
--- a/sdk/support_source.prop_template
+++ b/sdk/support_source.prop_template
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
 Extra.Vendor=android
 Extra.VendorId=android
 Extra.VendorDisplay=Android