diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go
index ecaef4a..dd5de0e 100644
--- a/cmd/bootstrap.go
+++ b/cmd/bootstrap.go
@@ -83,10 +83,10 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 	{
 		logging.LogMessage(context.Stderr, "Creating root deployment directory")
 		if err := umaskfree.MkdirAll(root, umaskfree.DefaultDirPerm); err != nil {
-			return errBootstrapFailedToCreateDirectory.WithMessageF(root).Wrap(err)
+			return errBootstrapFailedToCreateDirectory.WithMessageF(root).WrapError(err)
 		}
 		if err := cli.WriteBaseDirectory(root); err != nil {
-			return errBootstrapFailedToSaveDirectory.WithMessageF(root).Wrap(err)
+			return errBootstrapFailedToSaveDirectory.WithMessageF(root).WrapError(err)
 		}
 		context.Println(root)
 	}
@@ -102,7 +102,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 
 	// and use thge defaults
 	if err := tpl.SetDefaults(); err != nil {
-		return errBootstrapWriteConfig.Wrap(err)
+		return errBootstrapWriteConfig.WrapError(err)
 	}
 
 	{
@@ -122,7 +122,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 	{
 		isFile, err := fsx.IsRegular(cfgPath, false)
 		if err != nil {
-			return errBootstrapWriteConfig.Wrap(err)
+			return errBootstrapWriteConfig.WrapError(err)
 		}
 		if !isFile {
 			// generate the configuration from the template
@@ -150,7 +150,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 
 				return nil
 			}, context.Stderr, "Creating custom config files"); err != nil {
-				return errBootstrapCreateFile.Wrap(err)
+				return errBootstrapCreateFile.WrapError(err)
 			}
 
 			// Validate configuration file!
@@ -176,7 +176,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 					return err
 				}
 			}, context.Stderr, "Installing primary configuration file"); err != nil {
-				return errBootstrapWriteConfig.Wrap(err)
+				return errBootstrapWriteConfig.WrapError(err)
 			}
 		}
 
@@ -186,13 +186,13 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
 	logging.LogMessage(context.Stderr, "Configuration is now complete")
 	f, err := os.Open(cfgPath)
 	if err != nil {
-		return errBootstrapOpenConfig.Wrap(err)
+		return errBootstrapOpenConfig.WrapError(err)
 	}
 	defer f.Close()
 
 	var cfg config.Config
 	if err := cfg.Unmarshal(f); err != nil {
-		return errBootstrapOpenConfig.Wrap(err)
+		return errBootstrapOpenConfig.WrapError(err)
 	}
 	context.Println(cfg)
 
diff --git a/cmd/config.go b/cmd/config.go
index ba7192a..d79268d 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -35,7 +35,7 @@ func (cfg cfg) Run(context wisski_distillery.Context) error {
 		return nil
 	}
 	if err := context.Environment.Config.Marshal(context.Stdout); err != nil {
-		return errMarshalConfig.Wrap(err)
+		return errMarshalConfig.WrapError(err)
 	}
 	return nil
 }
diff --git a/cmd/dis_ssh.go b/cmd/dis_ssh.go
index 84f1bc9..6af635d 100644
--- a/cmd/dis_ssh.go
+++ b/cmd/dis_ssh.go
@@ -76,12 +76,12 @@ var errNoKey = exit.Error{
 func (ds disSSH) parseOpts(context wisski_distillery.Context) (user *auth.AuthUser, key gossh.PublicKey, err error) {
 	user, err = context.Environment.Auth().User(context.Context, ds.Positionals.User)
 	if err != nil {
-		return nil, nil, errSSHManageFailed.Wrap(err)
+		return nil, nil, errSSHManageFailed.WrapError(err)
 	}
 
 	content, err := os.ReadFile(ds.Positionals.Path)
 	if err != nil {
-		return nil, nil, errSSHManageFailed.Wrap(err)
+		return nil, nil, errSSHManageFailed.WrapError(err)
 	}
 
 	pk, _, _, _, err := gossh.ParseAuthorizedKey(content)
@@ -99,7 +99,7 @@ func (ds disSSH) runAdd(context wisski_distillery.Context) error {
 	}
 
 	if err := context.Environment.Keys().Add(context.Context, user.User.User, ds.Comment, key); err != nil {
-		return errSSHManageFailed.Wrap(err)
+		return errSSHManageFailed.WrapError(err)
 	}
 	return nil
 }
@@ -111,7 +111,7 @@ func (ds disSSH) runRemove(context wisski_distillery.Context) error {
 	}
 
 	if err := context.Environment.Keys().Remove(context.Context, user.User.User, key); err != nil {
-		return errSSHManageFailed.Wrap(err)
+		return errSSHManageFailed.WrapError(err)
 	}
 	return nil
 }
