diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 3236f22c6..2443a6053 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -591,18 +591,18 @@ if [ "${scenario}" != "ready" ] ; then
   /home/admin/_cache.sh set "system_setup_combinedDataStorage" "${combinedDataStorage}"
   /home/admin/_cache.sh set "system_setup_storageDevice" "${storageDevice}"
   /home/admin/_cache.sh set "system_setup_storageDeviceName" "${storageDeviceName}"
-  /home/admin/_cache.sh set "system_setup_storageSizeGB" "${storageDeviceName}"
+  /home/admin/_cache.sh set "system_setup_storageSizeGB" "${storageSizeGB}"
   /home/admin/_cache.sh set "system_setup_storageWarning" "${storageWarning}"
   /home/admin/_cache.sh set "system_setup_storageBlockchainGB" "${storageBlockchainGB}"
   /home/admin/_cache.sh set "system_setup_storageMigration" "${storageMigration}"
-  /home/admin/_cache.sh set "system_setup_systemDevice" "${storageDevice}"
+  /home/admin/_cache.sh set "system_setup_systemDevice" "${systemDevice}"
   /home/admin/_cache.sh set "system_setup_systemDeviceName" "${storageDeviceName}"
-  /home/admin/_cache.sh set "system_setup_systemSizeGB" "${storageDeviceName}"
-  /home/admin/_cache.sh set "system_setup_systemWarning" "${storageWarning}"
-  /home/admin/_cache.sh set "system_setup_dataDevice" "${storageDevice}"
-  /home/admin/_cache.sh set "system_setup_dataDeviceName" "${storageDeviceName}"
-  /home/admin/_cache.sh set "system_setup_dataSizeGB" "${storageDeviceName}"
-  /home/admin/_cache.sh set "system_setup_dataWarning" "${storageWarning}"
+  /home/admin/_cache.sh set "system_setup_systemSizeGB" "${systemSizeGB}"
+  /home/admin/_cache.sh set "system_setup_systemWarning" "${systemWarning}"
+  /home/admin/_cache.sh set "system_setup_dataDevice" "${dataDevice}"
+  /home/admin/_cache.sh set "system_setup_dataDeviceName" "${dataDeviceName}"
+  /home/admin/_cache.sh set "system_setup_dataSizeGB" "${dataSizeG}"
+  /home/admin/_cache.sh set "system_setup_dataWarning" "${dataWarning}"
 
   # add info if a flag shows that install medium was tried before
   if [ -f "/home/admin/systemcopy.flag" ]; then