diff --git a/internal/pkg/agent/application/info/agent_id.go b/internal/pkg/agent/application/info/agent_id.go
index e376a0fbfb4..2d5fbfc76e1 100644
--- a/internal/pkg/agent/application/info/agent_id.go
+++ b/internal/pkg/agent/application/info/agent_id.go
@@ -71,7 +71,7 @@ func getInfoFromStore(s ioStore, logLevel string) (*persistentAgentInfo, error)
 	agentConfigFile := paths.AgentConfigFile()
 	reader, err := s.Load()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load from ioStore: %w", err)
 	}
 
 	// reader is closed by this function
@@ -195,20 +195,20 @@ func loadAgentInfo(forceUpdate bool, logLevel string, createAgentID bool) (*pers
 	agentConfigFile := paths.AgentConfigFile()
 	diskStore := storage.NewEncryptedDiskStore(agentConfigFile)
 
-	agentinfo, err := getInfoFromStore(diskStore, logLevel)
+	agentInfo, err := getInfoFromStore(diskStore, logLevel)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not get agent info from store: %w", err)
 	}
 
-	if agentinfo != nil && !forceUpdate && (agentinfo.ID != "" || !createAgentID) {
-		return agentinfo, nil
+	if agentInfo != nil && !forceUpdate && (agentInfo.ID != "" || !createAgentID) {
+		return agentInfo, nil
 	}
 
-	if err := updateID(agentinfo, diskStore); err != nil {
-		return nil, err
+	if err := updateID(agentInfo, diskStore); err != nil {
+		return nil, fmt.Errorf("could not update agent ID on disk store: %w", err)
 	}
 
-	return agentinfo, nil
+	return agentInfo, nil
 }
 
 func updateID(agentInfo *persistentAgentInfo, s ioStore) error {
diff --git a/internal/pkg/agent/application/info/agent_metadata.go b/internal/pkg/agent/application/info/agent_metadata.go
index a532487a446..49afeca9dc7 100644
--- a/internal/pkg/agent/application/info/agent_metadata.go
+++ b/internal/pkg/agent/application/info/agent_metadata.go
@@ -10,10 +10,11 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/elastic/elastic-agent/internal/pkg/agent/errors"
-	"github.com/elastic/elastic-agent/internal/pkg/release"
 	"github.com/elastic/go-sysinfo"
 	"github.com/elastic/go-sysinfo/types"
+
+	"github.com/elastic/elastic-agent/internal/pkg/agent/errors"
+	"github.com/elastic/elastic-agent/internal/pkg/release"
 )
 
 // ECSMeta is a collection of agent related metadata in ECS compliant object form.
@@ -123,7 +124,7 @@ const (
 func Metadata() (*ECSMeta, error) {
 	agentInfo, err := NewAgentInfo(false)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create new agent info: %w", err)
 	}
 
 	meta, err := agentInfo.ECSMetadata()
diff --git a/internal/pkg/agent/storage/encrypted_disk_store.go b/internal/pkg/agent/storage/encrypted_disk_store.go
index 7fe2f70339a..e3ea3c3f6cf 100644
--- a/internal/pkg/agent/storage/encrypted_disk_store.go
+++ b/internal/pkg/agent/storage/encrypted_disk_store.go
@@ -15,6 +15,7 @@ import (
 	"github.com/hectane/go-acl"
 
 	"github.com/elastic/elastic-agent-libs/file"
+
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/secret"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/errors"
@@ -78,7 +79,7 @@ func (d *EncryptedDiskStore) ensureKey() error {
 	if d.key == nil {
 		key, err := secret.GetAgentSecret(secret.WithVaultPath(d.vaultPath))
 		if err != nil {
-			return err
+			return fmt.Errorf("could not get agent key: %w", err)
 		}
 		d.key = key.Value
 	}
diff --git a/internal/pkg/agent/vault/vault_darwin.go b/internal/pkg/agent/vault/vault_darwin.go
index 4119b27a586..c9290b2ceb3 100644
--- a/internal/pkg/agent/vault/vault_darwin.go
+++ b/internal/pkg/agent/vault/vault_darwin.go
@@ -37,13 +37,15 @@ type Vault struct {
 }
 
 // New initializes the vault store
-// Call Close when done to release the resouces
+// Call Close when done to release the resources
 func New(name string) (*Vault, error) {
 	var keychain C.SecKeychainRef
+
 	err := statusToError(C.OpenKeychain(keychain))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not open keychain: %w", err)
 	}
+
 	return &Vault{
 		name:     name,
 		keychain: keychain,
diff --git a/internal/pkg/agent/vault/vault_linux.go b/internal/pkg/agent/vault/vault_linux.go
index a3737d5c625..42832da93fe 100644
--- a/internal/pkg/agent/vault/vault_linux.go
+++ b/internal/pkg/agent/vault/vault_linux.go
@@ -11,6 +11,7 @@ import (
 	"crypto/rand"
 	"crypto/sha256"
 	"errors"
+	"fmt"
 	"io/fs"
 	"io/ioutil"
 	"os"
@@ -29,7 +30,7 @@ type Vault struct {
 	mx   sync.Mutex
 }
 
-// Open initializes the vault store
+// New opens initializes the vault store
 func New(path string) (*Vault, error) {
 	dir := filepath.Dir(path)
 
@@ -37,7 +38,7 @@ func New(path string) (*Vault, error) {
 	if dir == "." {
 		exefp, err := os.Executable()
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("could not get executable path: %w", err)
 		}
 		dir = filepath.Dir(exefp)
 		path = filepath.Join(dir, path)
@@ -45,12 +46,12 @@ func New(path string) (*Vault, error) {
 
 	err := os.MkdirAll(path, 0750)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not create folders %s: %w", path, err)
 	}
 
 	key, err := getSeed(path)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not get seed to create new valt: %w", err)
 	}
 
 	return &Vault{