diff --git a/device.mk b/device.mk
index 8b3e4e19..9e914c64 100644
--- a/device.mk
+++ b/device.mk
@@ -71,6 +71,9 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-emergency=DEBUG
 PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-mms=DEBUG
 PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-xcap=DEBUG
 PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG
+
+# Modem userdebug
+include device/google/gs101/modem/userdebug.mk
 endif
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/factory_common.mk b/factory_common.mk
index ecd1232d..391fa54b 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -73,4 +73,7 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
 
 # PixelLogger for RF testing
 PRODUCT_PACKAGES_DEBUG += \
-    PixelLogger \
+    PixelLogger
+
+# Modem userdebug
+include device/google/gs101/modem/userdebug.mk
diff --git a/modem/userdebug.mk b/modem/userdebug.mk
new file mode 100644
index 00000000..87697a75
--- /dev/null
+++ b/modem/userdebug.mk
@@ -0,0 +1,2 @@
+PRODUCT_PACKAGES += vcd
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/userdebug/