diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index 2adfe0452..3a9affa1f 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -2982,10 +2982,10 @@ bootloader_kernel_parameters() {
     
     [[ "${_rootpart}" == "" ]] && _rootpart="${PART_ROOT}"
     
-    _KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP} cgroup_disable=memory"
+    _KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP}"
     # add uncommonn options here
     _KERNEL_PARAMS_BIOS_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD}"
-    _KERNEL_PARAMS_UEFI_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD} add_efi_memmap"
+    _KERNEL_PARAMS_UEFI_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD}"
     _KERNEL_PARAMS_BIOS_MOD="$(echo "${_KERNEL_PARAMS_BIOS_UNMOD}" | sed -e 's#   # #g' | sed -e 's#  # #g')"
     _KERNEL_PARAMS_UEFI_MOD="$(echo "${_KERNEL_PARAMS_UEFI_UNMOD}" | sed -e 's#   # #g' | sed -e 's#  # #g')"
     
diff --git a/usr/share/archboot/grub/archboot-main-grub.cfg b/usr/share/archboot/grub/archboot-main-grub.cfg
index 903233af2..3c8efd053 100644
--- a/usr/share/archboot/grub/archboot-main-grub.cfg
+++ b/usr/share/archboot/grub/archboot-main-grub.cfg
@@ -66,7 +66,7 @@ if [ ${grub_platform} == "pc" ]; then
     menuentry "Arch Linux x86_64 Archboot - BIOS Mode" {
         set gfxpayload=keep
         _menu_running
-        linux /boot/vmlinuz_x86_64 cgroup_disable=memory rootfstype=ramfs console=ttyS0,115200 console=tty0
+        linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
         initrd /boot/intel-ucode.img  /boot/amd-ucode.img /boot/initramfs_x86_64.img
     }
 fi
@@ -78,7 +78,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux x86_64 Archboot" {
             set gfxpayload=keep
             _menu_running
-            linux /boot/vmlinuz_x86_64 cgroup_disable=memory rootfstype=ramfs add_efi_memmap console=ttyS0,115200 console=tty0
+            linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
             initrd /boot/intel-ucode.img  /boot/amd-ucode.img /boot/initramfs_x86_64.img
         }
         
@@ -92,7 +92,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux AA64 Archboot" {
             set gfxpayload=keep
             _menu_running
-            linux /boot/vmlinuz_aarch64 cgroup_disable=memory rootfstype=ramfs audit=0 nr_cpus=1 add_efi_memmap console=ttyS0,115200 console=tty0
+            linux /boot/vmlinuz_aarch64 rootfstype=ramfs audit=0 nr_cpus=1 console=ttyS0,115200 console=tty0
             initrd /boot/amd-ucode.img /boot/initramfs_aarch64.img
         }
         
@@ -105,7 +105,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" {
                 set gfxpayload=keep
                 _menu_running
-                linux /boot/vmlinuz_x86_64 cgroup_disable=memory _IA32_UEFI=1 rootfstype=ramfs add_efi_memmap console=ttyS0,115200 console=tty0
+                linux /boot/vmlinuz_x86_64 _IA32_UEFI=1 rootfstype=ramfs console=ttyS0,115200 console=tty0
                 initrd /boot/intel-ucode.img  /boot/amd-ucode.img /boot/initramfs_x86_64.img
         }