diff --git a/pkg/pillar/cmd/zedagent/handlemetrics.go b/pkg/pillar/cmd/zedagent/handlemetrics.go
index 40ff04dc69..43c601f806 100644
--- a/pkg/pillar/cmd/zedagent/handlemetrics.go
+++ b/pkg/pillar/cmd/zedagent/handlemetrics.go
@@ -147,6 +147,7 @@ func encodeTestResults(tr types.TestResults) *info.ErrorInfo {
 	if tr.HasError() {
 		timestamp = tr.LastFailed
 		errInfo.Description = tr.LastError
+		errInfo.Severity = info.Severity_SEVERITY_ERROR
 	} else {
 		timestamp = tr.LastSucceeded
 	}
diff --git a/pkg/pillar/cmd/zedagent/handlenetworkinstance.go b/pkg/pillar/cmd/zedagent/handlenetworkinstance.go
index f4b07cfd74..5c4e952ec1 100644
--- a/pkg/pillar/cmd/zedagent/handlenetworkinstance.go
+++ b/pkg/pillar/cmd/zedagent/handlenetworkinstance.go
@@ -88,6 +88,7 @@ func prepareAndPublishNetworkInstanceInfoMsg(ctx *zedagentContext,
 			errInfo.Description = status.Error
 			errTime, _ := ptypes.TimestampProto(status.ErrorTime)
 			errInfo.Timestamp = errTime
+			errInfo.Severity = zinfo.Severity(status.ErrorSeverity)
 			info.NetworkErr = append(info.NetworkErr, errInfo)
 			info.State = zinfo.ZNetworkInstanceState_ZNETINST_STATE_ERROR
 		} else if status.ChangeInProgress != types.ChangeInProgressTypeNone {
diff --git a/pkg/pillar/cmd/zedagent/reportinfo.go b/pkg/pillar/cmd/zedagent/reportinfo.go
index ba27225913..bee6f53eab 100644
--- a/pkg/pillar/cmd/zedagent/reportinfo.go
+++ b/pkg/pillar/cmd/zedagent/reportinfo.go
@@ -532,6 +532,7 @@ func PublishDeviceInfoToZedCloud(ctx *zedagentContext, dest destinationBitset) {
 		if ib.Error != "" {
 			errInfo := new(info.ErrorInfo)
 			errInfo.Description = ib.Error
+			errInfo.Severity = info.Severity_SEVERITY_ERROR
 			if !ib.ErrorTime.IsZero() {
 				protoTime, err := ptypes.TimestampProto(ib.ErrorTime)
 				if err == nil {