diff --git a/packages/static/grub-config/definition.yaml b/packages/static/grub-config/definition.yaml
index 6151d84..b575c77 100644
--- a/packages/static/grub-config/definition.yaml
+++ b/packages/static/grub-config/definition.yaml
@@ -1,3 +1,3 @@
 name: "grub-config"
 category: "static"
-version: "0.10"
+version: "0.11"
diff --git a/packages/static/grub-config/files/grub.cfg b/packages/static/grub-config/files/grub.cfg
index 89a056b..221dbe4 100644
--- a/packages/static/grub-config/files/grub.cfg
+++ b/packages/static/grub-config/files/grub.cfg
@@ -57,7 +57,7 @@ insmod all_video
 insmod loopback
 insmod squash4
 insmod serial
-insmod regexp
+
 loadfont unicode
 if [ "${grub_platform}" = "efi" ]; then
     ## workaround for grub2-efi bug: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1851311
diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
index f386bb0..3bc4a92 100644
--- a/packages/static/kairos-overlay-files/collection.yaml
+++ b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.20"
+    version: "1.1.21"
diff --git a/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg b/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg
index 209524e..9353118 100644
--- a/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg
+++ b/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg
@@ -1,7 +1,7 @@
 function setSelinux {
     source (loop0)/etc/os-release
     set baseSelinuxCmd=""
-    if regexp "rockylinux|fedora|almalinux|redhat|tumbleweed" $KAIROS_ARTIFACT; then
+    if test $KAIROS_FAMILY == "rhel" -o test $ID == "opensuse-tumbleweed"; then
         set baseSelinuxCmd="selinux=0"
     else
         # if not in recovery
@@ -15,11 +15,11 @@ function setExtraConsole {
     source (loop0)/etc/os-release
     set baseExtraConsole="console=ttyS0"
     # rpi
-    if regexp "arm64-rpi" $KAIROS_ARTIFACT; then
+    if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then
         set baseExtraConsole="console=ttyS0,115200"
     fi
     # nvidia orin
-    if regexp "arm64-nvidia-jetson-agx-orin" $KAIROS_ARTIFACT; then
+    if test $KAIROS_MODEL == "nvidia-jetson-agx-orin"; then
         set baseExtraConsole="console=ttyTCU0,115200"
     fi
 }
@@ -28,7 +28,7 @@ function setExtraArgs {
     source (loop0)/etc/os-release
     set baseExtraArgs=""
     # rpi
-    if regexp "arm64-rpi" $KAIROS_ARTIFACT; then
+    if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then
         set baseExtraArgs="modprobe.blacklist=vc4 8250.nr_uarts=1"
     fi
 }
@@ -54,7 +54,6 @@ function setKernelCmd {
     set kernelcmd="$baseExtraConsole $baseCmd $baseRootCmd $baseSelinuxCmd $baseExtraArgs"
 }
 
-
 # grub.cfg now ships this but during upgrades we do not update the COS_GRUB partition, so no new grub.cfg is copied over there
 # We need to keep it for upgrades to work.
 # TODO: Deprecate in v2.8-v3.0