diff --git a/device-oriole.mk b/device-oriole.mk
index a59b2ed..b38f140 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -159,8 +159,11 @@
 	android.hardware.nfc-service.st \
 	NfcOverlayOriole
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 0b63ac5..49ff1e0 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -164,8 +164,11 @@
 	android.hardware.nfc-service.st \
 	NfcOverlayRaven
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-slider.mk b/device-slider.mk
index 5e90e1a..f47ab65 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -95,8 +95,11 @@
 	Tag \
 	android.hardware.nfc-service.st
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 94938f6..41a969c 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -91,8 +91,11 @@
 	Tag \
 	android.hardware.nfc-service.st
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin