diff --git a/cmd/uninstall.go b/cmd/uninstall.go
index 2fde2e16..8cdc046c 100644
--- a/cmd/uninstall.go
+++ b/cmd/uninstall.go
@@ -81,14 +81,15 @@ var uninstallCmd = &cobra.Command{
 			installer.LoadConfigProtectConfs(LuetCfg)
 
 			inst := installer.NewLuetInstaller(installer.LuetInstallerOptions{
-				Concurrency:        LuetCfg.GetGeneral().Concurrency,
-				SolverOptions:      *LuetCfg.GetSolverOptions(),
-				NoDeps:             nodeps,
-				Force:              force,
-				FullUninstall:      full,
-				FullCleanUninstall: fullClean,
-				CheckConflicts:     checkconflicts,
-				Ask:                !yes,
+				Concurrency:                 LuetCfg.GetGeneral().Concurrency,
+				SolverOptions:               *LuetCfg.GetSolverOptions(),
+				NoDeps:                      nodeps,
+				Force:                       force,
+				FullUninstall:               full,
+				FullCleanUninstall:          fullClean,
+				CheckConflicts:              checkconflicts,
+				Ask:                         !yes,
+				PreserveSystemEssentialData: true,
 			})
 
 			if LuetCfg.GetSystem().DatabaseEngine == "boltdb" {
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index d3329acc..5a70d58f 100644
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -84,15 +84,16 @@ var upgradeCmd = &cobra.Command{
 		installer.LoadConfigProtectConfs(LuetCfg)
 
 		inst := installer.NewLuetInstaller(installer.LuetInstallerOptions{
-			Concurrency:                LuetCfg.GetGeneral().Concurrency,
-			SolverOptions:              *LuetCfg.GetSolverOptions(),
-			Force:                      force,
-			FullUninstall:              full,
-			NoDeps:                     nodeps,
-			SolverUpgrade:              universe,
-			RemoveUnavailableOnUpgrade: clean,
-			UpgradeNewRevisions:        sync,
-			Ask:                        !yes,
+			Concurrency:                 LuetCfg.GetGeneral().Concurrency,
+			SolverOptions:               *LuetCfg.GetSolverOptions(),
+			Force:                       force,
+			FullUninstall:               full,
+			NoDeps:                      nodeps,
+			SolverUpgrade:               universe,
+			RemoveUnavailableOnUpgrade:  clean,
+			UpgradeNewRevisions:         sync,
+			PreserveSystemEssentialData: true,
+			Ask:                         !yes,
 		})
 		inst.Repositories(repos)