diff --git a/cmd/drupal_setting.go b/cmd/drupal_setting.go
index 9b8709f..b481be5 100644
--- a/cmd/drupal_setting.go
+++ b/cmd/drupal_setting.go
@@ -47,19 +47,19 @@ var errSettingWissKI = exit.Error{
 func (ds setting) Run(context wisski_distillery.Context) error {
 	instance, err := context.Environment.Instances().WissKI(context.Context, ds.Positionals.Slug)
 	if err != nil {
-		return errSettingWissKI.Wrap(err)
+		return errSettingWissKI.WrapError(err)
 	}
 
 	if ds.Positionals.Value == "" {
 		// get the setting
 		value, err := instance.Settings().Get(context.Context, nil, ds.Positionals.Setting)
 		if err != nil {
-			return errSettingGet.Wrap(err)
+			return errSettingGet.WrapError(err)
 		}
 
 		// and print it
 		if err := json.NewEncoder(context.Stdout).Encode(value); err != nil {
-			return errSettingGet.Wrap(err)
+			return errSettingGet.WrapError(err)
 		}
 
 		// finish with a newline
@@ -70,12 +70,12 @@ func (ds setting) Run(context wisski_distillery.Context) error {
 	// serialize the setting into json
 	var data any
 	if err := json.Unmarshal([]byte(ds.Positionals.Value), &data); err != nil {
-		return errSettingSet.Wrap(err)
+		return errSettingSet.WrapError(err)
 	}
 
 	// set the serialized value!
 	if err := instance.Settings().Set(context.Context, nil, ds.Positionals.Setting, data); err != nil {
-		return errSettingSet.Wrap(err)
+		return errSettingSet.WrapError(err)
 	}
 
 	// and we're done
diff --git a/cmd/instance_lock.go b/cmd/instance_lock.go
index 1ecf1e8..b7dae67 100644
--- a/cmd/instance_lock.go
+++ b/cmd/instance_lock.go
@@ -53,7 +53,7 @@ var errInstanceLockWissKI = exit.Error{
 func (l instanceLock) Run(context wisski_distillery.Context) error {
 	instance, err := context.Environment.Instances().WissKI(context.Context, l.Positionals.Slug)
 	if err != nil {
-		return errInstanceLockWissKI.Wrap(err)
+		return errInstanceLockWissKI.WrapError(err)
 	}
 
 	if l.Unlock {
diff --git a/cmd/instance_pause.go b/cmd/instance_pause.go
index 8db826e..76dc451 100644
--- a/cmd/instance_pause.go
+++ b/cmd/instance_pause.go
@@ -42,7 +42,7 @@ var errInstancePauseWissKI = exit.Error{
 func (i instancepause) Run(context wisski_distillery.Context) error {
 	instance, err := context.Environment.Instances().WissKI(context.Context, i.Positionals.Slug)
 	if err != nil {
-		return errInstancePauseWissKI.Wrap(err)
+		return errInstancePauseWissKI.WrapError(err)
 	}
 
 	if i.Stop {
diff --git a/cmd/ls.go b/cmd/ls.go
index bf40e30..bbf238b 100644
--- a/cmd/ls.go
+++ b/cmd/ls.go
@@ -33,7 +33,7 @@ var errLsWissKI = exit.Error{
 func (l ls) Run(context wisski_distillery.Context) error {
 	instances, err := context.Environment.Instances().Load(context.Context, l.Positionals.Slug...)
 	if err != nil {
-		return errLsWissKI.Wrap(err)
+		return errLsWissKI.WrapError(err)
 	}
 
 	for _, instance := range instances {
diff --git a/cmd/make_block.go b/cmd/make_block.go
index 19d7224..c53ea13 100644
--- a/cmd/make_block.go
+++ b/cmd/make_block.go
@@ -73,7 +73,7 @@ func (mb makeBlock) Run(context wisski_distillery.Context) error {
 	// get the wisski
 	instance, err := context.Environment.Instances().WissKI(context.Context, mb.Positionals.Slug)
 	if err != nil {
-		return errPathbuilderWissKI.Wrap(err)
+		return errPathbuilderWissKI.WrapError(err)
 	}
 
 	// get the footer (if any)
@@ -81,7 +81,7 @@ func (mb makeBlock) Run(context wisski_distillery.Context) error {
 		zerolog.Ctx(context.Context).Info().Msg("checking for footer")
 		region, err := instance.Blocks().GetFooterRegion(context.Context, nil)
 		if err != nil {
-			return errBlocksFooterFailed.Wrap(err)
+			return errBlocksFooterFailed.WrapError(err)
 		}
 		if region == "" {
 			return errBlocksNoFooter
@@ -96,7 +96,7 @@ func (mb makeBlock) Run(context wisski_distillery.Context) error {
 	// read the content
 	content, err := io.ReadAll(context.Stdin)
 	if err != nil {
-		return errBlocksNoContent.Wrap(err)
+		return errBlocksNoContent.WrapError(err)
 	}
 
 	{
diff --git a/cmd/make_mysql_account.go b/cmd/make_mysql_account.go
index f2bf7d3..b86d5dc 100644
--- a/cmd/make_mysql_account.go
+++ b/cmd/make_mysql_account.go
@@ -46,17 +46,17 @@ func (mma makeMysqlAccount) Run(context wisski_distillery.Context) error {
 	context.Printf("Username>")
 	username, err := context.ReadLine()
 	if err != nil {
-		return errUnableToReadUsername.Wrap(err)
+		return errUnableToReadUsername.WrapError(err)
 	}
 
 	context.Printf("Password>")
 	password, err := context.ReadPassword()
 	if err != nil {
-		return errUnableToReadPassword.Wrap(err)
+		return errUnableToReadPassword.WrapError(err)
 	}
 
 	if err := dis.SQL().CreateSuperuser(context.Context, username, password, false); err != nil {
-		return errUnableToMakeAccount.Wrap(err)
+		return errUnableToMakeAccount.WrapError(err)
 	}
 
 	return nil
diff --git a/cmd/pathbuilders.go b/cmd/pathbuilders.go
index bffe794..305b28a 100644
--- a/cmd/pathbuilders.go
+++ b/cmd/pathbuilders.go
@@ -46,14 +46,14 @@ func (pb pathbuilders) Run(context wisski_distillery.Context) error {
 	// get the wisski
 	instance, err := context.Environment.Instances().WissKI(context.Context, pb.Positionals.Slug)
 	if err != nil {
-		return errPathbuilderWissKI.Wrap(err)
+		return errPathbuilderWissKI.WrapError(err)
 	}
 
 	// get all of the pathbuilders
 	if pb.Positionals.Name == "" {
 		names, err := instance.Pathbuilder().All(context.Context, nil)
 		if err != nil {
-			return errPathbuilders.Wrap(err)
+			return errPathbuilders.WrapError(err)
 		}
 		for _, name := range names {
 			context.Println(name)
diff --git a/cmd/prefixes.go b/cmd/prefixes.go
index a34ea3d..17a203a 100644
--- a/cmd/prefixes.go
+++ b/cmd/prefixes.go
@@ -38,12 +38,12 @@ var errPrefixesWissKI = exit.Error{
 func (p prefixes) Run(context wisski_distillery.Context) error {
 	instance, err := context.Environment.Instances().WissKI(context.Context, p.Positionals.Slug)
 	if err != nil {
-		return errPrefixesWissKI.Wrap(err)
+		return errPrefixesWissKI.WrapError(err)
 	}
 
 	prefixes, err := instance.Prefixes().All(context.Context, nil)
 	if err != nil {
-		return errPrefixesGeneric.Wrap(err)
+		return errPrefixesGeneric.WrapError(err)
 	}
 
 	for _, p := range prefixes {
diff --git a/cmd/purge.go b/cmd/purge.go
index 4b9dd8d..87e7cf7 100644
--- a/cmd/purge.go
+++ b/cmd/purge.go
@@ -52,7 +52,7 @@ func (p purge) Run(context wisski_distillery.Context) error {
 
 	// do the purge!
 	if err := dis.Purger().Purge(context.Context, context.Stdout, slug); err != nil {
-		return errPurgeFailed.Wrap(err)
+		return errPurgeFailed.WrapError(err)
 	}
 	return nil
 }
diff --git a/cmd/reserve.go b/cmd/reserve.go
index bc5a9d7..2b06c22 100644
--- a/cmd/reserve.go
+++ b/cmd/reserve.go
@@ -64,7 +64,7 @@ func (r reserve) Run(context wisski_distillery.Context) (err error) {
 		logging.LogMessage(context.Stderr, "Checking that base directory %s does not exist", instance.FilesystemBase)
 		exists, err := fsx.Exists(instance.FilesystemBase)
 		if err != nil {
-			return errProvisionGeneric.Wrap(err)
+			return errProvisionGeneric.WrapError(err)
 		}
 		if exists {
 			return errReserveAlreadyExists.WithMessageF(slug)
diff --git a/cmd/server.go b/cmd/server.go
index c6995dd..0a08297 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -51,7 +51,7 @@ func (s server) Run(context wisski_distillery.Context) error {
 	// if the caller requested a trigger, just trigger the cron tasks
 	if s.Trigger {
 		if err := dis.Control().Trigger(context.Context); err != nil {
-			return errServerTrigger.Wrap(err)
+			return errServerTrigger.WrapError(err)
 		}
 	}
 
@@ -70,7 +70,7 @@ func (s server) Run(context wisski_distillery.Context) error {
 	// and start the server
 	public, internal, err := dis.Control().Server(context.Context, context.Stderr)
 	if err != nil {
-		return errServerGeneric.Wrap(err)
+		return errServerGeneric.WrapError(err)
 	}
 
 	// start the public listener
@@ -95,7 +95,7 @@ func (s server) Run(context wisski_distillery.Context) error {
 		zerolog.Ctx(context.Context).Info().Str("bind", s.InternalBind).Msg("listening internal server")
 		internalL, err := net.Listen("tcp", s.InternalBind)
 		if err != nil {
-			return errServerListen.Wrap(err)
+			return errServerListen.WrapError(err)
 		}
 		defer internalS.Shutdown(context.Context)
 		go func() {
@@ -111,5 +111,5 @@ func (s server) Run(context wisski_distillery.Context) error {
 		internalS.Shutdown(context.Context)
 	}()
 
-	return errServerListen.Wrap(errors.Join(<-internalC, <-publicC, err))
+	return errServerListen.WrapError(errors.Join(<-internalC, <-publicC, err))
 }
diff --git a/cmd/shell.go b/cmd/shell.go
index dee35ea..e16a1e7 100644
--- a/cmd/shell.go
+++ b/cmd/shell.go
@@ -41,7 +41,7 @@ var errShellWissKI = exit.Error{
 func (sh shell) Run(context wisski_distillery.Context) error {
 	instance, err := context.Environment.Instances().WissKI(context.Context, sh.Positionals.Slug)
 	if err != nil {
-		return errShellWissKI.Wrap(err)
+		return errShellWissKI.WrapError(err)
 	}
 
 	{
diff --git a/cmd/snapshot.go b/cmd/snapshot.go
index 68dfc8b..3386d04 100644
--- a/cmd/snapshot.go
+++ b/cmd/snapshot.go
@@ -57,7 +57,7 @@ func (sn snapshot) Run(context wisski_distillery.Context) error {
 	// find the instance!
 	instance, err := dis.Instances().WissKI(context.Context, sn.Positionals.Slug)
 	if err != nil {
-		return errSnapshotWissKI.Wrap(err)
+		return errSnapshotWissKI.WrapError(err)
 	}
 
 	// do a snapshot of it!
@@ -72,7 +72,7 @@ func (sn snapshot) Run(context wisski_distillery.Context) error {
 	})
 
 	if err != nil {
-		return errSnapshotFailed.Wrap(err)
+		return errSnapshotFailed.WrapError(err)
 	}
 	return nil
 }
diff --git a/cmd/ssh.go b/cmd/ssh.go
index abf037a..70a097d 100644
--- a/cmd/ssh.go
+++ b/cmd/ssh.go
@@ -40,7 +40,7 @@ func (s ssh) Run(context wisski_distillery.Context) error {
 	dis := context.Environment
 	server, err := dis.SSH().Server(context.Context, s.PrivateKeyPath, context.Stderr)
 	if err != nil {
-		return errSSHServer.Wrap(err)
+		return errSSHServer.WrapError(err)
 	}
 
 	context.Printf("Listening on %s\n", s.Bind)
@@ -48,7 +48,7 @@ func (s ssh) Run(context wisski_distillery.Context) error {
 	// make a new listener
 	listener, err := net.Listen("tcp", s.Bind)
 	if err != nil {
-		return errSSHListen.Wrap(err)
+		return errSSHListen.WrapError(err)
 	}
 
 	go func() {
@@ -58,5 +58,5 @@ func (s ssh) Run(context wisski_distillery.Context) error {
 
 	// and serve that listener
 	err = server.Serve(listener)
-	return errServerListen.Wrap(err)
+	return errServerListen.WrapError(err)
 }
diff --git a/cmd/status.go b/cmd/status.go
index dd315e6..d0b2cfe 100644
--- a/cmd/status.go
+++ b/cmd/status.go
@@ -33,7 +33,7 @@ var errStatusGeneric = exit.Error{
 func (s cStatus) Run(context wisski_distillery.Context) error {
 	status, _, err := context.Environment.Info().Status(context.Context, true)
 	if err != nil {
-		return errStatusGeneric.Wrap(err)
+		return errStatusGeneric.WrapError(err)
 	}
 
 	if s.JSON {
diff --git a/cmd/system_update.go b/cmd/system_update.go
index 38b6bf7..b9443d8 100644
--- a/cmd/system_update.go
+++ b/cmd/system_update.go
@@ -99,7 +99,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
 	} {
 		context.Println(d)
 		if err := umaskfree.MkdirAll(d, umaskfree.DefaultDirPerm); err != nil {
-			return errBoostrapFailedToCreateDirectory.WithMessageF(d).Wrap(err)
+			return errBoostrapFailedToCreateDirectory.WithMessageF(d).WrapError(err)
 		}
 	}
 
@@ -129,7 +129,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
 		logging.LogMessage(context.Stderr, "Checking that the 'docker' api is reachable")
 		ping, err := dis.Docker().Ping(context.Context)
 		if err != nil {
-			return errDockerUnreachable.Wrap(err)
+			return errDockerUnreachable.WrapError(err)
 		}
 		context.Printf("API Version:     %s (experimental: %t)\nBuilder Version: %s\n", ping.APIVersion, ping.Experimental, ping.BuilderVersion)
 	}
@@ -148,7 +148,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
 		for _, name := range dis.Config.Docker.Networks() {
 			id, existed, err := dis.Docker().CreateNetwork(context.Context, name)
 			if err != nil {
-				return errNetworkCreateFailed.Wrap(err)
+				return errNetworkCreateFailed.WrapError(err)
 			}
 			if existed {
 				context.Printf("Network %s (id %s) already existed\n", name, id)
@@ -213,7 +213,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
 				}
 				return item.Update(context.Context, context.Stderr)
 			}, context.Stderr, "Updating Component: %s", name); err != nil {
-				return errBootstrapComponent.WithMessageF(name).Wrap(err)
+				return errBootstrapComponent.WithMessageF(name).WrapError(err)
 			}
 		}
 		return nil
diff --git a/internal/dis/component/instances/runtime.go b/internal/dis/component/instances/runtime.go
index c0b1384..19c3155 100644
--- a/internal/dis/component/instances/runtime.go
+++ b/internal/dis/component/instances/runtime.go
@@ -26,7 +26,7 @@ func (instances *Instances) Update(ctx context.Context, progress io.Writer) erro
 		fmt.Fprintf(progress, "[copy]  %s\n", dst)
 	})
 	if err != nil {
-		return errBootstrapFailedRuntime.Wrap(err)
+		return errBootstrapFailedRuntime.WrapError(err)
 	}
 	return nil
 }