diff --git a/userspace/files/78-modem-diag.rules b/userspace/files/78-modem-diag.rules
new file mode 100644
index 0000000..d90b7d4
--- /dev/null
+++ b/userspace/files/78-modem-diag.rules
@@ -0,0 +1,7 @@
+# EG25 GNSS
+KERNEL=="ttyUSB0",ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# C16
+KERNEL=="ttyACM1",ENV{ID_MM_DEVICE_IGNORE}="1"
+KERNEL=="ttyACM0",ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+KERNEL=="ttyACM2",ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
diff --git a/userspace/files/99-modem-diag.rules b/userspace/files/99-modem-diag.rules
deleted file mode 100644
index 0441812..0000000
--- a/userspace/files/99-modem-diag.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="ttyUSB0",ENV{ID_MM_DEVICE_IGNORE}="1"