diff --git a/tasks/cleanup.yml b/tasks/cleanup.yml
index 45527ec..8b2ee13 100644
--- a/tasks/cleanup.yml
+++ b/tasks/cleanup.yml
@@ -1,7 +1,17 @@
 ---
-- name: Cleanup /etc/default/grub to remove fsck
-  ansible.builtin.replace:
-    path: /etc/default/grub
-    regexp: '(GRUB_CMDLINE_LINUX=".*)\s+(fsck\.mode=force)\s+(fsck.repair=yes)(.*")'
-    replace: '\1\4'
-  notify: Update_Grub
+# - name: Cleanup /etc/default/grub to remove fsck
+#   ansible.builtin.replace:
+#     path: /etc/default/grub
+#     regexp: '(GRUB_CMDLINE_LINUX=".*)\s+(fsck\.mode=force)\s+(fsck.repair=yes)(.*")'
+#     replace: '\1\4'
+#   notify: Update_Grub
+
+- name: Remove fsck args from Grub
+  ansible.builtin.command:
+    cmd: grubby --remove-args="fsck.mode=force fsck.repair=yes" --update-kernel=ALL
+  changed_when: false
+  register: autofsck_grubby_rm_args
+
+- name: Debug autofsck_grubby_rm_args
+  ansible.builtin.debug:
+    var: autofsck_grubby_rm_args
diff --git a/tasks/main.yml b/tasks/main.yml
index 5aafc17..25c2e02 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,10 +1,20 @@
 ---
-- name: Configure /etc/default/grub for fsck
-  ansible.builtin.lineinfile:
-    state: present
-    dest: /etc/default/grub
-    backrefs: true
-    regexp: '^(GRUB_CMDLINE_LINUX=(?!.* fsck)\"[^\"]+)(\".*)'
-    line: '\1 fsck.mode=force fsck.repair=yes\2'
-    backup: true
-  notify: Update_Grub
+# - name: Configure /etc/default/grub for fsck
+#   ansible.builtin.lineinfile:
+#     state: present
+#     dest: /etc/default/grub
+#     backrefs: true
+#     regexp: '^(GRUB_CMDLINE_LINUX=(?!.* fsck)\"[^\"]+)(\".*)'
+#     line: '\1 fsck.mode=force fsck.repair=yes\2'
+#     backup: true
+#   notify: Update_Grub
+
+- name: Configure Grub args for fsck
+  ansible.builtin.command:
+    cmd: grubby --args="fsck.mode=force fsck.repair=yes" --update-kernel=ALL
+  changed_when: false
+  register: autofsck_grubby_add_args
+
+- name: Debug autofsck_grubby_add_args
+  ansible.builtin.debug:
+    var: autofsck_grubby_add_args