diff --git a/live/root/usr/bin/kernel-cmdline-conf.sh b/live/root/usr/bin/kernel-cmdline-conf.sh
index c112cd6c54..a973ab2456 100755
--- a/live/root/usr/bin/kernel-cmdline-conf.sh
+++ b/live/root/usr/bin/kernel-cmdline-conf.sh
@@ -16,7 +16,7 @@ write_kernel_args() {
     case ${_i} in
     # remove all agama kernel params
     # Add here also all linuxrc supported parameters
-    LIBSTORAGE_* | YAST_* | inst* | agama* | Y2* | ZYPP_* | autoyast* )
+    LIBSTORAGE_* | YAST_* | inst* | agama* | live* | Y2* | ZYPP_* | autoyast*)
       _found=1
       ;;
     esac
diff --git a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh
index 2b404deb15..b5f31dd301 100755
--- a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh
+++ b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh
@@ -6,6 +6,9 @@
 
 TARGET="${1:-/run/agama/cmdline.d/agama.conf}"
 ENV_TARGET="${1:-/run/agama/environment.conf}"
+mkdir -p "/run/agama/cmdline.d"
+touch "$TARGET"
+touch "$ENV_TARGET"
 get_agama_args() {
   local _i _found _env
 
@@ -15,7 +18,7 @@ get_agama_args() {
       _found=1
       _env=1
       ;;
-    inst* | agama*)
+    agama* | live* | inst*)
       _found=1
       ;;
     esac
diff --git a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/module-setup.sh b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/module-setup.sh
index a25645c0f0..34671a3994 100755
--- a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/module-setup.sh
+++ b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/module-setup.sh
@@ -18,5 +18,4 @@ installkernel() {
 install() {
   inst_hook cmdline 99 "$moddir/agama-cmdline-conf.sh"
   inst_hook cmdline 99 "$moddir/agama-network-compat.sh"
-  inst_hook pre-pivot 99 "$moddir/save-agama-conf.sh"
 }
diff --git a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/save-agama-conf.sh b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/save-agama-conf.sh
deleted file mode 100755
index 510a14b4f2..0000000000
--- a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/save-agama-conf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-[ -e /dracut-state.sh ] && . /dracut-state.sh
-
-. /lib/dracut-lib.sh
-
-if [ -e /etc/cmdline.d/99-agama-cmdline.conf ]; then
-  echo "Creating agama conf"
-  mkdir -p "$NEWROOT/run/agama/cmdline.d"
-  cp /etc/cmdline.d/99-agama-cmdline.conf "$NEWROOT/run/agama/cmdline.d/agama.conf"
-fi