diff --git a/misc/build.func b/misc/build.func
index 94ff765f..6586c6d4 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -1643,8 +1643,8 @@ check_storage_or_prompt() {
 
   # Load current values (safe with grep/cut, no BRG/HN etc.)
   local ct_store tpl_store
-  ct_store=$(grep -E '^var_container_storage=' "$vars_file" | cut -d= -f2-)
-  tpl_store=$(grep -E '^var_template_storage=' "$vars_file" | cut -d= -f2-)
+  ct_store=$(awk -F= '/^var_container_storage=/ {print $2; exit}' "$vars_file")
+  tpl_store=$(awk -F= '/^var_template_storage=/ {print $2; exit}' "$vars_file")
 
   # Container storage
   if ! _validate_storage "$ct_store"; then