diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index 4954cf574..ee4cfaba2 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -22,8 +22,8 @@ java_library_host {
     manifest: "SignApk.mf",
     static_libs: [
         "apksig",
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
         "conscrypt",
     ],
 
diff --git a/tools/signtos/Android.bp b/tools/signtos/Android.bp
index b26631f1e..688e7b8e7 100644
--- a/tools/signtos/Android.bp
+++ b/tools/signtos/Android.bp
@@ -21,7 +21,7 @@ java_library_host {
     srcs: ["SignTos.java"],
     manifest: "SignTos.mf",
     static_libs: [
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
     ],
 }