diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 72c09cf22390d81c32e98f709ea2f0ad0e9c2b0c..6c0761125917ded451491e3502095fa2acd1298a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -5,9 +5,16 @@
     masked: true
   when: "ansible_virtualization_type == 'lxc' and ansible_virtualization_role == 'guest'"
   with_items:
-    - nvmf-autoconnect
     - systemd-journald-audit.socket
     - systemd-modules-load.service
     - zfs-mount.service
     - zfs-share.service
+
+- name: Mask unneeded systemd services in virtualization guests (either VM or container)
+  systemd_service:
+    name: '{{ item }}'
+    masked: true
+  when: "ansible_virtualization_role == 'guest'"
+  with_items:
+    - nvmf-autoconnect
     - openipmi.service