diff --git a/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go
index 32e06332e4c..82d996bd620 100644
--- a/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go
+++ b/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go
@@ -187,18 +187,18 @@ func (c *EnrollCmd) Execute(ctx context.Context) error {
 	}
 
 	if c.options.NoRestart {
-		return err
+		return nil
 	}
 
 	if c.daemonReload(ctx) != nil {
 		c.log.Info("Elastic Agent might not be running; unable to trigger restart")
 	}
 	c.log.Info("Successfully triggered restart on running Elastic Agent.")
-	return err
+	return nil
 }
 
 func (c *EnrollCmd) fleetServerBootstrap(ctx context.Context) error {
-	c.log.Debug("verifying communication with running elastic-agent daemon")
+	c.log.Debug("verifying communication with running Elastic Agent daemon")
 	_, err := getDaemonStatus(ctx)
 	if err != nil {
 		return errors.New("failed to communicate with elastic-agent daemon; is elastic-agent running?")
diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go
index 8222b57609f..58c99306e71 100644
--- a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go
+++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go
@@ -19,6 +19,7 @@ import (
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/errors"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/warn"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/cli"
+	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/config"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger"
 )
 
diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go
index 4f9c23307b9..85522517c16 100644
--- a/x-pack/elastic-agent/pkg/agent/program/supported.go
+++ b/x-pack/elastic-agent/pkg/agent/program/supported.go
@@ -24,7 +24,7 @@ func init() {
 	// spec/heartbeat.yml
 	// spec/metricbeat.yml
 	// spec/packetbeat.yml
-	unpacked := packer.MustUnpack("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")
+	unpacked := packer.MustUnpack("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")
 	SupportedMap = make(map[string]Spec)
 
 	for f, v := range unpacked {
diff --git a/x-pack/elastic-agent/pkg/core/status/reporter.go b/x-pack/elastic-agent/pkg/core/status/reporter.go
index a8c79be6ede..dfe15a29e0c 100644
--- a/x-pack/elastic-agent/pkg/core/status/reporter.go
+++ b/x-pack/elastic-agent/pkg/core/status/reporter.go
@@ -27,13 +27,10 @@ const (
 	Failed
 )
 
-var (
-	humanReadableStatuses = map[AgentStatusCode]string{
-		Healthy:  "online",
-		Degraded: "degraded",
-		Failed:   "error",
-	}
-)
+// String returns the string value for the agent code.
+func (s AgentStatusCode) String() string {
+	return []string{"online", "degraded", "error"}[s]
+}
 
 // AgentApplicationStatus returns the status of specific application.
 type AgentApplicationStatus struct {
@@ -61,7 +58,7 @@ type Controller interface {
 }
 
 type controller struct {
-	lock         sync.Mutex
+	mx           sync.Mutex
 	status       AgentStatusCode
 	reporters    map[string]*reporter
 	appReporters map[string]*reporter
@@ -86,7 +83,7 @@ func (r *controller) UpdateStateID(stateID string) {
 		return
 	}
 
-	r.lock.Lock()
+	r.mx.Lock()
 
 	r.stateID = stateID
 	// cleanup status for component reporters
@@ -96,12 +93,12 @@ func (r *controller) UpdateStateID(stateID string) {
 			continue
 		}
 
-		rep.lock.Lock()
+		rep.mx.Lock()
 		rep.status = state.Configuring
 		rep.message = ""
-		rep.lock.Unlock()
+		rep.mx.Unlock()
 	}
-	r.lock.Unlock()
+	r.mx.Unlock()
 
 	r.updateStatus()
 }
@@ -113,16 +110,16 @@ func (r *controller) RegisterComponent(componentIdentifier string) Reporter {
 		name:         componentIdentifier,
 		isRegistered: true,
 		unregisterFunc: func() {
-			r.lock.Lock()
+			r.mx.Lock()
 			delete(r.reporters, id)
-			r.lock.Unlock()
+			r.mx.Unlock()
 		},
 		notifyChangeFunc: r.updateStatus,
 	}
 
-	r.lock.Lock()
+	r.mx.Lock()
 	r.reporters[id] = rep
-	r.lock.Unlock()
+	r.mx.Unlock()
 
 	return rep
 }
@@ -135,36 +132,34 @@ func (r *controller) RegisterApp(componentIdentifier string, name string) Report
 		status:       state.Stopped,
 		isRegistered: true,
 		unregisterFunc: func() {
-			r.lock.Lock()
+			r.mx.Lock()
 			delete(r.appReporters, id)
-			r.lock.Unlock()
+			r.mx.Unlock()
 		},
 		notifyChangeFunc: r.updateStatus,
 	}
 
-	r.lock.Lock()
+	r.mx.Lock()
 	r.appReporters[id] = rep
-	r.lock.Unlock()
+	r.mx.Unlock()
 
 	return rep
 }
 
 // Status retrieves current agent status.
 func (r *controller) Status() AgentStatus {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	apps := make([]AgentApplicationStatus, len(r.appReporters))
-	i := 0
+	r.mx.Lock()
+	defer r.mx.Unlock()
+	apps := make([]AgentApplicationStatus, 0, len(r.appReporters))
 	for key, rep := range r.appReporters {
-		rep.lock.Lock()
-		apps[i] = AgentApplicationStatus{
+		rep.mx.Lock()
+		apps = append(apps, AgentApplicationStatus{
 			ID:      key,
 			Name:    rep.name,
 			Status:  rep.status,
 			Message: rep.message,
-		}
-		rep.lock.Unlock()
-		i++
+		})
+		rep.mx.Unlock()
 	}
 	return AgentStatus{
 		Status:       r.status,
@@ -175,22 +170,22 @@ func (r *controller) Status() AgentStatus {
 
 // StatusCode retrieves current agent status code.
 func (r *controller) StatusCode() AgentStatusCode {
-	r.lock.Lock()
-	defer r.lock.Unlock()
+	r.mx.Lock()
+	defer r.mx.Unlock()
 	return r.status
 }
 
 func (r *controller) updateStatus() {
 	status := Healthy
 
-	r.lock.Lock()
+	r.mx.Lock()
 	for id, rep := range r.reporters {
 		s := statusToAgentStatus(rep.status)
 		if s > status {
 			status = s
 		}
 
-		r.log.Debugf("'%s' has status '%s'", id, humanReadableStatuses[s])
+		r.log.Debugf("'%s' has status '%s'", id, s)
 		if status == Failed {
 			break
 		}
@@ -202,7 +197,7 @@ func (r *controller) updateStatus() {
 				status = s
 			}
 
-			r.log.Debugf("'%s' has status '%s'", id, humanReadableStatuses[s])
+			r.log.Debugf("'%s' has status '%s'", id, s)
 			if status == Failed {
 				break
 			}
@@ -214,7 +209,7 @@ func (r *controller) updateStatus() {
 		r.status = status
 	}
 
-	r.lock.Unlock()
+	r.mx.Unlock()
 
 }
 
@@ -226,12 +221,12 @@ func (r *controller) logStatus(status AgentStatusCode) {
 		logFn = r.log.Errorf
 	}
 
-	logFn("Elastic Agent status changed to: '%s'", humanReadableStatuses[status])
+	logFn("Elastic Agent status changed to: '%s'", status)
 }
 
 // StatusString retrieves human readable string of current agent status.
 func (r *controller) StatusString() string {
-	return humanReadableStatuses[r.StatusCode()]
+	return r.StatusCode().String()
 }
 
 // Reporter reports status of component
@@ -242,7 +237,7 @@ type Reporter interface {
 
 type reporter struct {
 	name             string
-	lock             sync.Mutex
+	mx               sync.Mutex
 	isRegistered     bool
 	status           state.Status
 	message          string
@@ -252,8 +247,8 @@ type reporter struct {
 
 // Update updates the status of a component.
 func (r *reporter) Update(s state.Status, message string) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
+	r.mx.Lock()
+	defer r.mx.Unlock()
 
 	if !r.isRegistered {
 		return
@@ -268,8 +263,8 @@ func (r *reporter) Update(s state.Status, message string) {
 // Unregister unregister status from reporter. Reporter will no longer be taken into consideration
 // for overall status computation.
 func (r *reporter) Unregister() {
-	r.lock.Lock()
-	defer r.lock.Unlock()
+	r.mx.Lock()
+	defer r.mx.Unlock()
 
 	r.isRegistered = false
 	r.unregisterFunc()