diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1e9305b..9751f26 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,6 +40,9 @@
 
 #############################################################
 
+# DRM
+TARGET_ENABLE_MEDIADRM_64 := true
+
 # Kernel
 ifeq ($(TARGET_BUILD_VARIANT),eng)
     TARGET_KERNEL_CONFIG := axolotl_eng_defconfig
diff --git a/axolotl.mk b/axolotl.mk
index 29c302b..bf56aab 100644
--- a/axolotl.mk
+++ b/axolotl.mk
@@ -18,10 +18,7 @@
 # Build super partition
 PRODUCT_BUILD_SUPER_PARTITION := true
 
-# Widevine
-PRODUCT_PACKAGES += \
-    android.hardware.drm@1.4-service.widevine \
-
-PRODUCT_PACKAGES += \
-    libwvdrmengine \
-    libwvhidl \
+# DRM - Widevine
+ifeq ($(WITH_GMS_MAINLINE),true)
+include vendor/widevine/service.mk
+endif