diff --git a/libwvdrmengine/apex/nonupdatable/Android.bp b/libwvdrmengine/apex/nonupdatable/Android.bp
new file mode 100644
index 00000000..63195a4e
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/Android.bp
@@ -0,0 +1,47 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "vendor_widevine_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["vendor_widevine_license"],
+}
+
+soong_config_module_type {
+    name: "widevine_nonupdatable_cert_override",
+    module_type: "override_apex",
+    config_namespace: "widevine",
+    bool_variables: ["use_devkey"],
+    properties: ["certificate"],
+}
+
+widevine_nonupdatable_cert_override {
+    name: "com.google.android.widevine.nonupdatable",
+    base: "com.google.android.widevine",
+    package_name: "com.google.android.widevine.nonupdatable",
+    certificate: ":com.google.android.widevine.nonupdatable.certificate",
+    soong_config_variables: {
+        use_devkey: {
+            certificate: ":com_google_android_widevine_nonupdatable-container",
+        },
+    },
+}
+
+android_app_certificate {
+    name: "com.google.android.widevine.nonupdatable.certificate",
+    certificate: "com.google.android.widevine.nonupdatable",
+}
\ No newline at end of file
diff --git a/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8 b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8
new file mode 100644
index 00000000..2029e2cf
Binary files /dev/null and b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8 differ
diff --git a/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem
new file mode 100644
index 00000000..cd96726c
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFbTCCA1WgAwIBAgIUCt0Lcn+Z6NC4i3mu49uFE5ZMDtEwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yMzAxMzEwMjA1MzFaGA80NzYw
+MTIyNzAyMDUzMVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAJ+9tUEe/zWrsnODHKchUiOtkLhLL2izvz29hu46
+7oAyGhhpB6BRBaOBU66+b7P8yhth76uiAVKld3byxohLFTjFhdZHwBiFMSOnflJy
+71XS+uvjs7CEKNPBFouv6gtGcpDosSVAnYBEfbgWBeLKl1UKq79EOyWzNUp5+tfn
+fITxuzjdTQy8y6APVfxj2YNvQ5sDWLj1M1Gx+fSdX4UszP6j0HToEIlzgFzwrwLW
+u2YqjdEBGlj6kT+SbO6jTzx8aHMxq7iMMZna7unzb1Sa+VJv2Kg4GWHHFbTg431T
+XcWYV13+tG94WbHHcvUI3KZap1oRX7bEQYJhnwaxL1rHwBQnk16d9tHYMjhQKkkS
+TGJU01sfyOnwC07Kp/kFcXF5fuUGmxvqDd3gsTq80Bm1rTo2MMIII3Gh4nwF3rrR
+T7ZbNGIjxnhqFtmCsXUB7WoUdSAn3IsqSKabXij22zFuBSa1AOSBiXcYTOpjxaCR
+ihenO6UdgnVLgVpBpP5IMFyZ35EDEB0C1IeRlYGtteuiVk/8IiV9R//MObN9tZbw
+0UftMYdtZUUNLpwx2tIJeAwkBsh2S2CQzDvdWhRz1AETCqdu9HJP7RDOu3UoJ0t8
+MJryOzrC4YaOW7mcNFfBj7AiBW0DKJd9yhc+KawWlRuLduSXAB0R/OQU8rKqnDDA
+LvlPAgMBAAGjUzBRMB0GA1UdDgQWBBRcyifNYScCJxFLTJx3R//ITVPUVjAfBgNV
+HSMEGDAWgBRcyifNYScCJxFLTJx3R//ITVPUVjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQCU6I5RaBFpiDcQzoYl0sI9h/8C01HdNwSfPmJzLw9P
+ICRie/j6ZRH+tKwpEE8jloXod2/YlJbQ4e8Ogl5CfJVo5eqKgNu7mYExrzLg434N
+7G7Xv+DqhyMoLhFwpZqdw02iSBQ+Sp6O7FC7qYEz8XpzP6Hp4f0wsrAUImSCHODd
+K8NhQtIHwNiIucKalkKGlBrxIa9Ue3YZqXJvMsKTs8BiAIyxRbs+pLsp7z0E/7J5
+LoxgiJ6HVRLx6qTSTiZQhbdmO/Rv/qGkeQxOXWWK+O893W6XebRFp5c4XaaKWFsI
+T411Odn8FgCrhCXiiD7dX5usVmEzdyqBBOVv5eKveWY0cHALMo5e72wJcXwdD6qc
+aLwRCV4HwLll40U8E3jMfb2ZB25knzCPekTQuMyF9JH6dZPVkgxvNTPFB0rkH1NM
+Ja4nm9gYa8GqbHKDgpO4zU9UfPAdtrRkLl/UrAJLzfkw2NxlXeTWPKKVo/pidImb
+LGlCqm0vP5NYMDJSyKxdru5iq/wsrj0YC7RqXmBPDexSo6MvQHLV6GgP7HiP/9p4
+egBIJ70YlmWdlCmdqPFjFpV792HT4W6Qj5nrnaHoFdwitG+vbnUaaX+Q9PpdSvbA
+lO1g0EU1oQIar09sog5fQcLWXQRpUEb42WeD/qkZ5V8j11moVT+ToBaCV/9P9jF4
+Yw==
+-----END CERTIFICATE-----
diff --git a/libwvdrmengine/apex/nonupdatable/device.mk b/libwvdrmengine/apex/nonupdatable/device.mk
new file mode 100644
index 00000000..018fa836
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/device.mk
@@ -0,0 +1,10 @@
+PRODUCT_PACKAGES += \
+	com.google.android.widevine.nonupdatable \
+
+# Check if we can use dev keys
+ifneq ($(wildcard vendor/google/dev-keystore),)
+$(call soong_config_set,widevine,use_devkey,true)
+endif
+
+PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
+	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file