diff --git a/libwvdrmengine/apex/Android.bp b/libwvdrmengine/apex/Android.bp
index 84ae897a..e91c5ad7 100644
--- a/libwvdrmengine/apex/Android.bp
+++ b/libwvdrmengine/apex/Android.bp
@@ -39,24 +39,43 @@ widevine_apex_defaults {
     },
 }
 
+soong_config_module_type {
+    name: "widevine_key_apex_defaults",
+    module_type: "apex_defaults",
+    config_namespace: "widevine",
+    bool_variables: ["use_devkey"],
+    properties: ["key", "certificate"],
+}
+
+widevine_key_apex_defaults {
+    name: "com.google.android.widevine-key-defaults",
+    key: "com.google.android.widevine.key",
+    certificate: ":com.google.android.widevine.certificate",
+    soong_config_variables: {
+        use_devkey: {
+            key: "com_google_android_widevine-image.key",
+            certificate: ":com_google_android_widevine-container",
+        },
+    },
+}
+
 apex {
     name: "com.google.android.widevine",
     vendor: true,
     manifest: "apex_manifest.json",
     prebuilts: [
-      "com.google.android.widevine.rc",
-      "widevine-linker-config",
+        "com.google.android.widevine.rc",
+        "widevine-linker-config",
     ],
     defaults: [
-      "com.google.android.widevine-defaults",
+        "com.google.android.widevine-defaults",
+        "com.google.android.widevine-key-defaults",
     ],
     binaries: ["android.hardware.drm-service.widevine"],
     // TODO(b/239054171) embed vintf_fragment in the apex.
     vintf_fragments: ["com.google.android.widevine.xml"],
     file_contexts: "file_contexts",
     use_vndk_as_stable: true,
-    key: "com.google.android.widevine.key",
-    certificate: ":com.google.android.widevine.certificate",
     updatable: false,
 
     // install sysconfig to allow the apex to be updatable