diff --git a/keystore/Android.bp b/keystore/Android.bp
index 7e91c72..8addecd 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -73,7 +73,6 @@
 cc_binary {
     name: "keystore_cli",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
@@ -92,7 +91,6 @@
 cc_binary {
     name: "keystore_cli_v2",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     cflags: [
         "-DKEYMASTER_NAME_TAGS",