diff --git a/providers/os/id/awsec2/id.go b/providers/os/id/awsec2/id.go
index af88997b33..11a6ac5404 100644
--- a/providers/os/id/awsec2/id.go
+++ b/providers/os/id/awsec2/id.go
@@ -110,3 +110,18 @@ func ParseMondooAccountID(path string) (string, error) {
 func IsValidMondooAccountId(path string) bool {
 	return VALID_MONDOO_ACCOUNT_ID.MatchString(path)
 }
+
+func ParseEc2PlatformID(uri string) *MondooInstanceId {
+	// aws://ec2/v1/accounts/{account}/regions/{region}/instances/{instanceid}
+	awsec2 := regexp.MustCompile(`^\/\/platformid.api.mondoo.app\/runtime\/aws\/ec2\/v1\/accounts\/(.*)\/regions\/(.*)\/instances\/(.*)$`)
+	m := awsec2.FindStringSubmatch(uri)
+	if len(m) == 0 {
+		return nil
+	}
+
+	return &MondooInstanceId{
+		Account: m[1],
+		Region:  m[2],
+		Id:      m[3],
+	}
+}
diff --git a/providers/os/provider/platform.go b/providers/os/provider/platform.go
new file mode 100644
index 0000000000..c217eed464
--- /dev/null
+++ b/providers/os/provider/platform.go
@@ -0,0 +1,227 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package provider
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/rs/zerolog/log"
+	"go.mondoo.com/cnquery/providers-sdk/v1/inventory"
+	"go.mondoo.com/cnquery/providers/os/connection/shared"
+	"go.mondoo.com/cnquery/providers/os/detector"
+	"go.mondoo.com/cnquery/providers/os/id/awsec2"
+	"go.mondoo.com/cnquery/providers/os/id/awsecs"
+	"go.mondoo.com/cnquery/providers/os/id/hostname"
+	"go.mondoo.com/cnquery/providers/os/id/machineid"
+	"go.mondoo.com/cnquery/providers/os/id/sshhostkey"
+)
+
+type PlatformFingerprint struct {
+	PlatformIDs   []string
+	Name          string
+	Runtime       string
+	Kind          string
+	RelatedAssets []PlatformFingerprint
+}
+
+type PlatformInfo struct {
+	IDs                []string
+	Name               string
+	RelatedPlatformIDs []string
+}
+
+func IdentifyPlatform(conn shared.Connection, p *inventory.Platform, idDetectors []string) (*PlatformFingerprint, error) {
+	// if len(idDetectors) == 0 {
+	// 	idDetectors = t.PlatformIdDetectors()
+	// }
+	if p == nil {
+		p, _ = detector.DetectOS(conn)
+	}
+
+	var fingerprint PlatformFingerprint
+	var ids []string
+	var relatedIds []string
+
+	for i := range idDetectors {
+		idDetector := idDetectors[i]
+		platformInfo, err := GatherPlatformInfo(conn, p, idDetector)
+		if err != nil {
+			// we only err if we found zero platform ids, if we try multiple, a fail of an individual one is okay
+			log.Debug().Err(err).Str("detector", string(idDetector)).Msg("could not determine platform info")
+			continue
+		}
+		if len(platformInfo.IDs) > 0 {
+			ids = append(ids, platformInfo.IDs...)
+		}
+		if len(platformInfo.RelatedPlatformIDs) > 0 {
+			relatedIds = append(relatedIds, platformInfo.RelatedPlatformIDs...)
+		}
+
+		if len(platformInfo.Name) > 0 {
+			fingerprint.Name = platformInfo.Name
+		} else {
+			// check if we get a name for the asset, eg. aws instance id
+			for _, id := range platformInfo.IDs {
+				name := GatherNameForPlatformId(id)
+				if name != "" {
+					fingerprint.Name = name
+				}
+			}
+		}
+		// check whether we can extract runtime and kind information
+		for _, id := range platformInfo.IDs {
+			runtime, kind := ExtractPlatformAndKindFromPlatformId(id)
+			if runtime != "" {
+				fingerprint.Runtime = runtime
+				fingerprint.Kind = kind
+			}
+		}
+	}
+
+	// if we found zero platform ids something went wrong
+	if len(ids) == 0 {
+		return nil, errors.New("could not determine a platform identifier")
+	}
+
+	fingerprint.PlatformIDs = ids
+	for _, v := range relatedIds {
+		fingerprint.RelatedAssets = append(fingerprint.RelatedAssets, PlatformFingerprint{
+			PlatformIDs: []string{v},
+			Name:        GatherNameForPlatformId(v),
+		})
+	}
+
+	log.Debug().Interface("id-detector", idDetectors).Strs("platform-ids", ids).Msg("detected platform ids")
+	return &fingerprint, nil
+}
+
+func GatherNameForPlatformId(id string) string {
+	if awsec2.IsValidMondooInstanceId(id) {
+		structId, _ := awsec2.ParseMondooInstanceID(id)
+		return structId.Id
+	} else if accountID, err := awsec2.ParseMondooAccountID(id); err == nil {
+		return fmt.Sprintf("AWS Account %s", accountID)
+	}
+	return ""
+}
+
+func ExtractPlatformAndKindFromPlatformId(id string) (string, string) {
+	if awsec2.ParseEc2PlatformID(id) != nil {
+		return "aws-ec2", "virtual-machine"
+	} else if awsec2.IsValidMondooAccountId(id) {
+		return "aws", "api"
+	} else if awsecs.IsValidMondooECSContainerId(id) {
+		return "aws-ecs", "container"
+	}
+	return "", ""
+}
+
+func GatherPlatformInfo(conn shared.Connection, pf *inventory.Platform, idDetector string) (*PlatformInfo, error) {
+	// helper for recoding provider to extract the original provider
+	// recT, ok := provider.(*mock.MockRecordProvider)
+	// if ok {
+	// 	provider = recT.Watched()
+	// }
+
+	// osProvider, isOSProvider := provider.(os.OperatingSystemProvider)
+
+	var identifier string
+	switch {
+	case idDetector == "hostname":
+		// NOTE: we need to be careful with hostname's since they are not required to be unique
+		hostname, ok := hostname.Hostname(conn, pf)
+		if ok && len(hostname) > 0 {
+			identifier = "//platformid.api.mondoo.app/hostname/" + hostname
+			return &PlatformInfo{
+				IDs:                []string{identifier},
+				Name:               hostname,
+				RelatedPlatformIDs: []string{},
+			}, nil
+		}
+		return &PlatformInfo{}, nil
+	case idDetector == "machine-id":
+		guid, hostErr := machineid.MachineId(conn, pf)
+		if hostErr == nil && len(guid) > 0 {
+			identifier = "//platformid.api.mondoo.app/machineid/" + guid
+			return &PlatformInfo{
+				IDs:                []string{identifier},
+				Name:               "",
+				RelatedPlatformIDs: []string{},
+			}, hostErr
+		}
+		return &PlatformInfo{}, nil
+	case idDetector == "aws-ec2":
+		metadata, err := awsec2.Resolve(conn, pf)
+		if err != nil {
+			return nil, err
+		}
+		ident, err := metadata.Identify()
+		if err != nil {
+			return nil, err
+		}
+		if ident.InstanceID != "" {
+			return &PlatformInfo{
+				IDs:                []string{ident.InstanceID},
+				Name:               ident.InstanceName,
+				RelatedPlatformIDs: []string{ident.AccountID},
+			}, nil
+		}
+		return &PlatformInfo{}, nil
+	case idDetector == "aws-ecs":
+		metadata, err := awsecs.Resolve(conn, pf)
+		if err != nil {
+			return nil, err
+		}
+		ident, err := metadata.Identify()
+		if err != nil {
+			return nil, err
+		}
+		if len(ident.PlatformIds) != 0 {
+			return &PlatformInfo{
+				IDs:                ident.PlatformIds,
+				Name:               ident.Name,
+				RelatedPlatformIDs: []string{ident.AccountPlatformID},
+			}, nil
+		}
+		return &PlatformInfo{}, nil
+	// case idDetector == IdDetector_CloudDetect:
+	// 	identifier, name, relatedIdentifiers := clouddetect.Detect(conn, pf)
+	// 	if identifier != "" {
+	// 		return &PlatformInfo{
+	// 			IDs:                []string{identifier},
+	// 			Name:               name,
+	// 			RelatedPlatformIDs: relatedIdentifiers,
+	// 		}, nil
+	// 	}
+	// 	return &PlatformInfo{}, nil
+	case idDetector == "ssh-host-key":
+		identifier, err := sshhostkey.Detect(conn, pf)
+		if err != nil {
+			return nil, err
+		}
+		return &PlatformInfo{
+			IDs:                identifier,
+			Name:               "",
+			RelatedPlatformIDs: []string{},
+		}, nil
+	// case idDetector == providers.TransportPlatformIdentifierDetector:
+	// 	identifiable, ok := provider.(providers.PlatformIdentifier)
+	// 	if !ok {
+	// 		return nil, errors.New("the transport-platform-id detector is not supported for transport")
+	// 	}
+
+	// 	identifier, err := identifiable.Identifier()
+	// 	if err != nil {
+	// 		return nil, err
+	// 	}
+	// 	return &PlatformInfo{
+	// 		IDs:                []string{identifier},
+	// 		Name:               "",
+	// 		RelatedPlatformIDs: []string{},
+	// 	}, nil
+	default:
+		return nil, errors.New(fmt.Sprintf("the provided id-detector is not supported: %s", idDetector))
+	}
+}
diff --git a/providers/os/provider/provider.go b/providers/os/provider/provider.go
index 03f819cab6..be049a20f1 100644
--- a/providers/os/provider/provider.go
+++ b/providers/os/provider/provider.go
@@ -242,10 +242,16 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 	case LocalConnectionType:
 		s.lastConnectionID++
 		conn = connection.NewLocalConnection(s.lastConnectionID, conf, asset)
+		fingerprint, _ := IdentifyPlatform(conn, asset.Platform, []string{"hostname"})
+		asset.Name = fingerprint.Name
+		asset.PlatformIds = fingerprint.PlatformIDs
 
 	case SshConnectionType:
 		s.lastConnectionID++
 		conn, err = connection.NewSshConnection(s.lastConnectionID, conf, asset)
+		fingerprint, _ := IdentifyPlatform(conn, asset.Platform, []string{"hostname", "cloud-detect"})
+		asset.Name = fingerprint.Name
+		asset.PlatformIds = fingerprint.PlatformIDs
 
 	case MockConnectionType:
 		s.lastConnectionID++