diff --git a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml
deleted file mode 100644
index ff493491e58..00000000000
--- a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
-apiVersion: machineconfiguration.openshift.io/v1
-kind: MachineConfig
-spec:
-  config:
-    ignition:
-      version: 3.1.0
-    systemd:
-      units:
-      - enabled: false
-        name: debug-shell.service
diff --git a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml b/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml
deleted file mode 100644
index 41352695f4b..00000000000
--- a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
-apiVersion: machineconfiguration.openshift.io/v1
-kind: MachineConfig
-spec:
-  config:
-    ignition:
-      version: 3.1.0
-    systemd:
-      units:
-      - enabled: false
-        name: autofs.service
diff --git a/shared/macros/01-general.jinja b/shared/macros/01-general.jinja
index 555277ff304..5b80e6a9403 100644
--- a/shared/macros/01-general.jinja
+++ b/shared/macros/01-general.jinja
@@ -450,8 +450,12 @@ JINJA MACRO ERROR - Unknown init system '{{{ init_system }}}'.
           version: 3.1.0
         systemd:
           units:
-          - enabled: false
-            name: {{{ service }}}.service
+          - name: {{{ service }}}.service
+            enabled: false
+            mask: true
+          - name: {{{ service }}}.socket
+            enabled: false
+            mask: true
     </pre>
     <p>
     This will disable the <tt>{{{ service }}}</tt> service in all the