diff --git a/android/config.go b/android/config.go
index cbc6fcd72..6b7898615 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1056,7 +1056,7 @@ func (c *config) BuildKeys() string {
 	if defaultCert == "" || defaultCert == filepath.Join(testKeyDir, "testkey") {
 		return "test-keys"
 	}
-	return "dev-keys"
+	return "release-keys"
 }
 
 func (c *config) ApexKeyDir(ctx ModuleContext) SourcePath {
diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index 56e1188b3..244fe4622 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -43,7 +43,7 @@ def get_build_keys(product_config):
   default_cert = product_config.get("DefaultAppCertificate", "")
   if default_cert == "" or default_cert == os.path.join(TEST_KEY_DIR, "testKey"):
     return "test-keys"
-  return "dev-keys"
+  return "release-keys"
 
 def parse_args():
   """Parse commandline arguments."""