diff --git a/pkg/errors/codes/codes.go b/pkg/errors/codes/codes.go
index 1c953f53..81fc5e48 100644
--- a/pkg/errors/codes/codes.go
+++ b/pkg/errors/codes/codes.go
@@ -60,6 +60,7 @@ const (
 	VolumeAccessInconsistent
 	PreCheckFailed
 	ProviderNotReady
+	InconsistentVersion
 	// This is not a valid code, it is used to get the maximum code value.
 	// Any new codes should be defined above this.
 	_maxCode
diff --git a/pkg/errors/codes/codes_string.go b/pkg/errors/codes/codes_string.go
index d6f25214..2acdb4e3 100644
--- a/pkg/errors/codes/codes_string.go
+++ b/pkg/errors/codes/codes_string.go
@@ -113,6 +113,8 @@ func (c MocCode) String() string {
 		return "PreCheckFailed"
 	case ProviderNotReady:
 		return "ProviderNotReady"
+	case InconsistentVersion:
+		return "InconsistentVersion"
 	default:
 		return "MocCode(" + strconv.FormatUint(uint64(c), 10) + ")"
 	}
diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go
index 80b90d2f..473c18f8 100644
--- a/pkg/errors/errors.go
+++ b/pkg/errors/errors.go
@@ -134,6 +134,7 @@ var (
 	IPOutOfRange                error = NewMocError(moccodes.IPOutOfRange)
 	PreCheckFailed              error = NewMocError(moccodes.PreCheckFailed)
 	ProviderNotReady            error = NewMocError(moccodes.ProviderNotReady)
+	InconsistentVersion         error = NewMocError(moccodes.InconsistentVersion)
 )
 
 // legacyErrorMessages - map of error codes to their legacy string representation. This is solely for backwards compatibility
@@ -570,6 +571,10 @@ func IsProviderNotReady(err error) bool {
 	return checkError(err, ProviderNotReady)
 }
 
+func IsInconsistentVersion(err error) bool {
+	return checkError(err, InconsistentVersion)
+}
+
 // checkError checks if the wrappedError has the same MocCode as the err error according to GetMocErrorCode.
 // If the error is not matched by GetMocErrorCode and the error does not have a GRPC code (or is a GRPC Unknown code),
 // it will attempt to match the error strings through string matching (even for multierrors).
diff --git a/rpc/common/admin/health/moc_common_health.proto b/rpc/common/admin/health/moc_common_health.proto
index 93df4ee7..9e1e2482 100644
--- a/rpc/common/admin/health/moc_common_health.proto
+++ b/rpc/common/admin/health/moc_common_health.proto
@@ -26,6 +26,7 @@ message AgentInfoResponse{
 	google.protobuf.BoolValue Result = 2;
 	string  Error = 3;
 	string deploymentId = 4;
+	string version = 5;
 }
 
 service HealthAgent {
diff --git a/rpc/common/admin/moc_common_health.pb.go b/rpc/common/admin/moc_common_health.pb.go
index 544ebdfa..156ab846 100644
--- a/rpc/common/admin/moc_common_health.pb.go
+++ b/rpc/common/admin/moc_common_health.pb.go
@@ -134,6 +134,7 @@ type AgentInfoResponse struct {
 	Result               *wrappers.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
 	Error                string              `protobuf:"bytes,3,opt,name=Error,proto3" json:"Error,omitempty"`
 	DeploymentId         string              `protobuf:"bytes,4,opt,name=deploymentId,proto3" json:"deploymentId,omitempty"`
+	Version              string              `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -192,6 +193,13 @@ func (m *AgentInfoResponse) GetDeploymentId() string {
 	return ""
 }
 
+func (m *AgentInfoResponse) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*HealthRequest)(nil), "moc.common.admin.HealthRequest")
 	proto.RegisterType((*HealthResponse)(nil), "moc.common.admin.HealthResponse")
@@ -203,33 +211,34 @@ func init() {
 }
 
 var fileDescriptor_4d110a1beda4379f = []byte{
-	// 416 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x4d, 0x6f, 0xd4, 0x30,
-	0x10, 0xad, 0xa1, 0x5b, 0xb5, 0x4e, 0xbb, 0x2a, 0x56, 0x05, 0x21, 0x48, 0x10, 0x05, 0x54, 0x05,
-	0x21, 0xd9, 0x52, 0x38, 0x70, 0xa6, 0xa8, 0x02, 0x0e, 0x70, 0x70, 0x25, 0x0e, 0x5c, 0xaa, 0x7c,
-	0x4c, 0x3e, 0x44, 0xec, 0x09, 0x8e, 0x23, 0xd4, 0x3f, 0xc3, 0x1f, 0xe0, 0xc2, 0x4f, 0x44, 0xb1,
-	0xb7, 0xab, 0xed, 0xae, 0xb8, 0xf5, 0xe8, 0xf7, 0x9e, 0x67, 0xde, 0x9b, 0x19, 0xfa, 0x2a, 0xaf,
-	0x54, 0xa7, 0x45, 0x0b, 0x79, 0x6f, 0x5b, 0xa1, 0xb0, 0xbc, 0x2e, 0x51, 0x29, 0xd4, 0xd7, 0x1e,
-	0xe1, 0x83, 0x41, 0x8b, 0xec, 0x54, 0x61, 0xc9, 0x3d, 0xc1, 0xdd, 0x87, 0xe8, 0x59, 0x83, 0xd8,
-	0xf4, 0x20, 0x1c, 0x5f, 0x4c, 0xb5, 0x00, 0x35, 0xd8, 0x1b, 0x2f, 0x8f, 0x9e, 0x6f, 0x93, 0xbf,
-	0x4c, 0x3e, 0x0c, 0x60, 0xc6, 0x15, 0xff, 0x64, 0xa3, 0xcf, 0xaa, 0xaa, 0x27, 0x9e, 0x6e, 0x10,
-	0x1a, 0x2b, 0xe8, 0x74, 0x8d, 0x9e, 0x4a, 0xde, 0xd1, 0x93, 0x4f, 0xce, 0x92, 0x84, 0x9f, 0x13,
-	0x8c, 0x96, 0x9d, 0xd3, 0xa5, 0xed, 0x14, 0xe0, 0x64, 0xaf, 0xa0, 0x44, 0x5d, 0x8d, 0x21, 0x89,
-	0x49, 0x7a, 0x22, 0xb7, 0xd0, 0xe4, 0x37, 0xa1, 0xcb, 0xdb, 0x9f, 0xe3, 0x80, 0x7a, 0x04, 0x96,
-	0xd1, 0x03, 0x09, 0xe3, 0xd4, 0xdb, 0xf0, 0x41, 0x4c, 0xd2, 0x20, 0x8b, 0xb8, 0x37, 0xcc, 0x6f,
-	0x0d, 0xf3, 0x0b, 0xc4, 0xfe, 0x5b, 0xde, 0x4f, 0x20, 0x57, 0x4a, 0x76, 0x46, 0x17, 0x97, 0xc6,
-	0xa0, 0x09, 0x1f, 0xc6, 0x24, 0x3d, 0x92, 0xfe, 0xc1, 0xce, 0xe9, 0xe2, 0xca, 0xe6, 0x16, 0xc2,
-	0xfd, 0x98, 0xa4, 0xcb, 0xec, 0x94, 0xcf, 0x83, 0xf2, 0xdd, 0x1c, 0x2e, 0x3d, 0xcd, 0x22, 0x7a,
-	0x28, 0xa1, 0x40, 0xb4, 0x50, 0x85, 0x8b, 0x98, 0xa4, 0x87, 0x72, 0xfd, 0x4e, 0xfe, 0x10, 0xfa,
-	0xe8, 0x7d, 0x03, 0xda, 0x7e, 0xd6, 0x35, 0xae, 0x3d, 0xa6, 0x74, 0x7f, 0x9e, 0x80, 0x0b, 0x15,
-	0x64, 0x67, 0x7c, 0x63, 0x03, 0x5f, 0xb1, 0x02, 0xa7, 0x75, 0x8a, 0x7b, 0x4c, 0x93, 0xd0, 0xe3,
-	0x0a, 0x86, 0x1e, 0x6f, 0xd4, 0xec, 0xa6, 0x72, 0xa1, 0x8e, 0xe4, 0x1d, 0x2c, 0xfb, 0x4b, 0x68,
-	0xe0, 0x03, 0x3a, 0xcf, 0x4c, 0xd2, 0xe0, 0x43, 0x0b, 0xe5, 0x0f, 0x8f, 0xb1, 0x17, 0x7c, 0xfb,
-	0x54, 0xf8, 0x9d, 0xb5, 0x45, 0xf1, 0xff, 0x05, 0x3e, 0x79, 0xb2, 0xc7, 0xbe, 0xd0, 0xe3, 0x8f,
-	0x60, 0xd7, 0x33, 0x61, 0x8f, 0x77, 0x12, 0x5d, 0xce, 0xd7, 0x16, 0xbd, 0xdc, 0xad, 0xb5, 0x33,
-	0xc8, 0x64, 0xef, 0xe2, 0xcd, 0xf7, 0xd7, 0x4d, 0x67, 0xdb, 0xa9, 0x98, 0xa5, 0x42, 0x75, 0xa5,
-	0xc1, 0x11, 0x6b, 0x3b, 0x5f, 0xbb, 0x30, 0x43, 0x29, 0x7c, 0x01, 0xe1, 0x0a, 0x14, 0x07, 0xae,
-	0xc7, 0xdb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x88, 0xf2, 0xbc, 0x19, 0x03, 0x00, 0x00,
+	// 431 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x4d, 0x6f, 0xd4, 0x30,
+	0x10, 0xad, 0xa1, 0x5b, 0xba, 0xde, 0x76, 0x55, 0xac, 0x0a, 0x42, 0x90, 0x20, 0x0a, 0xa8, 0x0a,
+	0x42, 0xb2, 0xa5, 0x70, 0xe0, 0x4c, 0x51, 0x05, 0x1c, 0xe0, 0xe0, 0x4a, 0x1c, 0xb8, 0x54, 0xd9,
+	0x64, 0x76, 0x13, 0x11, 0x7b, 0x82, 0xed, 0x80, 0xfa, 0x67, 0xf8, 0x0d, 0xfc, 0x09, 0xfe, 0x17,
+	0x8a, 0xbd, 0xbb, 0xda, 0x0f, 0x71, 0xeb, 0x71, 0xe6, 0x3d, 0xcf, 0xbc, 0xf7, 0x6c, 0xd3, 0x97,
+	0x45, 0xa5, 0x1a, 0x2d, 0x6a, 0x28, 0x5a, 0x57, 0x0b, 0x85, 0xe5, 0x4d, 0x89, 0x4a, 0xa1, 0xbe,
+	0x09, 0x1d, 0xde, 0x19, 0x74, 0xc8, 0xce, 0x14, 0x96, 0x3c, 0x00, 0xdc, 0x1f, 0x88, 0x9f, 0x2e,
+	0x10, 0x17, 0x2d, 0x08, 0x8f, 0xcf, 0xfa, 0xb9, 0x00, 0xd5, 0xb9, 0xdb, 0x40, 0x8f, 0x9f, 0xed,
+	0x82, 0xbf, 0x4c, 0xd1, 0x75, 0x60, 0xec, 0x12, 0x7f, 0xbc, 0xb1, 0x67, 0x39, 0x35, 0x00, 0x4f,
+	0x36, 0x00, 0x8d, 0x15, 0x34, 0x7a, 0x8e, 0x01, 0x4a, 0xdf, 0xd2, 0xd3, 0x8f, 0x5e, 0x92, 0x84,
+	0x1f, 0x3d, 0x58, 0xc7, 0x2e, 0xe8, 0xd4, 0x35, 0x0a, 0xb0, 0x77, 0xd7, 0x50, 0xa2, 0xae, 0x6c,
+	0x44, 0x12, 0x92, 0x9d, 0xca, 0x9d, 0x6e, 0xfa, 0x9b, 0xd0, 0xe9, 0xea, 0xa4, 0xed, 0x50, 0x5b,
+	0x60, 0x39, 0x3d, 0x92, 0x60, 0xfb, 0xd6, 0x45, 0xf7, 0x12, 0x92, 0x4d, 0xf2, 0x98, 0x07, 0xc1,
+	0x7c, 0x25, 0x98, 0x5f, 0x22, 0xb6, 0x5f, 0x8b, 0xb6, 0x07, 0xb9, 0x64, 0xb2, 0x73, 0x3a, 0xba,
+	0x32, 0x06, 0x4d, 0x74, 0x3f, 0x21, 0xd9, 0x58, 0x86, 0x82, 0x5d, 0xd0, 0xd1, 0xb5, 0x2b, 0x1c,
+	0x44, 0x87, 0x09, 0xc9, 0xa6, 0xf9, 0x19, 0x1f, 0x82, 0x0a, 0xdb, 0x7c, 0x5f, 0x06, 0x98, 0xc5,
+	0xf4, 0x58, 0xc2, 0x0c, 0xd1, 0x41, 0x15, 0x8d, 0x12, 0x92, 0x1d, 0xcb, 0x75, 0x9d, 0xfe, 0x25,
+	0xf4, 0xe1, 0xbb, 0x05, 0x68, 0xf7, 0x49, 0xcf, 0x71, 0xad, 0x31, 0xa3, 0x87, 0x43, 0x02, 0xde,
+	0xd4, 0x24, 0x3f, 0xe7, 0x1b, 0x37, 0xf0, 0x05, 0x2b, 0xf0, 0x5c, 0xcf, 0xb8, 0x43, 0x37, 0x29,
+	0x3d, 0xa9, 0xa0, 0x6b, 0xf1, 0x56, 0x0d, 0x6a, 0x2a, 0x6f, 0x6a, 0x2c, 0xb7, 0x7a, 0x2c, 0xa2,
+	0x0f, 0x7e, 0x82, 0xb1, 0x0d, 0x6a, 0x6f, 0x64, 0x2c, 0x57, 0x65, 0xfe, 0x87, 0xd0, 0x49, 0xb0,
+	0xee, 0xdd, 0x30, 0x49, 0x27, 0xef, 0x6b, 0x28, 0xbf, 0x87, 0x1e, 0x7b, 0xce, 0x77, 0x1f, 0x11,
+	0xdf, 0xba, 0xd0, 0x38, 0xf9, 0x3f, 0x21, 0x64, 0x92, 0x1e, 0xb0, 0xcf, 0xf4, 0xe4, 0x03, 0xb8,
+	0x75, 0x5a, 0xec, 0xd1, 0x9e, 0xd7, 0xab, 0xe1, 0x1d, 0xc6, 0x2f, 0xf6, 0x67, 0xed, 0x45, 0x9c,
+	0x1e, 0x5c, 0xbe, 0xfe, 0xf6, 0x6a, 0xd1, 0xb8, 0xba, 0x9f, 0x0d, 0x54, 0xa1, 0x9a, 0xd2, 0xa0,
+	0xc5, 0xb9, 0x1b, 0xfe, 0x81, 0x30, 0x5d, 0x29, 0xc2, 0x00, 0xe1, 0x07, 0xcc, 0x8e, 0xfc, 0x8e,
+	0x37, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, 0x1e, 0x7f, 0x78, 0x33, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.