diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index 4c1315d..a947c7b 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -87,7 +87,6 @@ apt-fast install --no-install-recommends -yq \
     net-tools \
     nload \
     network-manager \
-    nvme-cli \
     openssl \
     ppp \
     smartmontools \
diff --git a/userspace/services.sh b/userspace/services.sh
index 499701d..300a088 100755
--- a/userspace/services.sh
+++ b/userspace/services.sh
@@ -58,7 +58,6 @@ systemctl disable chgrp-diag.service
 systemctl disable lvm2-monitor.service
 systemctl mask systemd-backlight@.service
 systemctl disable dpkg-db-backup.timer
-systemctl disable nvmefc-boot-connections.service
 systemctl disable ua-reboot-cmds.service
 systemctl disable ubuntu-advantage.service
 systemctl disable update-notifier-download.timer
@@ -73,11 +72,6 @@ systemctl disable dnsmasq.service
 systemctl disable nfs-client.target
 systemctl disable remote-fs-pre.target
 
-# Disable nvmf service since no NVMe-oF in the old kernel
-# this service fails in 24.04, while failing silently on 20.04
-# no influence on C3 NVMe nor nvme smart-log, which work fine
-systemctl disable nvmf-autoconnect.service
-
 # Service is from ifupdown but ifupdown is managed by NetworkManager
 # networking service fails with "ifup: failed to bring up lo"
 # no influence on any interface, all interfaces work fine