diff --git a/pkg/server/manager.go b/pkg/server/manager.go
index 9bfe72504e59236c8ca18d64e06c7cbbf89ede88..536f1cd0475ced78b942d743c5c99430bcf876d4 100644
--- a/pkg/server/manager.go
+++ b/pkg/server/manager.go
@@ -188,6 +188,7 @@ func (hdm *HwDevManager) updateChipNameToNode() (map[string]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	chipInfo.Name = strings.ReplaceAll(chipInfo.Name, " ", common.UnderLine)
 	newLabelMap[common.ChipNameLabel] = chipInfo.Name
 	return newLabelMap, nil
 }