diff --git a/projects/ROCKNIX/packages/rocknix/sources/scripts/automount b/projects/ROCKNIX/packages/rocknix/sources/scripts/automount
index 5428165c5d..eec2571ae6 100755
--- a/projects/ROCKNIX/packages/rocknix/sources/scripts/automount
+++ b/projects/ROCKNIX/packages/rocknix/sources/scripts/automount
@@ -184,7 +184,7 @@ function mount_games() {
 function find_games() {
   if /usr/bin/busybox mountpoint -q /storage
   then
-    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /btrfs/ || /fat/ || /ntfs/ {print $1}' | sort -r; done)
+    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]n[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /btrfs/ || /fat/ || /ntfs/ {print $1}' | sort -r; done)
     do
       ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g")
       log $0 "Inspecting ${DEV}."
diff --git a/projects/ROCKNIX/packages/sysutils/udevil/config/udevil.conf b/projects/ROCKNIX/packages/sysutils/udevil/config/udevil.conf
index 5b238061c8..8634564b4c 100644
--- a/projects/ROCKNIX/packages/sysutils/udevil/config/udevil.conf
+++ b/projects/ROCKNIX/packages/sysutils/udevil/config/udevil.conf
@@ -119,7 +119,7 @@ allowed_media_dirs = /media, /var/media, /run/media/$USER
 # allowed_devices = /dev/*
 # WARNING:  ALLOWING USERS TO MOUNT DEVICES OUTSIDE OF /dev CAN CAUSE SERIOUS
 # SECURITY PROBLEMS.  DO NOT ALLOW DEVICES IN /dev/shm
-allowed_devices = /dev/*
+allowed_devices = /dev/*, /dev/nvme*
 
 
 # allowed_internal_devices causes udevil to treat any listed block devices as
diff --git a/projects/ROCKNIX/packages/sysutils/udevil/udev.d/95-udevil-mount.rules b/projects/ROCKNIX/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
index fd7bc35aae..c1a1704056 100644
--- a/projects/ROCKNIX/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
+++ b/projects/ROCKNIX/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
@@ -2,15 +2,15 @@
 IMPORT{cmdline}="installer"
 ENV{installer}=="1", GOTO="exit"
 
-# check for blockdevices, /dev/sd*, /dev/sr* and /dev/nvme*
-SUBSYSTEM!="block", KERNEL!="sd*|sr*|nvme*", GOTO="exit"
+# check for blockdevices, /dev/sd*, /dev/sr*
+SUBSYSTEM!="block", KERNEL!="sd*|sr*", GOTO="exit"
 
 # check for special partitions we dont want mount
 IMPORT{builtin}="blkid"
 ENV{ID_FS_LABEL}=="EFI|BOOT|Recovery|RECOVERY|SETTINGS|boot|root0|share0", GOTO="exit"
 
-# /dev/sd* and /dev/nvme* with partitions/disk and filesystems only, and /dev/sr* disks only
-KERNEL=="sd*|nvme*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", GOTO="harddisk"
+# /dev/sd* with partitions/disk and filesystems only and /dev/sr* disks only
+KERNEL=="sd*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", GOTO="harddisk"
 KERNEL=="sr*", ENV{DEVTYPE}=="disk", GOTO="optical"
 GOTO="exit"
 
@@ -27,4 +27,3 @@ GOTO="exit"
 
 # Exit
 LABEL="exit"
-