diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug
index 9256c9e..e2adedc 100644
--- a/init.hardware.diag.rc.userdebug
+++ b/init.hardware.diag.rc.userdebug
@@ -14,6 +14,15 @@
 # limitations under the License.
 #
 
+on post-fs-data
+    # Modem logging collection
+    mkdir /data/diag_logs 0777 system system
+    # WLAN logging collection
+    mkdir /data/cnss_diag 0777 system system
+
+on boot
+    chmod 666 /dev/diag
+
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag"
     rm /config/usb_gadget/g1/configs/b.1/f1