diff --git a/.grubby.metadata b/.grubby.metadata
new file mode 100644
index 0000000..a7750c5
--- /dev/null
+++ b/.grubby.metadata
@@ -0,0 +1 @@
+97ae8d113b74538c05f05083dcff4f44012fd0cd 8.40-1.tar.gz
diff --git a/grubby-bls b/grubby-bls
index f3650e3..3c2544a 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -827,12 +827,15 @@ fi
 remove_var_prefix "$(get_prefix)"
 
 if [[ -n $kernel ]]; then
-    opts="${bls_options[$default_index]}"
-    if [[ $copy_default != "true" ]]; then
-        opts=$(echo $opts | sed -e 's/ .*//')
-    fi
-    if [[ -n $args ]]; then
-        opts="${opts} ${args}"
+    if [[ $copy_default = "true" ]]; then
+	opts="${bls_options[$default_index]}"
+	if [[ -n $args ]]; then
+	    opts="${opts} ${args}"
+	fi
+    else
+	opts="${opts} ${args}"
+	remove_args="$kernelopts"
+	update_args "${opts}" "${remove_args}" ""
     fi
 
     add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \
diff --git a/grubby.spec b/grubby.spec
index 309972d..d83cd91 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 62%{?dist}
+Release: 63%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-63
+- remove root= when not copying default
+- Resolves: #2127453
+
 * Wed Feb 15 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-62
 - Apply Marta's default args fix
 - Resolves: #2127453