diff --git a/api/api.pb.go b/api/api.pb.go
index 78d99174a..891ee283b 100644
--- a/api/api.pb.go
+++ b/api/api.pb.go
@@ -205,6 +205,9 @@ type VersionReply = machine.VersionReply
 // VersionInfo from public import machine/machine.proto
 type VersionInfo = machine.VersionInfo
 
+// PlatformInfo from public import machine/machine.proto
+type PlatformInfo = machine.PlatformInfo
+
 // LogsRequest from public import machine/machine.proto
 type LogsRequest = machine.LogsRequest
 
diff --git a/api/machine/machine.pb.go b/api/machine/machine.pb.go
index e51a34360..dff9fce7a 100644
--- a/api/machine/machine.pb.go
+++ b/api/machine/machine.pb.go
@@ -1787,6 +1787,7 @@ func (m *MountStat) GetMountedOn() string {
 type VersionResponse struct {
 	Metadata             *common.NodeMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	Version              *VersionInfo         `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	Platform             *PlatformInfo        `protobuf:"bytes,3,opt,name=platform,proto3" json:"platform,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -1835,6 +1836,13 @@ func (m *VersionResponse) GetVersion() *VersionInfo {
 	return nil
 }
 
+func (m *VersionResponse) GetPlatform() *PlatformInfo {
+	if m != nil {
+		return m.Platform
+	}
+	return nil
+}
+
 type VersionReply struct {
 	Response             []*VersionResponse `protobuf:"bytes,1,rep,name=response,proto3" json:"response,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
@@ -1961,6 +1969,57 @@ func (m *VersionInfo) GetArch() string {
 	return ""
 }
 
+type PlatformInfo struct {
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Mode                 string   `protobuf:"bytes,2,opt,name=mode,proto3" json:"mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PlatformInfo) Reset()         { *m = PlatformInfo{} }
+func (m *PlatformInfo) String() string { return proto.CompactTextString(m) }
+func (*PlatformInfo) ProtoMessage()    {}
+func (*PlatformInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_84b4f59d98cc997c, []int{38}
+}
+
+func (m *PlatformInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PlatformInfo.Unmarshal(m, b)
+}
+
+func (m *PlatformInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PlatformInfo.Marshal(b, m, deterministic)
+}
+
+func (m *PlatformInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlatformInfo.Merge(m, src)
+}
+
+func (m *PlatformInfo) XXX_Size() int {
+	return xxx_messageInfo_PlatformInfo.Size(m)
+}
+
+func (m *PlatformInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_PlatformInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PlatformInfo proto.InternalMessageInfo
+
+func (m *PlatformInfo) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *PlatformInfo) GetMode() string {
+	if m != nil {
+		return m.Mode
+	}
+	return ""
+}
+
 // rpc logs
 // The request message containing the process name.
 type LogsRequest struct {
@@ -1977,7 +2036,7 @@ func (m *LogsRequest) Reset()         { *m = LogsRequest{} }
 func (m *LogsRequest) String() string { return proto.CompactTextString(m) }
 func (*LogsRequest) ProtoMessage()    {}
 func (*LogsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_84b4f59d98cc997c, []int{38}
+	return fileDescriptor_84b4f59d98cc997c, []int{39}
 }
 
 func (m *LogsRequest) XXX_Unmarshal(b []byte) error {
@@ -2062,104 +2121,108 @@ func init() {
 	proto.RegisterType((*VersionResponse)(nil), "machine.VersionResponse")
 	proto.RegisterType((*VersionReply)(nil), "machine.VersionReply")
 	proto.RegisterType((*VersionInfo)(nil), "machine.VersionInfo")
+	proto.RegisterType((*PlatformInfo)(nil), "machine.PlatformInfo")
 	proto.RegisterType((*LogsRequest)(nil), "machine.LogsRequest")
 }
 
 func init() { proto.RegisterFile("machine/machine.proto", fileDescriptor_84b4f59d98cc997c) }
 
 var fileDescriptor_84b4f59d98cc997c = []byte{
-	// 1456 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xe9, 0x6e, 0x1b, 0x37,
-	0x10, 0x86, 0x64, 0x5b, 0xc7, 0x48, 0x96, 0x13, 0xfa, 0x88, 0xa2, 0x38, 0xd7, 0x26, 0x6d, 0x82,
-	0xa0, 0x96, 0x02, 0xe7, 0x40, 0x8e, 0x36, 0x48, 0x1c, 0x27, 0x48, 0x11, 0xdb, 0x09, 0x56, 0x4d,
-	0x7f, 0xb4, 0x45, 0x05, 0x4a, 0xa2, 0x25, 0x22, 0xbb, 0xcb, 0xed, 0x92, 0x72, 0xa0, 0xa2, 0x0f,
-	0x50, 0xf4, 0x6f, 0x1f, 0xa1, 0x2f, 0xd3, 0x7f, 0x7d, 0xa5, 0x82, 0xc7, 0x52, 0xd4, 0xca, 0x72,
-	0x82, 0x38, 0xbf, 0x44, 0x0e, 0x67, 0x67, 0xbe, 0x6f, 0x38, 0x1c, 0x0e, 0x05, 0xeb, 0x21, 0xee,
-	0x0d, 0x69, 0x44, 0x5a, 0xe6, 0xb7, 0x19, 0x27, 0x4c, 0x30, 0x54, 0x34, 0xd3, 0xc6, 0x85, 0x01,
-	0x63, 0x83, 0x80, 0xb4, 0x94, 0xb8, 0x3b, 0x3a, 0x6c, 0x91, 0x30, 0x16, 0x63, 0xad, 0xd5, 0xb8,
-	0x9c, 0x5d, 0x14, 0x34, 0x24, 0x5c, 0xe0, 0x30, 0x36, 0x0a, 0xab, 0x3d, 0x16, 0x86, 0x2c, 0x6a,
-	0xe9, 0x1f, 0x2d, 0xf4, 0x76, 0xa0, 0xe6, 0x93, 0x2e, 0x63, 0xc2, 0x27, 0x3c, 0x66, 0x11, 0x27,
-	0xe8, 0x36, 0x94, 0x42, 0x22, 0x70, 0x1f, 0x0b, 0x5c, 0xcf, 0x5d, 0xc9, 0xdd, 0xac, 0x6c, 0xaf,
-	0x35, 0xcd, 0x27, 0x07, 0xac, 0x4f, 0xf6, 0xcd, 0x9a, 0x6f, 0xb5, 0xbc, 0x1d, 0xa8, 0xa4, 0x36,
-	0xe2, 0x60, 0x8c, 0xee, 0x40, 0x29, 0x31, 0xc6, 0xea, 0xb9, 0x2b, 0x0b, 0x37, 0x2b, 0xdb, 0xe7,
-	0x9a, 0x29, 0xa1, 0x69, 0x5f, 0xbe, 0x55, 0xf4, 0x9e, 0xc1, 0xb2, 0x4f, 0x38, 0x39, 0x0d, 0x8c,
-	0xa7, 0x00, 0xc6, 0x84, 0x44, 0xb1, 0x3d, 0x83, 0x62, 0xc3, 0x41, 0xe1, 0x78, 0x72, 0x40, 0xec,
-	0xc2, 0x99, 0xf6, 0x70, 0x24, 0xfa, 0xec, 0x43, 0x74, 0x0a, 0x1c, 0x2f, 0x61, 0x79, 0x62, 0x45,
-	0x42, 0xb9, 0x37, 0x03, 0xe5, 0xbc, 0x85, 0x92, 0xf5, 0xe7, 0xa0, 0xf9, 0x1a, 0x6a, 0xef, 0xe2,
-	0x41, 0x82, 0xfb, 0xc4, 0x27, 0xbf, 0x8d, 0x08, 0x17, 0x68, 0x0d, 0x96, 0x68, 0x88, 0x07, 0x44,
-	0x01, 0x29, 0xfb, 0x7a, 0xe2, 0xbd, 0x83, 0x15, 0xab, 0xf7, 0xb9, 0xa0, 0xd1, 0x19, 0x58, 0xc0,
-	0xbd, 0xf7, 0xf5, 0xbc, 0x32, 0x2c, 0x87, 0xde, 0x2e, 0x54, 0xad, 0x59, 0xc9, 0xe2, 0xee, 0x0c,
-	0x8b, 0xba, 0x65, 0x91, 0xf1, 0xef, 0x90, 0x18, 0xc3, 0x6a, 0x9b, 0x24, 0x47, 0xb4, 0x47, 0xf6,
-	0x28, 0x3f, 0xc5, 0xee, 0xca, 0x2f, 0xb8, 0x36, 0xc4, 0xeb, 0x79, 0xe5, 0x7e, 0x6d, 0x12, 0x44,
-	0xbd, 0xf0, 0x7d, 0x74, 0xc8, 0x7c, 0xab, 0xe5, 0xed, 0xc1, 0x99, 0x29, 0xd7, 0x92, 0xc4, 0x83,
-	0x19, 0x12, 0x9b, 0x59, 0x2b, 0x2e, 0x4e, 0x87, 0xc8, 0xdf, 0x39, 0xa8, 0x38, 0x7e, 0x50, 0x0d,
-	0xf2, 0xb4, 0x6f, 0x36, 0x22, 0x4f, 0xfb, 0x72, 0x6f, 0xb8, 0xc0, 0x82, 0x98, 0x10, 0xea, 0x09,
-	0x6a, 0x42, 0x81, 0x1c, 0x91, 0x48, 0xf0, 0xfa, 0x82, 0x62, 0xb9, 0x91, 0xf5, 0xf6, 0x42, 0xad,
-	0xfa, 0x46, 0x4b, 0xea, 0x0f, 0x09, 0x0e, 0xc4, 0xb0, 0xbe, 0x78, 0xbc, 0xfe, 0x2b, 0xb5, 0xea,
-	0x1b, 0x2d, 0xef, 0x09, 0x2c, 0x4f, 0x19, 0x42, 0x5b, 0xd6, 0xa1, 0xa6, 0xb7, 0x7e, 0xac, 0xc3,
-	0xd4, 0x9f, 0xd7, 0x85, 0xaa, 0x2b, 0x97, 0x69, 0x10, 0xf2, 0x81, 0xa1, 0x25, 0x87, 0x73, 0x78,
-	0xdd, 0x82, 0xbc, 0xe5, 0xd4, 0x68, 0xea, 0xca, 0xd3, 0x4c, 0x2b, 0x4f, 0xf3, 0x87, 0xb4, 0xf2,
-	0xf8, 0x79, 0xc1, 0xbd, 0x7f, 0x72, 0x16, 0xa4, 0x46, 0x8f, 0xea, 0x50, 0x1c, 0x45, 0xef, 0x23,
-	0xf6, 0x21, 0x52, 0x9e, 0x4a, 0x7e, 0x3a, 0x95, 0x2b, 0x9a, 0xd9, 0x58, 0xf9, 0x2b, 0xf9, 0xe9,
-	0x14, 0x5d, 0x85, 0x6a, 0x80, 0xb9, 0xe8, 0x84, 0x84, 0x73, 0x79, 0x04, 0x16, 0x14, 0x9c, 0x8a,
-	0x94, 0xed, 0x6b, 0x11, 0x7a, 0x0c, 0x6a, 0xda, 0xe9, 0x0d, 0x71, 0x34, 0x20, 0x26, 0x82, 0x27,
-	0xa1, 0x03, 0xa9, 0xfe, 0x5c, 0x69, 0x7b, 0x5f, 0xd9, 0x44, 0x6d, 0x0b, 0x9c, 0x88, 0xf4, 0xc8,
-	0x65, 0xb6, 0xd9, 0xfb, 0x05, 0xd6, 0xa6, 0xd5, 0x3e, 0x3b, 0xa1, 0x11, 0x2c, 0xca, 0xe4, 0x32,
-	0x71, 0x55, 0x63, 0xef, 0x00, 0xce, 0x4e, 0x5b, 0x97, 0x39, 0xfb, 0x70, 0x26, 0x67, 0x2f, 0x66,
-	0x37, 0x75, 0x0a, 0x8b, 0x93, 0xb4, 0xd7, 0x01, 0x59, 0x0d, 0x16, 0xcf, 0xe3, 0xf4, 0xb3, 0x43,
-	0x5d, 0x6a, 0x7d, 0x51, 0x4a, 0x93, 0x53, 0xa8, 0x8d, 0x7f, 0xe2, 0x29, 0x74, 0x91, 0x38, 0x84,
-	0x6e, 0xc0, 0xba, 0x51, 0xf0, 0xe5, 0x1e, 0xce, 0xdf, 0xa7, 0x5f, 0x61, 0x23, 0xab, 0xf8, 0x45,
-	0x69, 0xf9, 0x36, 0x66, 0xd6, 0xbe, 0x64, 0xf6, 0x78, 0x86, 0xd9, 0xe5, 0x2c, 0xb3, 0x0c, 0x1e,
-	0x87, 0x9c, 0x07, 0xd5, 0x93, 0x72, 0xef, 0x51, 0xbe, 0x9e, 0xf3, 0xae, 0x03, 0x38, 0xa9, 0x91,
-	0x22, 0xcb, 0x4d, 0x90, 0x29, 0xad, 0xab, 0x50, 0x39, 0x61, 0xc3, 0x95, 0xca, 0x35, 0x28, 0x4f,
-	0x36, 0x64, 0x9e, 0x9d, 0xef, 0x60, 0xb9, 0x2d, 0x12, 0x82, 0x43, 0x1a, 0x0d, 0x76, 0x65, 0x28,
-	0xd6, 0x60, 0xa9, 0x3b, 0x16, 0x84, 0x2b, 0xcd, 0xaa, 0xaf, 0x27, 0x68, 0x03, 0x0a, 0x24, 0x49,
-	0x58, 0xc2, 0x4d, 0x88, 0xcc, 0xcc, 0xdb, 0x82, 0xda, 0x73, 0x16, 0x8f, 0xdf, 0x8c, 0x2c, 0xa5,
-	0x0b, 0x50, 0x4e, 0x18, 0x13, 0x9d, 0x18, 0x8b, 0xa1, 0xf1, 0x56, 0x92, 0x82, 0xb7, 0x58, 0x0c,
-	0xbd, 0x2e, 0x94, 0xf7, 0xda, 0xa9, 0xa6, 0x84, 0xc4, 0x98, 0xb0, 0x90, 0x18, 0x13, 0xb2, 0x3a,
-	0x24, 0xa4, 0x37, 0x4a, 0x38, 0x49, 0xab, 0x83, 0x99, 0xa2, 0x1b, 0xb0, 0xa2, 0x87, 0x94, 0x45,
-	0x9d, 0x3e, 0x89, 0xc5, 0x50, 0x15, 0x88, 0x25, 0xbf, 0x66, 0xc5, 0xbb, 0x52, 0xea, 0xfd, 0x9b,
-	0x83, 0xd2, 0x4b, 0x1a, 0xe8, 0x1a, 0x8e, 0x60, 0x31, 0xc2, 0x61, 0x7a, 0x9d, 0xaa, 0xb1, 0x94,
-	0x71, 0xfa, 0xbb, 0x76, 0xb0, 0xe0, 0xab, 0xb1, 0x94, 0x85, 0xac, 0xaf, 0x6b, 0xce, 0xb2, 0xaf,
-	0xc6, 0xa8, 0x01, 0xa5, 0x90, 0xf5, 0xe9, 0x21, 0x25, 0x7d, 0x55, 0x69, 0x16, 0x7c, 0x3b, 0x47,
-	0xeb, 0x50, 0xa0, 0xbc, 0xd3, 0xa7, 0x49, 0x7d, 0x49, 0xc1, 0x5c, 0xa2, 0x7c, 0x97, 0x26, 0x32,
-	0x78, 0x2a, 0x30, 0xf5, 0x82, 0x2e, 0xa5, 0x6a, 0x22, 0x8d, 0x07, 0x34, 0x7a, 0x5f, 0x2f, 0x6a,
-	0x10, 0x72, 0x8c, 0xae, 0xc1, 0x72, 0x42, 0x02, 0x2c, 0xe8, 0x11, 0xe9, 0x28, 0x84, 0x25, 0xb5,
-	0x58, 0x4d, 0x85, 0x07, 0x38, 0x24, 0x5e, 0x00, 0xb5, 0x7d, 0x36, 0x92, 0xb7, 0xc7, 0xe7, 0xa7,
-	0xf6, 0x4d, 0x5d, 0xdd, 0xd3, 0x2b, 0x15, 0xd9, 0x64, 0x55, 0x96, 0xdb, 0x02, 0x0b, 0x5d, 0xf1,
-	0xb9, 0x6c, 0xf2, 0x52, 0x6f, 0x1f, 0x6b, 0xf2, 0xa6, 0x51, 0x39, 0x09, 0xfe, 0x07, 0x94, 0xad,
-	0x5d, 0x74, 0x09, 0xe0, 0x90, 0x06, 0x84, 0x8f, 0xb9, 0x20, 0xa1, 0xd9, 0x02, 0x47, 0x32, 0xb5,
-	0x11, 0x8b, 0x66, 0x23, 0x36, 0xa1, 0x8c, 0x8f, 0x30, 0x0d, 0x70, 0x37, 0xd0, 0xbb, 0xb1, 0xe8,
-	0x4f, 0x04, 0xe8, 0x22, 0x40, 0x28, 0xcd, 0x93, 0x7e, 0x87, 0x45, 0x6a, 0x53, 0xca, 0x7e, 0xd9,
-	0x48, 0xde, 0x44, 0x1e, 0x87, 0x95, 0x1f, 0x89, 0x4a, 0x85, 0x53, 0x04, 0xac, 0x09, 0xc5, 0x23,
-	0x6d, 0x44, 0x01, 0x73, 0xbb, 0x10, 0x63, 0x5c, 0x75, 0x21, 0xa9, 0x92, 0xec, 0xa2, 0xac, 0xd3,
-	0x8f, 0x75, 0x51, 0x19, 0x74, 0x4e, 0xe0, 0xfe, 0xca, 0x41, 0xc5, 0x31, 0x2f, 0xaf, 0x69, 0x81,
-	0xed, 0x35, 0x2d, 0xf0, 0x40, 0x4a, 0xf8, 0x10, 0xa7, 0xfd, 0x1b, 0x1f, 0xea, 0xa3, 0x3a, 0xa2,
-	0x81, 0x30, 0x37, 0xa5, 0x9e, 0xc8, 0x18, 0x0d, 0x58, 0x27, 0xa5, 0x60, 0x62, 0x34, 0x60, 0xc6,
-	0xb8, 0xac, 0x14, 0x8c, 0xab, 0xac, 0x2d, 0xfb, 0x79, 0xc6, 0xe5, 0x26, 0xe0, 0xa4, 0x37, 0x34,
-	0x19, 0xab, 0xc6, 0x5e, 0x00, 0x95, 0x3d, 0x36, 0xe0, 0xe9, 0x41, 0xdd, 0x84, 0xb2, 0x4c, 0x51,
-	0x1e, 0xe3, 0x5e, 0x7a, 0x92, 0x26, 0x02, 0x53, 0x7a, 0xf2, 0xb6, 0x4d, 0x6a, 0x41, 0xa1, 0x9f,
-	0xd0, 0x23, 0x92, 0x28, 0x58, 0xb5, 0xed, 0x73, 0x69, 0xbc, 0x9f, 0xb3, 0x48, 0x60, 0x1a, 0x91,
-	0x64, 0x57, 0x2d, 0xfb, 0x46, 0x6d, 0xfb, 0xbf, 0x22, 0x14, 0xf7, 0x75, 0x80, 0xd0, 0xb7, 0x50,
-	0x34, 0xf5, 0x04, 0x4d, 0xb2, 0x6d, 0xba, 0xc2, 0x34, 0x9c, 0x8e, 0xc9, 0xad, 0x5c, 0xb7, 0x73,
-	0xe8, 0x09, 0xc0, 0xeb, 0x51, 0x97, 0xf4, 0x58, 0x74, 0x48, 0x07, 0x68, 0x63, 0xa6, 0x2f, 0x78,
-	0x21, 0x1f, 0x53, 0x27, 0x7c, 0xbf, 0x05, 0xf9, 0xbd, 0x36, 0x9a, 0x1c, 0x11, 0x5b, 0xab, 0x1a,
-	0x67, 0xad, 0x2c, 0x2d, 0x2d, 0xb7, 0x73, 0xe8, 0x1b, 0x58, 0x94, 0x61, 0x42, 0x93, 0x04, 0x71,
-	0xa2, 0xd6, 0xa8, 0xa6, 0xbc, 0x8d, 0xf1, 0xfb, 0x50, 0xd0, 0xc7, 0x66, 0x2e, 0xb0, 0xb5, 0x99,
-	0xf3, 0x25, 0xf3, 0xe9, 0x3e, 0x14, 0xf4, 0x9b, 0xea, 0x13, 0xbe, 0x73, 0x1f, 0x69, 0x77, 0x61,
-	0x49, 0xbd, 0x82, 0xe6, 0x7e, 0xb6, 0x9a, 0x7d, 0x2d, 0xc9, 0xaf, 0x9e, 0xda, 0x1e, 0x58, 0x76,
-	0xc9, 0x73, 0xbf, 0x3d, 0x7f, 0x7c, 0x4f, 0x2d, 0x2d, 0x1c, 0x40, 0x6d, 0xfa, 0x1e, 0x44, 0x97,
-	0xe6, 0x5e, 0x90, 0x3a, 0x52, 0x9b, 0x73, 0xd7, 0xa5, 0xbd, 0x57, 0xb6, 0x81, 0x55, 0xd7, 0x22,
-	0xda, 0x9c, 0xd3, 0x1a, 0x69, 0x5b, 0x8d, 0x39, 0xab, 0xd2, 0xd2, 0x0b, 0xcb, 0x4d, 0xde, 0x8b,
-	0xe8, 0xc2, 0xf1, 0x1d, 0x89, 0xb6, 0x73, 0xfe, 0xf8, 0x45, 0x69, 0xe6, 0x11, 0x94, 0xd2, 0x37,
-	0xdd, 0xa7, 0xe4, 0xd8, 0xd4, 0x43, 0xf1, 0x21, 0x14, 0xcd, 0x4b, 0xca, 0xc9, 0xef, 0xe9, 0x37,
-	0x60, 0x63, 0x7d, 0x76, 0x41, 0xb7, 0x54, 0x4b, 0x3a, 0x00, 0x4e, 0xc3, 0xef, 0x32, 0x5f, 0xcd,
-	0x8a, 0xe3, 0x60, 0xec, 0x2d, 0xfc, 0x99, 0xcf, 0xa1, 0x7b, 0xb0, 0xa8, 0x08, 0x3b, 0xcf, 0x29,
-	0x87, 0x29, 0xca, 0x48, 0xed, 0x67, 0x0f, 0xa0, 0x98, 0x16, 0x8d, 0x79, 0x34, 0xd7, 0x67, 0x2b,
-	0x5b, 0x1c, 0x8c, 0x77, 0x5e, 0xc3, 0x4a, 0x8f, 0x85, 0x76, 0x0d, 0xc7, 0x74, 0x07, 0xcc, 0x09,
-	0x7f, 0x16, 0xd3, 0xb7, 0xb9, 0x9f, 0x6e, 0x0d, 0xa8, 0x18, 0x8e, 0xba, 0xf2, 0x84, 0xb4, 0x04,
-	0x0e, 0x18, 0xdf, 0xd2, 0x57, 0x02, 0xd7, 0xb3, 0x16, 0x8e, 0x69, 0xfa, 0x0f, 0x49, 0xb7, 0xa0,
-	0x7c, 0xde, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xfc, 0x75, 0x2d, 0x3b, 0x11, 0x00, 0x00,
+	// 1496 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdb, 0x6e, 0x1b, 0x37,
+	0x13, 0xc6, 0xca, 0xb6, 0x0e, 0x23, 0x59, 0x4e, 0xe8, 0x43, 0x14, 0xc5, 0x39, 0x6d, 0xf2, 0xff,
+	0x09, 0x82, 0xdf, 0x72, 0x7e, 0xe7, 0x80, 0x1c, 0xda, 0x20, 0x71, 0x9c, 0x20, 0x45, 0x6c, 0x27,
+	0x58, 0x37, 0xbd, 0x68, 0x8b, 0x0a, 0x94, 0x44, 0x4b, 0x44, 0x76, 0x97, 0xdb, 0x25, 0xe5, 0x40,
+	0x45, 0x1f, 0xa0, 0xe8, 0x6d, 0x1f, 0xa1, 0x40, 0x9f, 0xa5, 0x77, 0x7d, 0xa5, 0x82, 0x87, 0xa5,
+	0xa8, 0x95, 0xe5, 0x04, 0x71, 0xae, 0x44, 0x0e, 0x67, 0x67, 0xbe, 0x6f, 0x38, 0x1c, 0x0e, 0x05,
+	0xab, 0x11, 0xee, 0x0e, 0x68, 0x4c, 0x36, 0xcd, 0x6f, 0x2b, 0x49, 0x99, 0x60, 0xa8, 0x64, 0xa6,
+	0xcd, 0x0b, 0x7d, 0xc6, 0xfa, 0x21, 0xd9, 0x54, 0xe2, 0xce, 0xf0, 0x70, 0x93, 0x44, 0x89, 0x18,
+	0x69, 0xad, 0xe6, 0xe5, 0xfc, 0xa2, 0xa0, 0x11, 0xe1, 0x02, 0x47, 0x89, 0x51, 0x58, 0xee, 0xb2,
+	0x28, 0x62, 0xf1, 0xa6, 0xfe, 0xd1, 0x42, 0x7f, 0x1b, 0xea, 0x01, 0xe9, 0x30, 0x26, 0x02, 0xc2,
+	0x13, 0x16, 0x73, 0x82, 0x6e, 0x43, 0x39, 0x22, 0x02, 0xf7, 0xb0, 0xc0, 0x0d, 0xef, 0x8a, 0x77,
+	0xb3, 0xba, 0xb5, 0xd2, 0x32, 0x9f, 0xec, 0xb3, 0x1e, 0xd9, 0x33, 0x6b, 0x81, 0xd5, 0xf2, 0xb7,
+	0xa1, 0x9a, 0xd9, 0x48, 0xc2, 0x11, 0xba, 0x03, 0xe5, 0xd4, 0x18, 0x6b, 0x78, 0x57, 0xe6, 0x6e,
+	0x56, 0xb7, 0xce, 0xb5, 0x32, 0x42, 0x93, 0xbe, 0x02, 0xab, 0xe8, 0x3f, 0x83, 0xc5, 0x80, 0x70,
+	0x72, 0x1a, 0x18, 0x4f, 0x01, 0x8c, 0x09, 0x89, 0x62, 0x6b, 0x0a, 0xc5, 0x9a, 0x83, 0xc2, 0xf1,
+	0xe4, 0x80, 0xd8, 0x81, 0x33, 0x07, 0x83, 0xa1, 0xe8, 0xb1, 0x0f, 0xf1, 0x29, 0x70, 0xbc, 0x84,
+	0xc5, 0xb1, 0x15, 0x09, 0xe5, 0xde, 0x14, 0x94, 0xf3, 0x16, 0x4a, 0xde, 0x9f, 0x83, 0xe6, 0xbf,
+	0x50, 0x7f, 0x97, 0xf4, 0x53, 0xdc, 0x23, 0x01, 0xf9, 0x79, 0x48, 0xb8, 0x40, 0x2b, 0xb0, 0x40,
+	0x23, 0xdc, 0x27, 0x0a, 0x48, 0x25, 0xd0, 0x13, 0xff, 0x1d, 0x2c, 0x59, 0xbd, 0xcf, 0x05, 0x8d,
+	0xce, 0xc0, 0x1c, 0xee, 0xbe, 0x6f, 0x14, 0x94, 0x61, 0x39, 0xf4, 0x77, 0xa0, 0x66, 0xcd, 0x4a,
+	0x16, 0x77, 0xa7, 0x58, 0x34, 0x2c, 0x8b, 0x9c, 0x7f, 0x87, 0xc4, 0x08, 0x96, 0x0f, 0x48, 0x7a,
+	0x44, 0xbb, 0x64, 0x97, 0xf2, 0x53, 0xec, 0xae, 0xfc, 0x82, 0x6b, 0x43, 0xbc, 0x51, 0x50, 0xee,
+	0x57, 0xc6, 0x41, 0xd4, 0x0b, 0xdf, 0xc4, 0x87, 0x2c, 0xb0, 0x5a, 0xfe, 0x2e, 0x9c, 0x99, 0x70,
+	0x2d, 0x49, 0x3c, 0x98, 0x22, 0xb1, 0x9e, 0xb7, 0xe2, 0xe2, 0x74, 0x88, 0xfc, 0xe1, 0x41, 0xd5,
+	0xf1, 0x83, 0xea, 0x50, 0xa0, 0x3d, 0xb3, 0x11, 0x05, 0xda, 0x93, 0x7b, 0xc3, 0x05, 0x16, 0xc4,
+	0x84, 0x50, 0x4f, 0x50, 0x0b, 0x8a, 0xe4, 0x88, 0xc4, 0x82, 0x37, 0xe6, 0x14, 0xcb, 0xb5, 0xbc,
+	0xb7, 0x17, 0x6a, 0x35, 0x30, 0x5a, 0x52, 0x7f, 0x40, 0x70, 0x28, 0x06, 0x8d, 0xf9, 0xe3, 0xf5,
+	0x5f, 0xa9, 0xd5, 0xc0, 0x68, 0xf9, 0x4f, 0x60, 0x71, 0xc2, 0x10, 0xda, 0xb0, 0x0e, 0x35, 0xbd,
+	0xd5, 0x63, 0x1d, 0x66, 0xfe, 0xfc, 0x0e, 0xd4, 0x5c, 0xb9, 0x4c, 0x83, 0x88, 0xf7, 0x0d, 0x2d,
+	0x39, 0x9c, 0xc1, 0xeb, 0x16, 0x14, 0x2c, 0xa7, 0x66, 0x4b, 0x57, 0x9e, 0x56, 0x56, 0x79, 0x5a,
+	0xdf, 0x66, 0x95, 0x27, 0x28, 0x08, 0xee, 0xff, 0xe9, 0x59, 0x90, 0x1a, 0x3d, 0x6a, 0x40, 0x69,
+	0x18, 0xbf, 0x8f, 0xd9, 0x87, 0x58, 0x79, 0x2a, 0x07, 0xd9, 0x54, 0xae, 0x68, 0x66, 0x23, 0xe5,
+	0xaf, 0x1c, 0x64, 0x53, 0x74, 0x15, 0x6a, 0x21, 0xe6, 0xa2, 0x1d, 0x11, 0xce, 0xe5, 0x11, 0x98,
+	0x53, 0x70, 0xaa, 0x52, 0xb6, 0xa7, 0x45, 0xe8, 0x31, 0xa8, 0x69, 0xbb, 0x3b, 0xc0, 0x71, 0x9f,
+	0x98, 0x08, 0x9e, 0x84, 0x0e, 0xa4, 0xfa, 0x73, 0xa5, 0xed, 0xff, 0xc7, 0x26, 0xea, 0x81, 0xc0,
+	0xa9, 0xc8, 0x8e, 0x5c, 0x6e, 0x9b, 0xfd, 0x1f, 0x61, 0x65, 0x52, 0xed, 0xb3, 0x13, 0x1a, 0xc1,
+	0xbc, 0x4c, 0x2e, 0x13, 0x57, 0x35, 0xf6, 0xf7, 0xe1, 0xec, 0xa4, 0x75, 0x99, 0xb3, 0x0f, 0xa7,
+	0x72, 0xf6, 0x62, 0x7e, 0x53, 0x27, 0xb0, 0x38, 0x49, 0x7b, 0x1d, 0x90, 0xd5, 0x60, 0xc9, 0x2c,
+	0x4e, 0x3f, 0x38, 0xd4, 0xa5, 0xd6, 0x17, 0xa5, 0x34, 0x3e, 0x85, 0xda, 0xf8, 0x27, 0x9e, 0x42,
+	0x17, 0x89, 0x43, 0xe8, 0x06, 0xac, 0x1a, 0x85, 0x40, 0xee, 0xe1, 0xec, 0x7d, 0xfa, 0x09, 0xd6,
+	0xf2, 0x8a, 0x5f, 0x94, 0x56, 0x60, 0x63, 0x66, 0xed, 0x4b, 0x66, 0x8f, 0xa7, 0x98, 0x5d, 0xce,
+	0x33, 0xcb, 0xe1, 0x71, 0xc8, 0xf9, 0x50, 0x3b, 0x29, 0xf7, 0x1e, 0x15, 0x1a, 0x9e, 0x7f, 0x1d,
+	0xc0, 0x49, 0x8d, 0x0c, 0x99, 0x37, 0x46, 0xa6, 0xb4, 0xae, 0x42, 0xf5, 0x84, 0x0d, 0x57, 0x2a,
+	0xd7, 0xa0, 0x32, 0xde, 0x90, 0x59, 0x76, 0xbe, 0x86, 0xc5, 0x03, 0x91, 0x12, 0x1c, 0xd1, 0xb8,
+	0xbf, 0x23, 0x43, 0xb1, 0x02, 0x0b, 0x9d, 0x91, 0x20, 0x5c, 0x69, 0xd6, 0x02, 0x3d, 0x41, 0x6b,
+	0x50, 0x24, 0x69, 0xca, 0x52, 0x6e, 0x42, 0x64, 0x66, 0xfe, 0x06, 0xd4, 0x9f, 0xb3, 0x64, 0xf4,
+	0x66, 0x68, 0x29, 0x5d, 0x80, 0x4a, 0xca, 0x98, 0x68, 0x27, 0x58, 0x0c, 0x8c, 0xb7, 0xb2, 0x14,
+	0xbc, 0xc5, 0x62, 0xe0, 0x77, 0xa0, 0xb2, 0x7b, 0x90, 0x69, 0x4a, 0x48, 0x8c, 0x09, 0x0b, 0x89,
+	0x31, 0x21, 0xab, 0x43, 0x4a, 0xba, 0xc3, 0x94, 0x93, 0xac, 0x3a, 0x98, 0x29, 0xba, 0x01, 0x4b,
+	0x7a, 0x48, 0x59, 0xdc, 0xee, 0x91, 0x44, 0x0c, 0x54, 0x81, 0x58, 0x08, 0xea, 0x56, 0xbc, 0x23,
+	0xa5, 0xfe, 0xdf, 0x1e, 0x94, 0x5f, 0xd2, 0x50, 0xd7, 0x70, 0x04, 0xf3, 0x31, 0x8e, 0xb2, 0xeb,
+	0x54, 0x8d, 0xa5, 0x8c, 0xd3, 0x5f, 0xb4, 0x83, 0xb9, 0x40, 0x8d, 0xa5, 0x2c, 0x62, 0x3d, 0x5d,
+	0x73, 0x16, 0x03, 0x35, 0x46, 0x4d, 0x28, 0x47, 0xac, 0x47, 0x0f, 0x29, 0xe9, 0xa9, 0x4a, 0x33,
+	0x17, 0xd8, 0x39, 0x5a, 0x85, 0x22, 0xe5, 0xed, 0x1e, 0x4d, 0x1b, 0x0b, 0x0a, 0xe6, 0x02, 0xe5,
+	0x3b, 0x34, 0x95, 0xc1, 0x53, 0x81, 0x69, 0x14, 0x75, 0x29, 0x55, 0x13, 0x69, 0x3c, 0xa4, 0xf1,
+	0xfb, 0x46, 0x49, 0x83, 0x90, 0x63, 0x74, 0x0d, 0x16, 0x53, 0x12, 0x62, 0x41, 0x8f, 0x48, 0x5b,
+	0x21, 0x2c, 0xab, 0xc5, 0x5a, 0x26, 0xdc, 0xc7, 0x11, 0xf1, 0x43, 0xa8, 0xef, 0xb1, 0xa1, 0xbc,
+	0x3d, 0x3e, 0x3f, 0xb5, 0x6f, 0xea, 0xea, 0x9e, 0x5d, 0xa9, 0xc8, 0x26, 0xab, 0xb2, 0x7c, 0x20,
+	0xb0, 0xd0, 0x15, 0x9f, 0xcb, 0x26, 0x2f, 0xf3, 0xf6, 0xb1, 0x26, 0x6f, 0x12, 0x95, 0x93, 0xe0,
+	0xbf, 0x42, 0xc5, 0xda, 0x45, 0x97, 0x00, 0x0e, 0x69, 0x48, 0xf8, 0x88, 0x0b, 0x12, 0x99, 0x2d,
+	0x70, 0x24, 0x13, 0x1b, 0x31, 0x6f, 0x36, 0x62, 0x1d, 0x2a, 0xf8, 0x08, 0xd3, 0x10, 0x77, 0x42,
+	0xbd, 0x1b, 0xf3, 0xc1, 0x58, 0x80, 0x2e, 0x02, 0x44, 0xd2, 0x3c, 0xe9, 0xb5, 0x59, 0xac, 0x36,
+	0xa5, 0x12, 0x54, 0x8c, 0xe4, 0x4d, 0xec, 0xff, 0xe5, 0xc1, 0xd2, 0x77, 0x44, 0xe5, 0xc2, 0x29,
+	0x22, 0xd6, 0x82, 0xd2, 0x91, 0x36, 0xa2, 0x90, 0xb9, 0x6d, 0x88, 0x31, 0xae, 0xda, 0x90, 0x4c,
+	0x09, 0xfd, 0x1f, 0xca, 0x49, 0x88, 0xc5, 0x21, 0x4b, 0x23, 0x73, 0x5f, 0x8e, 0xaf, 0xe4, 0xb7,
+	0x66, 0x41, 0x37, 0x2e, 0x99, 0x9a, 0xec, 0xbc, 0x2c, 0xce, 0x8f, 0x75, 0x5e, 0x39, 0x42, 0x4e,
+	0xb0, 0x7f, 0xf7, 0xa0, 0xea, 0x20, 0x92, 0x57, 0xbb, 0xc0, 0xf6, 0x6a, 0x17, 0xb8, 0x2f, 0x25,
+	0x7c, 0x80, 0xb3, 0x9e, 0x8f, 0x0f, 0xf4, 0xf1, 0x1e, 0xd2, 0x50, 0x98, 0xdb, 0x55, 0x4f, 0x64,
+	0x5c, 0xfb, 0xac, 0x9d, 0xb1, 0x36, 0x71, 0xed, 0x33, 0x63, 0x5c, 0x56, 0x17, 0xc6, 0x55, 0xa6,
+	0x57, 0x82, 0x02, 0xe3, 0x72, 0xe3, 0x70, 0xda, 0x1d, 0x98, 0x2c, 0x57, 0x63, 0xff, 0x3e, 0xd4,
+	0x5c, 0xb2, 0xb3, 0x4e, 0x9e, 0x3a, 0x65, 0xa6, 0xcc, 0xca, 0xb1, 0x1f, 0x42, 0x75, 0x97, 0xf5,
+	0x79, 0x56, 0x14, 0xd6, 0xa1, 0x22, 0x55, 0x79, 0x82, 0xbb, 0xd9, 0xb7, 0x63, 0x81, 0x29, 0x73,
+	0x05, 0xdb, 0x92, 0x6d, 0x42, 0xb1, 0x97, 0xd2, 0x23, 0x92, 0x2a, 0x3a, 0xf5, 0xad, 0x73, 0xd9,
+	0xd6, 0x3e, 0x67, 0xb1, 0xc0, 0x34, 0x26, 0xe9, 0x8e, 0x5a, 0x0e, 0x8c, 0xda, 0xd6, 0x3f, 0x25,
+	0x28, 0xed, 0xe9, 0xc0, 0xa2, 0xaf, 0xa0, 0x64, 0x6a, 0x17, 0x1a, 0x67, 0xf6, 0x64, 0x35, 0x6b,
+	0x3a, 0xdd, 0x99, 0x5b, 0x25, 0x6f, 0x7b, 0xe8, 0x09, 0xc0, 0xeb, 0x61, 0x87, 0x74, 0x59, 0x7c,
+	0x48, 0xfb, 0x68, 0x6d, 0xaa, 0x07, 0x79, 0x21, 0x1f, 0x6e, 0x27, 0x7c, 0xbf, 0x01, 0x85, 0xdd,
+	0x03, 0x34, 0x3e, 0x8e, 0xb6, 0x2e, 0x36, 0xcf, 0x5a, 0x59, 0x56, 0xc6, 0x6e, 0x7b, 0xe8, 0x7f,
+	0x30, 0x2f, 0xc3, 0x84, 0xc6, 0xb9, 0xe8, 0x44, 0xad, 0x59, 0xcb, 0x78, 0x1b, 0xe3, 0xf7, 0xa1,
+	0xa8, 0x8f, 0xe8, 0x4c, 0x60, 0x2b, 0x53, 0x67, 0x59, 0xe6, 0xe1, 0x7d, 0x28, 0xea, 0xf7, 0xdb,
+	0x27, 0x7c, 0xe7, 0x3e, 0x08, 0xef, 0xc2, 0x82, 0x7a, 0x71, 0xcd, 0xfc, 0x6c, 0x39, 0xff, 0x32,
+	0x93, 0x5f, 0x3d, 0xb5, 0xfd, 0xb6, 0xec, 0xc8, 0x67, 0x7e, 0x7b, 0xfe, 0xf8, 0xfe, 0x5d, 0x5a,
+	0xd8, 0x87, 0xfa, 0xe4, 0x9d, 0x8b, 0x2e, 0xcd, 0xbc, 0x8c, 0x75, 0xa4, 0xd6, 0x67, 0xae, 0x4b,
+	0x7b, 0xaf, 0x6c, 0xb3, 0xac, 0xae, 0x60, 0xb4, 0x3e, 0xa3, 0x0d, 0xd3, 0xb6, 0x9a, 0x33, 0x56,
+	0xa5, 0xa5, 0x17, 0x96, 0x9b, 0xbc, 0x83, 0xd1, 0x85, 0xe3, 0xbb, 0x1f, 0x6d, 0xe7, 0xfc, 0xf1,
+	0x8b, 0xd2, 0xcc, 0x23, 0x28, 0x67, 0xef, 0xc7, 0x4f, 0xc9, 0xb1, 0x89, 0x47, 0xe9, 0x43, 0x28,
+	0x99, 0x57, 0x9b, 0x93, 0xdf, 0x93, 0xef, 0xcd, 0xe6, 0xea, 0xf4, 0x82, 0x6e, 0xdf, 0x16, 0x74,
+	0x00, 0x9c, 0xc7, 0x85, 0xcb, 0x7c, 0x39, 0x2f, 0x4e, 0xc2, 0x91, 0x3f, 0xf7, 0x5b, 0xc1, 0x43,
+	0xf7, 0x60, 0x5e, 0x11, 0x76, 0x9e, 0x6e, 0x0e, 0x53, 0x94, 0x93, 0xda, 0xcf, 0x1e, 0x40, 0x29,
+	0x2b, 0x36, 0xb3, 0x68, 0xae, 0x4e, 0x57, 0xc4, 0x24, 0x1c, 0x6d, 0xbf, 0x86, 0xa5, 0x2e, 0x8b,
+	0xec, 0x1a, 0x4e, 0xe8, 0x36, 0x98, 0x13, 0xfe, 0x2c, 0xa1, 0x6f, 0xbd, 0xef, 0x6f, 0xf5, 0xa9,
+	0x18, 0x0c, 0x3b, 0xf2, 0x84, 0x6c, 0x0a, 0x1c, 0x32, 0xbe, 0xa1, 0xaf, 0x1f, 0xae, 0x67, 0x9b,
+	0x38, 0xa1, 0xd9, 0xbf, 0x31, 0x9d, 0xa2, 0xf2, 0x79, 0xe7, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xf4, 0x19, 0x0e, 0x69, 0xa7, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/machine/machine.proto b/api/machine/machine.proto
index 77a4ad94a..32c5a8afd 100644
--- a/api/machine/machine.proto
+++ b/api/machine/machine.proto
@@ -233,6 +233,7 @@ message MountStat {
 message VersionResponse {
   common.NodeMetadata metadata = 1;
   VersionInfo version = 2;
+  PlatformInfo platform = 3;
 }
 
 message VersionReply {
@@ -248,6 +249,11 @@ message VersionInfo {
   string arch = 6;
 }
 
+message PlatformInfo {
+  string name = 1;
+  string mode = 2;
+}
+
 // rpc logs
 // The request message containing the process name.
 message LogsRequest {
diff --git a/internal/app/machined/internal/api/reg/reg.go b/internal/app/machined/internal/api/reg/reg.go
index 88d64faa8..6308827a6 100644
--- a/internal/app/machined/internal/api/reg/reg.go
+++ b/internal/app/machined/internal/api/reg/reg.go
@@ -32,6 +32,7 @@ import (
 	"github.com/talos-systems/talos/internal/pkg/etcd"
 	"github.com/talos-systems/talos/internal/pkg/event"
 	"github.com/talos-systems/talos/internal/pkg/runtime"
+	"github.com/talos-systems/talos/internal/pkg/runtime/platform"
 	"github.com/talos-systems/talos/pkg/archiver"
 	"github.com/talos-systems/talos/pkg/chunker"
 	filechunker "github.com/talos-systems/talos/pkg/chunker/file"
@@ -46,13 +47,21 @@ const OSPathSeparator = string(os.PathSeparator)
 // Registrator is the concrete type that implements the factory.Registrator and
 // machineapi.Machine interfaces.
 type Registrator struct {
-	config runtime.Configurator
+	config   runtime.Configurator
+	platform runtime.Platform
 }
 
 // NewRegistrator builds new Registrator instance
 func NewRegistrator(config runtime.Configurator) *Registrator {
+	platform, err := platform.NewPlatform()
+	if err != nil {
+		// should never happen
+		log.Printf("failed discovering platform: %v", err)
+	}
+
 	return &Registrator{
-		config: config,
+		config:   config,
+		platform: platform,
 	}
 }
 
@@ -394,7 +403,23 @@ func (r *Registrator) Mounts(ctx context.Context, in *empty.Empty) (reply *machi
 
 // Version implements the machineapi.MachineServer interface.
 func (r *Registrator) Version(ctx context.Context, in *empty.Empty) (reply *machineapi.VersionReply, err error) {
-	return version.NewVersion(), nil
+	var platform *machineapi.PlatformInfo
+
+	if r.platform != nil {
+		platform = &machineapi.PlatformInfo{
+			Name: r.platform.Name(),
+			Mode: r.platform.Mode().String(),
+		}
+	}
+
+	return &machineapi.VersionReply{
+		Response: []*machineapi.VersionResponse{
+			{
+				Version:  version.NewVersion(),
+				Platform: platform,
+			},
+		},
+	}, nil
 }
 
 // Kubeconfig implements the osapi.OSDServer interface.
diff --git a/internal/integration/k8s/version.go b/internal/integration/k8s/version.go
index e924a70ae..6e383fd31 100644
--- a/internal/integration/k8s/version.go
+++ b/internal/integration/k8s/version.go
@@ -7,11 +7,13 @@
 package k8s
 
 import (
+	"context"
 	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/talos-systems/talos/internal/integration/base"
+	"github.com/talos-systems/talos/internal/pkg/runtime"
 	"github.com/talos-systems/talos/pkg/constants"
 )
 
@@ -27,21 +29,27 @@ func (suite *VersionSuite) SuiteName() string {
 
 // TestExpectedVersion verifies that node versions matches expected
 func (suite *VersionSuite) TestExpectedVersion() {
+	v, err := suite.Client.Version(context.Background())
+	suite.Require().NoError(err)
+
+	checkKernelVersion := v.Response[0].Platform != nil && v.Response[0].Platform.Mode != runtime.Container.String()
+
 	nodes, err := suite.Clientset.CoreV1().Nodes().List(metav1.ListOptions{})
 	suite.Require().NoError(err)
 
 	expectedTalosVersion := fmt.Sprintf("Talos (%s)", suite.Version)
-	expectedContainerRuntimeVersion := fmt.Sprintf("containerd://%s", "1.3.0") // TODO: expose as constant
+	expectedContainerRuntimeVersion := fmt.Sprintf("containerd://%s", constants.DefaultContainerdVersion)
 	expectedKubeletVersion := fmt.Sprintf("v%s", constants.DefaultKubernetesVersion)
-	// expectedKernelVersion := "5.3.0-19-generic" // TODO: expose as constant
+	expectedKernelVersion := constants.DefaultKernelVersion
 
 	for _, node := range nodes.Items {
 		suite.Assert().Equal(expectedTalosVersion, node.Status.NodeInfo.OSImage)
 		suite.Assert().Equal("linux", node.Status.NodeInfo.OperatingSystem)
 		suite.Assert().Equal(expectedContainerRuntimeVersion, node.Status.NodeInfo.ContainerRuntimeVersion)
 		suite.Assert().Equal(expectedKubeletVersion, node.Status.NodeInfo.KubeletVersion)
-		// TODO: this check should only be enabled for bare metal/VMs, on docker kernel version is host kernel
-		// suite.Assert().Equal(expectedKernelVersion, node.Status.NodeInfo.KernelVersion)
+		if checkKernelVersion {
+			suite.Assert().Equal(expectedKernelVersion, node.Status.NodeInfo.KernelVersion)
+		}
 	}
 }
 
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index feaa634c9..61573d00e 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -11,6 +11,9 @@ import (
 )
 
 const (
+	// DefaultKernelVersion is the default Linux kernel version
+	DefaultKernelVersion = "5.3.6-talos"
+
 	// KernelParamConfig is the kernel parameter name for specifying the URL
 	// to the config.
 	KernelParamConfig = "talos.config"
@@ -182,6 +185,9 @@ const (
 	// TrustdPort is the port for the trustd service.
 	TrustdPort = 50001
 
+	// DefaultContainerdVersion is the default container runtime version
+	DefaultContainerdVersion = "1.3.0"
+
 	// SystemContainerdNamespace is the Containerd namespace for Talos services.
 	SystemContainerdNamespace = "system"
 
diff --git a/pkg/version/version.go b/pkg/version/version.go
index ae6d108e1..0318cfe0f 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -32,27 +32,20 @@ const versionTemplate = `	Tag:         {{ .Tag }}
 `
 
 // NewVersion prints verbose version information.
-func NewVersion() *machineapi.VersionReply {
-	return &machineapi.VersionReply{
-		Response: []*machineapi.VersionResponse{
-			{
-				Version: &machineapi.VersionInfo{
-					Tag:       Tag,
-					Sha:       SHA,
-					Built:     Built,
-					GoVersion: runtime.Version(),
-					Os:        runtime.GOOS,
-					Arch:      runtime.GOARCH,
-				},
-			},
-		},
+func NewVersion() *machineapi.VersionInfo {
+	return &machineapi.VersionInfo{
+		Tag:       Tag,
+		Sha:       SHA,
+		Built:     Built,
+		GoVersion: runtime.Version(),
+		Os:        runtime.GOOS,
+		Arch:      runtime.GOARCH,
 	}
 }
 
 // PrintLongVersion prints verbose version information.
 func PrintLongVersion() {
-	v := NewVersion()
-	printLong(v.Response[0].Version)
+	printLong(NewVersion())
 }
 
 // PrintLongVersionFromExisting prints verbose version information.