diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 02fce9cf5..180631789 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -21,7 +21,7 @@ _parameters() {
         case ${1} in
             -cc|--cc) _CLEANUP_CONTAINER="1" ;;
             -cp|--cp) _CLEANUP_CACHE="1" ;;
-            -install-source=*|--install-source=*) _INSTALL_SOURCE="$(echo "${1}" | awk -F= '{print $2;}')" ;;
+            -install-source=*|--install-source=*) _INSTALL_SOURCE="$(echo "${1}" | rg -o '=(.*)' -r '$1')" ;;
         esac
         shift
     done
diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index cb1ba9e3f..3b96b387d 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -27,8 +27,8 @@ _parameters() {
         case ${1} in
             -g|--g) export _GENERATE="1" ;;
             -s|--s) _SAVE_INIT="1" ;;
-            -c=*|--c=*) _CONFIG="$(echo "${1}" | awk -F= '{print $2;}')" ;;
-            -i=*|--i=*) _IMAGENAME="$(echo "${1}" | awk -F= '{print $2;}')" ;;
+            -c=*|--c=*) _CONFIG="$(echo "${1}" | rg -o '=(.*)' -r '$1')" ;;
+            -i=*|--i=*) _IMAGENAME="$(echo "${1}" | rg -o '=(.*)' -r '$1')" ;;
             -h|--h|?) _usage ;;
             *) _usage ;;
         esac