diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index 49ad23c..ec4d64c 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -23,8 +23,6 @@ func (r Runner) Run() error {
 	}
 	if err := config.Save(filepath.Join(workspace, "maidn-bootstrap.resolved.yaml"), r.Config); err != nil {
 		return err
-	}
-		return err
 	}
 	if err := os.MkdirAll(r.Config.Git.CloneParent, 0755); err != nil {
 		return err
@@ -99,9 +97,14 @@ func renderTerraformTFVars(cfg config.Config) string {
 	builder.WriteString(fmt.Sprintf("talos_factory_schematic_id = %q\n", cfg.Talos.Image.SchematicID))
 	builder.WriteString(fmt.Sprintf("talos_version = %q\n", cfg.Talos.Image.TalosVersion))
 	builder.WriteString("cni_name = \"flannel\"\n")
-	builder.WriteString(fmt.Sprintf("talos_iso_file = %q\n", fmt.Sprintf("%s:iso/talos-%s.iso", cfg.Talos.Image.Storage, strings.TrimPrefix(cfg.Talos.Image.TalosVersion, "v"))))
+	isoStorage := cfg.Talos.Image.Storage
+	if isoStorage == cfg.Talos.Cluster.DiskStorage {
+		isoStorage = "local"
+	}
+	isoFilename := fmt.Sprintf("talos-%s-%s-%s.iso", strings.TrimPrefix(cfg.Talos.Image.TalosVersion, "v"), cfg.Talos.Image.SchematicID[:12], cfg.Talos.Image.Architecture)
+	builder.WriteString(fmt.Sprintf("talos_iso_file = %q\n", fmt.Sprintf("%s:iso/%s", isoStorage, isoFilename)))
 	builder.WriteString(fmt.Sprintf("talos_image_update_mode = %q\n", cfg.Talos.Image.UpdateMode))
-	builder.WriteString(fmt.Sprintf("talos_image_storage = %q\n", cfg.Talos.Image.Storage))
+	builder.WriteString(fmt.Sprintf("talos_image_storage = %q\n", isoStorage))
 	builder.WriteString(fmt.Sprintf("talos_image_architecture = %q\n", cfg.Talos.Image.Architecture))
 	builder.WriteString(fmt.Sprintf("disk_storage = %q\n", cfg.Talos.Cluster.DiskStorage))
 	builder.WriteString(fmt.Sprintf("additional_disk_storage = %q\n", cfg.Talos.Cluster.AdditionalStorage))