diff --git a/cmd/register/showdata.go b/cmd/register/showdata.go
index 1f213e02a..f96656122 100644
--- a/cmd/register/showdata.go
+++ b/cmd/register/showdata.go
@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/rancher/elemental-operator/pkg/dmidecode"
 	"github.com/rancher/elemental-operator/pkg/hostinfo"
 	"github.com/rancher/elemental-operator/pkg/log"
 	"github.com/spf13/cobra"
@@ -45,12 +44,9 @@ func newDumpDataCommand() *cobra.Command {
 		Aliases: []string{"dump"},
 		Short:   "Show host data sent during the registration phase",
 		Long: "Prints to stdout the data sent by the registering client " +
-			"to the Elemental Operator.\nTakes the type of host data to dump " +
-			"as argument, be it '" + DUMPHW + "' or '" + DUMPSMBIOS + "'.",
-		Args:      cobra.MatchAll(cobra.MaximumNArgs(1), cobra.OnlyValidArgs),
-		ValidArgs: []string{DUMPHW, DUMPSMBIOS},
-		RunE: func(_ *cobra.Command, args []string) error {
-			return dumpdata(args, output, full)
+			"to the Elemental Operator.",
+		RunE: func(_ *cobra.Command, _ []string) error {
+			return dumpdata(output, full)
 		},
 	}
 
@@ -62,45 +58,24 @@ func newDumpDataCommand() *cobra.Command {
 	return cmd
 }
 
-func dumpdata(args []string, output string, full bool) error {
-	dataType := "hardware"
-	if len(args) > 0 {
-		dataType = args[0]
-	}
-
+func dumpdata(output string, full bool) error {
 	var hostData interface{}
 
-	switch dataType {
-	case DUMPHW:
-		hwData, err := hostinfo.Host()
-		if err != nil {
-			log.Fatalf("Cannot retrieve host data: %s", err)
-		}
-
-		if full {
-			hostData, err = hostinfo.ExtractFullData(hwData)
-		} else {
-			hostData, err = hostinfo.ExtractLabels(hwData)
-		}
-		if err != nil {
-			log.Fatalf("Cannot convert host data to labels: %s", err)
-		}
-
-	case DUMPSMBIOS:
-		smbiosData, err := dmidecode.Decode()
-		if err != nil {
-			log.Fatalf("Cannot retrieve SMBIOS data: %s", err)
-		}
-
-		hostData = smbiosData
+	hwData, err := hostinfo.Host()
+	if err != nil {
+		log.Fatalf("Cannot retrieve host data: %s", err)
+	}
 
-	default:
-		// Should never happen but manage it anyway
-		log.Fatalf("Unsupported data type: %s", dataType)
+	if full {
+		hostData, err = hostinfo.ExtractFullData(hwData)
+	} else {
+		hostData, err = hostinfo.ExtractLabels(hwData)
+	}
+	if err != nil {
+		log.Fatalf("Cannot convert host data to labels: %s", err)
 	}
 
 	var serializedData []byte
-	var err error
 
 	switch output {
 	case OUTJSON:
diff --git a/pkg/dmidecode/decode.go b/pkg/dmidecode/decode.go
deleted file mode 100644
index 2f973d16a..000000000
--- a/pkg/dmidecode/decode.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright © 2022 - 2024 SUSE LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package dmidecode
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"os/exec"
-	"strings"
-
-	values "github.com/rancher/wrangler/v2/pkg/data"
-	"github.com/rancher/wrangler/v2/pkg/kv"
-)
-
-var smbiosTypes = []string{
-	"0",  // BIOS info
-	"1",  // System information
-	"2",  // Base Board Information
-	"3",  // Chassis Information
-	"4",  // Processor information
-	"11", // OEM strings
-}
-
-func Decode() (map[string]interface{}, error) {
-	buf := &bytes.Buffer{}
-	for _, handle := range smbiosTypes {
-		tempBuf := &bytes.Buffer{}
-		cmd := exec.Command("dmidecode", "-t", handle)
-		cmd.Stdout = tempBuf
-
-		if err := cmd.Run(); err != nil {
-			return nil, fmt.Errorf("looking up SMBIOS tables (using dmidecode): %w", err)
-		}
-		buf.Write(tempBuf.Bytes())
-	}
-
-	return dmiOutputToMap(buf), nil
-}
-
-func dmiOutputToMap(buf io.Reader) map[string]interface{} {
-	var (
-		result    = map[string]interface{}{}
-		scanner   = bufio.NewScanner(buf)
-		start     = false
-		lastKey   []string
-		stopLines = map[string]bool{
-			"OEM-specific Type": true,
-			"End Of Table":      true,
-		}
-	)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.HasPrefix(line, "Handle ") {
-			start = true
-			continue
-		} else if strings.TrimSpace(line) == "" || !start || stopLines[line] {
-			start = false
-			continue
-		}
-
-		var key []string
-		for strings.HasPrefix(line, "\t") {
-			line = strings.TrimPrefix(line, "\t")
-			if len(lastKey) > len(key) {
-				key = append(key, lastKey[len(key)])
-			}
-		}
-		name, value := kv.Split(line, ": ")
-		key = append(key, name)
-
-		if strings.TrimSpace(value) != "" || strings.Contains(line, ":") {
-			values.PutValue(result, value, key...)
-		} else if len(key) > 1 {
-			parentKey := key[:len(key)-1]
-			parentValue := values.GetValueN(result, parentKey...)
-			if parentSlice, ok := parentValue.([]interface{}); ok {
-				parentValue = append(parentSlice, name)
-			} else {
-				parentValue = []interface{}{name}
-			}
-			values.PutValue(result, parentValue, parentKey...)
-		} else {
-			values.PutValue(result, map[string]interface{}{}, key...)
-		}
-
-		lastKey = key
-	}
-
-	return result
-}
diff --git a/pkg/dmidecode/decode_test.go b/pkg/dmidecode/decode_test.go
deleted file mode 100644
index d5b9b2202..000000000
--- a/pkg/dmidecode/decode_test.go
+++ /dev/null
@@ -1,961 +0,0 @@
-/*
-Copyright © 2022 - 2024 SUSE LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package dmidecode
-
-import (
-	"bytes"
-	"encoding/json"
-	"testing"
-
-	"gotest.tools/v3/assert"
-)
-
-var testInput = `
-# dmidecode 3.2
-Getting SMBIOS data from sysfs.
-SMBIOS 3.1.1 present.
-Table at 0xACE76000.
-
-Handle 0x0000, DMI type 222, 14 bytes
-OEM-specific Type
-	Header and Data:
-		DE 0E 00 00 01 99 00 03 10 01 20 02 30 03
-	Strings:
-		Memory Init Complete
-		End of DXE Phase
-		BIOS Boot Complete
-
-Handle 0x0001, DMI type 14, 8 bytes
-Group Associations
-	Name: Intel(R) Silicon View Technology
-	Items: 1
-		0x0000 (OEM-specific)
-
-Handle 0x0002, DMI type 134, 13 bytes
-OEM-specific Type
-	Header and Data:
-		86 0D 02 00 21 02 20 20 00 00 00 00 00
-
-Handle 0x0003, DMI type 16, 23 bytes
-Physical Memory Array
-	Location: System Board Or Motherboard
-	Use: System Memory
-	Error Correction Type: None
-	Maximum Capacity: 64 GB
-	Error Information Handle: Not Provided
-	Number Of Devices: 4
-
-Handle 0x0004, DMI type 17, 40 bytes
-Memory Device
-	Array Handle: 0x0003
-	Error Information Handle: Not Provided
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 32 GB
-	Form Factor: SODIMM
-	Set: None
-	Locator: ChannelA-DIMM0
-	Bank Locator: BANK 0
-	Type: DDR4
-	Type Detail: Synchronous
-	Speed: 2667 MT/s
-	Manufacturer: Micron
-	Serial Number: 25CD9D0D
-	Asset Tag: None
-	Part Number: 16ATF4G64HZ-2G6B2   
-	Rank: 2
-	Configured Memory Speed: 2667 MT/s
-	Minimum Voltage: Unknown
-	Maximum Voltage: Unknown
-	Configured Voltage: 1.2 V
-
-Handle 0x0005, DMI type 17, 40 bytes
-Memory Device
-	Array Handle: 0x0003
-	Error Information Handle: Not Provided
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 32 GB
-	Form Factor: SODIMM
-	Set: None
-	Locator: ChannelB-DIMM0
-	Bank Locator: BANK 2
-	Type: DDR4
-	Type Detail: Synchronous
-	Speed: 2667 MT/s
-	Manufacturer: Micron
-	Serial Number: XXXXXXXX
-	Asset Tag: None
-	Part Number: 16ATF4G64HZ-2G6B2   
-	Rank: 2
-	Configured Memory Speed: 2667 MT/s
-	Minimum Voltage: Unknown
-	Maximum Voltage: Unknown
-	Configured Voltage: 1.2 V
-
-Handle 0x0006, DMI type 19, 31 bytes
-Memory Array Mapped Address
-	Starting Address: 0x00000000000
-	Ending Address: 0x00FFFFFFFFF
-	Range Size: 64 GB
-	Physical Array Handle: 0x0003
-	Partition Width: 2
-
-Handle 0x0007, DMI type 221, 12 bytes
-OEM-specific Type
-	Header and Data:
-		DD 0C 07 00 01 01 00 02 00 00 BD 10
-	Strings:
-		BIOS Guard
-
-Handle 0x0008, DMI type 221, 26 bytes
-OEM-specific Type
-	Header and Data:
-		DD 1A 08 00 03 01 00 07 00 68 40 00 02 00 00 00
-		00 D6 00 03 00 01 06 00 00 00
-	Strings:
-		Reference Code - CPU
-		uCode Version
-		TXT ACM version
-
-Handle 0x0009, DMI type 221, 26 bytes
-OEM-specific Type
-	Header and Data:
-		DD 1A 09 00 03 01 00 07 00 68 40 00 02 00 0C 00
-		00 0A 00 03 04 0C 00 46 74 06
-	Strings:
-		Reference Code - ME
-		MEBx version
-		ME Firmware Version
-		Corporate SKU
-
-Handle 0x000A, DMI type 221, 82 bytes
-OEM-specific Type
-	Header and Data:
-		DD 52 0A 00 0B 01 00 07 00 68 40 00 02 03 FF FF
-		FF FF FF 04 00 FF FF FF 10 00 05 00 FF FF FF 10
-		00 06 00 02 0A 00 00 00 07 00 02 00 00 00 00 08
-		00 09 00 00 00 00 09 00 0A 00 00 00 00 0A 00 07
-		00 00 00 00 0B 00 06 00 00 00 00 0C 00 07 00 00
-		00 00
-	Strings:
-		Reference Code - CNL PCH
-		PCH-CRID Status
-		Disabled
-		PCH-CRID Original Value
-		PCH-CRID New Value
-		OPROM - RST - RAID
-		CNL PCH H A0 Hsio Version
-		CNL PCH H Ax Hsio Version
-		CNL PCH H Bx Hsio Version
-		CNL PCH LP B0 Hsio Version
-		CNL PCH LP Bx Hsio Version
-		CNL PCH LP Dx Hsio Version
-
-Handle 0x000B, DMI type 221, 54 bytes
-OEM-specific Type
-	Header and Data:
-		DD 36 0B 00 07 01 00 07 00 68 40 00 02 00 00 07
-		01 6E 00 03 00 07 00 68 40 00 04 05 FF FF FF FF
-		FF 06 00 00 00 00 0D 00 07 00 00 00 00 0D 00 08
-		00 FF FF FF FF FF
-	Strings:
-		Reference Code - SA - System Agent
-		Reference Code - MRC
-		SA - PCIe Version
-		SA-CRID Status
-		Enabled 
-		SA-CRID Original Value
-		SA-CRID New Value
-		OPROM - VBIOS
-
-Handle 0x000C, DMI type 221, 12 bytes
-OEM-specific Type
-	Header and Data:
-		DD 0C 0C 00 01 01 00 04 00 00 00 00
-	Strings:
-		FSP Binary Version
-
-Handle 0x000D, DMI type 7, 27 bytes
-Cache Information
-	Socket Designation: L1 Cache
-	Configuration: Enabled, Not Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 512 kB
-	Maximum Size: 512 kB
-	Supported SRAM Types:
-		Synchronous
-	Installed SRAM Type: Synchronous
-	Speed: Unknown
-	Error Correction Type: Parity
-	System Type: Unified
-	Associativity: 8-way Set-associative
-
-Handle 0x000E, DMI type 7, 27 bytes
-Cache Information
-	Socket Designation: L2 Cache
-	Configuration: Enabled, Not Socketed, Level 2
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 2048 kB
-	Maximum Size: 2048 kB
-	Supported SRAM Types:
-		Synchronous
-	Installed SRAM Type: Synchronous
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: 4-way Set-associative
-
-Handle 0x000F, DMI type 7, 27 bytes
-Cache Information
-	Socket Designation: L3 Cache
-	Configuration: Enabled, Not Socketed, Level 3
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 16384 kB
-	Maximum Size: 16384 kB
-	Supported SRAM Types:
-		Synchronous
-	Installed SRAM Type: Synchronous
-	Speed: Unknown
-	Error Correction Type: Multi-bit ECC
-	System Type: Unified
-	Associativity: 16-way Set-associative
-
-Handle 0x0010, DMI type 4, 48 bytes
-Processor Information
-	Socket Designation: U3E1
-	Type: Central Processor
-	Family: Core i9
-	Manufacturer: Intel(R) Corporation
-	ID: ED 06 09 00 FF FB EB BF
-	Signature: Type 0, Family 6, Model 158, Stepping 13
-	Flags:
-		FPU (Floating-point unit on-chip)
-		VME (Virtual mode extension)
-		DE (Debugging extension)
-		PSE (Page size extension)
-		TSC (Time stamp counter)
-		MSR (Model specific registers)
-		PAE (Physical address extension)
-		MCE (Machine check exception)
-		CX8 (CMPXCHG8 instruction supported)
-		APIC (On-chip APIC hardware supported)
-		SEP (Fast system call)
-		MTRR (Memory type range registers)
-		PGE (Page global enable)
-		MCA (Machine check architecture)
-		CMOV (Conditional move instruction supported)
-		PAT (Page attribute table)
-		PSE-36 (36-bit page size extension)
-		CLFSH (CLFLUSH instruction supported)
-		DS (Debug store)
-		ACPI (ACPI supported)
-		MMX (MMX technology supported)
-		FXSR (FXSAVE and FXSTOR instructions supported)
-		SSE (Streaming SIMD extensions)
-		SSE2 (Streaming SIMD extensions 2)
-		SS (Self-snoop)
-		HTT (Multi-threading)
-		TM (Thermal monitor supported)
-		PBE (Pending break enabled)
-	Version: Intel(R) Core(TM) i9-9880H CPU @ 2.30GHz
-	Voltage: 0.8 V
-	External Clock: 100 MHz
-	Max Speed: 2300 MHz
-	Current Speed: 2300 MHz
-	Status: Populated, Enabled
-	Upgrade: Socket BGA1440
-	L1 Cache Handle: 0x000D
-	L2 Cache Handle: 0x000E
-	L3 Cache Handle: 0x000F
-	Serial Number: None
-	Asset Tag: None
-	Part Number: None
-	Core Count: 8
-	Core Enabled: 8
-	Thread Count: 16
-	Characteristics:
-		64-bit capable
-		Multi-Core
-		Hardware Thread
-		Execute Protection
-		Enhanced Virtualization
-		Power/Performance Control
-
-Handle 0x0011, DMI type 0, 26 bytes
-BIOS Information
-	Vendor: LENOVO
-	Version: N2OET47W (1.34 )
-	Release Date: 08/06/2020
-	Address: 0xE0000
-	Runtime Size: 128 kB
-	ROM Size: 32 MB
-	Characteristics:
-		PCI is supported
-		PNP is supported
-		BIOS is upgradeable
-		BIOS shadowing is allowed
-		Boot from CD is supported
-		Selectable boot is supported
-		EDD is supported
-		3.5"/720 kB floppy services are supported (int 13h)
-		Print screen service is supported (int 5h)
-		8042 keyboard services are supported (int 9h)
-		Serial services are supported (int 14h)
-		Printer services are supported (int 17h)
-		CGA/mono video services are supported (int 10h)
-		ACPI is supported
-		USB legacy is supported
-		BIOS boot specification is supported
-		Targeted content distribution is supported
-		UEFI is supported
-	BIOS Revision: 1.34
-	Firmware Revision: 1.23
-
-Handle 0x0012, DMI type 1, 27 bytes
-System Information
-	Manufacturer: LENOVO
-	Product Name: 20QTS00Y00
-	Version: ThinkPad P1 Gen 2
-	Serial Number: XXXXXXXX
-	UUID: 069a9e4c-2eec-11b2-a85c-e9c6a8e86998
-	Wake-up Type: Power Switch
-	SKU Number: LENOVO_MT_20QT_BU_Think_FM_ThinkPad P1 Gen 2
-	Family: ThinkPad P1 Gen 2
-
-Handle 0x0013, DMI type 2, 15 bytes
-Base Board Information
-	Manufacturer: LENOVO
-	Product Name: 20QTS00Y00
-	Version: SDK0T08861 WIN
-	Serial Number: XXXXXXXX02W
-	Asset Tag: Not Available
-	Features:
-		Board is a hosting board
-		Board is replaceable
-	Location In Chassis: Not Available
-	Chassis Handle: 0x0000
-	Type: Motherboard
-	Contained Object Handles: 0
-
-Handle 0x0014, DMI type 3, 22 bytes
-Chassis Information
-	Manufacturer: LENOVO
-	Type: Notebook
-	Lock: Not Present
-	Version: None
-	Serial Number: XXXXXXXX
-	Asset Tag: No Asset Information
-	Boot-up State: Unknown
-	Power Supply State: Unknown
-	Thermal State: Unknown
-	Security Status: Unknown
-	OEM Information: 0x00000000
-	Height: Unspecified
-	Number Of Power Cords: Unspecified
-	Contained Elements: 0
-	SKU Number: Not Specified
-
-Handle 0x0015, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 1
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0016, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 2
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0017, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 3
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0018, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 4
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0019, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001A, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001B, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001C, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001D, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001E, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Ethernet
-	External Connector Type: RJ-45
-	Port Type: Network Port
-
-Handle 0x001F, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0020, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0021, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Hdmi1
-	External Connector Type: Other
-	Port Type: Video Port
-
-Handle 0x0022, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0023, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0024, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0025, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0026, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Headphone/Microphone Combo Jack1
-	External Connector Type: Mini Jack (headphones)
-	Port Type: Audio Port
-
-Handle 0x0027, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0028, DMI type 9, 17 bytes
-System Slot Information
-	Designation: Media Card Slot
-	Type: Other
-	Current Usage: Available
-	Length: Other
-	Characteristics:
-		Hot-plug devices are supported
-	Bus Address: 00ff:ff:1f.7
-
-Handle 0x0029, DMI type 12, 5 bytes
-System Configuration Options
-
-Handle 0x002A, DMI type 13, 22 bytes
-BIOS Language Information
-	Language Description Format: Abbreviated
-	Installable Languages: 1
-		en-US
-	Currently Installed Language: en-US
-
-Handle 0x002B, DMI type 22, 26 bytes
-Portable Battery
-	Location: Front
-	Manufacturer: SMP
-	Name: 01YU911
-	Design Capacity: 80400 mWh
-	Design Voltage: 15360 mV
-	SBDS Version: 03.01
-	Maximum Error: Unknown
-	SBDS Serial Number: 09E9
-	SBDS Manufacture Date: 2019-12-10
-	SBDS Chemistry: LiP
-	OEM-specific Information: 0x00000000
-
-Handle 0x002C, DMI type 126, 26 bytes
-Inactive
-
-Handle 0x002D, DMI type 140, 15 bytes
-OEM-specific Type
-	Header and Data:
-		8C 0F 2D 00 4C 45 4E 4F 56 4F 0B 09 01 01 02
-	Strings:
-		1.34 
-		1.34 
-
-Handle 0x002E, DMI type 133, 5 bytes
-OEM-specific Type
-	Header and Data:
-		85 05 2E 00 01
-	Strings:
-		KHOIHGIUCCHHII
-
-Handle 0x002F, DMI type 135, 19 bytes
-OEM-specific Type
-	Header and Data:
-		87 13 2F 00 54 50 07 02 42 41 59 20 49 2F 4F 20
-		04 00 00
-
-Handle 0x0030, DMI type 130, 20 bytes
-OEM-specific Type
-	Header and Data:
-		82 14 30 00 24 41 4D 54 01 00 01 00 01 A5 AF 02
-		C0 00 00 00
-
-Handle 0x0031, DMI type 131, 64 bytes
-OEM-specific Type
-	Header and Data:
-		83 40 31 00 35 00 00 00 0C 00 00 00 00 00 0A 00
-		F8 00 0E A3 00 00 00 00 09 C0 00 00 00 00 0C 00
-		74 06 46 00 00 00 00 00 FE 00 BB 15 00 00 00 00
-		00 00 00 00 26 00 00 00 76 50 72 6F 00 00 00 00
-
-Handle 0x0032, DMI type 24, 5 bytes
-Hardware Security
-	Power-On Password Status: Disabled
-	Keyboard Password Status: Not Implemented
-	Administrator Password Status: Disabled
-	Front Panel Reset Status: Not Implemented
-
-Handle 0x0033, DMI type 132, 7 bytes
-OEM-specific Type
-	Header and Data:
-		84 07 33 00 01 C0 36
-
-Handle 0x0034, DMI type 18, 23 bytes
-32-bit Memory Error Information
-	Type: OK
-	Granularity: Unknown
-	Operation: Unknown
-	Vendor Syndrome: Unknown
-	Memory Array Address: Unknown
-	Device Address: Unknown
-	Resolution: Unknown
-
-Handle 0x0035, DMI type 21, 7 bytes
-Built-in Pointing Device
-	Type: Track Point
-	Interface: PS/2
-	Buttons: 3
-
-Handle 0x0036, DMI type 21, 7 bytes
-Built-in Pointing Device
-	Type: Touch Pad
-	Interface: PS/2
-	Buttons: 2
-
-Handle 0x0037, DMI type 131, 22 bytes
-ThinkVantage Technologies
-	Version: 1
-	Diagnostics: No
-
-Handle 0x0038, DMI type 136, 6 bytes
-OEM-specific Type
-	Header and Data:
-		88 06 38 00 5A 5A
-
-Handle 0x0039, DMI type 15, 31 bytes
-System Event Log
-	Area Length: 786 bytes
-	Header Start Offset: 0x0000
-	Header Length: 16 bytes
-	Data Start Offset: 0x0010
-	Access Method: General-purpose non-volatile data functions
-	Access Address: 0x00F0
-	Status: Valid, Not Full
-	Change Token: 0x00000030
-	Header Format: Type 1
-	Supported Log Type Descriptors: 4
-	Descriptor 1: POST error
-	Data Format 1: POST results bitmap
-	Descriptor 2: PCI system error
-	Data Format 2: None
-	Descriptor 3: System reconfigured
-	Data Format 3: None
-	Descriptor 4: Log area reset/cleared
-	Data Format 4: None
-
-Handle 0x003A, DMI type 140, 19 bytes
-OEM-specific Type
-	Header and Data:
-		8C 13 3A 00 4C 45 4E 4F 56 4F 0B 04 01 B2 00 4D
-		53 20 00
-
-Handle 0x003B, DMI type 140, 19 bytes
-OEM-specific Type
-	Header and Data:
-		8C 13 3B 00 4C 45 4E 4F 56 4F 0B 05 01 07 00 00
-		00 00 00
-
-Handle 0x003C, DMI type 140, 23 bytes
-OEM-specific Type
-	Header and Data:
-		8C 17 3C 00 4C 45 4E 4F 56 4F 0B 06 01 CB 06 51
-		74 01 60 00 00 00 00
-
-Handle 0x003D, DMI type 14, 8 bytes
-Group Associations
-	Name: $MEI
-	Items: 1
-		0x0000 (OEM-specific)
-
-Handle 0x003E, DMI type 219, 106 bytes
-OEM-specific Type
-	Header and Data:
-		DB 6A 3E 00 01 04 01 45 02 00 94 06 81 10 89 30
-		00 00 00 04 40 00 00 01 1F 00 00 C9 0A 40 C4 02
-		FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-		FF FF FF FF FF FF FF FF 03 00 00 00 80 00 00 00
-		00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-		00 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-		00 00 00 00 00 00 00 00 00 00
-	Strings:
-		MEI1
-		MEI2
-		MEI3
-		MEI4
-
-Handle 0x003F, DMI type 140, 15 bytes
-ThinkPad Embedded Controller Program
-	Version ID: N2OHT36W
-	Release Date: 05/07/2020
-
-Handle 0x0040, DMI type 140, 43 bytes
-OEM-specific Type
-	Header and Data:
-		8C 2B 40 00 4C 45 4E 4F 56 4F 0B 08 01 03 21 08
-		05 18 39 03 21 05 19 18 04 03 21 05 19 17 56 03
-		21 05 19 17 54 03 21 05 19 17 48
-
-Handle 0x0041, DMI type 135, 18 bytes
-OEM-specific Type
-	Header and Data:
-		87 12 41 00 54 50 07 01 01 00 00 00 03 00 00 00
-		03 00
-
-Handle 0xFEFF, DMI type 127, 4 bytes
-End Of Table
-`
-
-var testOutput = `{
-  "32-bit Memory Error Information": {
-    "Device Address": "Unknown",
-    "Granularity": "Unknown",
-    "Memory Array Address": "Unknown",
-    "Operation": "Unknown",
-    "Resolution": "Unknown",
-    "Type": "OK",
-    "Vendor Syndrome": "Unknown"
-  },
-  "BIOS Information": {
-    "Address": "0xE0000",
-    "BIOS Revision": "1.34",
-    "Characteristics:": [
-      "PCI is supported",
-      "PNP is supported",
-      "BIOS is upgradeable",
-      "BIOS shadowing is allowed",
-      "Boot from CD is supported",
-      "Selectable boot is supported",
-      "EDD is supported",
-      "3.5\"/720 kB floppy services are supported (int 13h)",
-      "Print screen service is supported (int 5h)",
-      "8042 keyboard services are supported (int 9h)",
-      "Serial services are supported (int 14h)",
-      "Printer services are supported (int 17h)",
-      "CGA/mono video services are supported (int 10h)",
-      "ACPI is supported",
-      "USB legacy is supported",
-      "BIOS boot specification is supported",
-      "Targeted content distribution is supported",
-      "UEFI is supported"
-    ],
-    "Firmware Revision": "1.23",
-    "ROM Size": "32 MB",
-    "Release Date": "08/06/2020",
-    "Runtime Size": "128 kB",
-    "Vendor": "LENOVO",
-    "Version": "N2OET47W (1.34 )"
-  },
-  "BIOS Language Information": {
-    "Currently Installed Language": "en-US",
-    "Installable Languages": [
-      "en-US"
-    ],
-    "Language Description Format": "Abbreviated"
-  },
-  "Base Board Information": {
-    "Asset Tag": "Not Available",
-    "Chassis Handle": "0x0000",
-    "Contained Object Handles": "0",
-    "Features:": [
-      "Board is a hosting board",
-      "Board is replaceable"
-    ],
-    "Location In Chassis": "Not Available",
-    "Manufacturer": "LENOVO",
-    "Product Name": "20QTS00Y00",
-    "Serial Number": "XXXXXXXX02W",
-    "Type": "Motherboard",
-    "Version": "SDK0T08861 WIN"
-  },
-  "Built-in Pointing Device": {
-    "Buttons": "2",
-    "Interface": "PS/2",
-    "Type": "Touch Pad"
-  },
-  "Cache Information": {
-    "Associativity": "16-way Set-associative",
-    "Configuration": "Enabled, Not Socketed, Level 3",
-    "Error Correction Type": "Multi-bit ECC",
-    "Installed SRAM Type": "Synchronous",
-    "Installed Size": "16384 kB",
-    "Location": "Internal",
-    "Maximum Size": "16384 kB",
-    "Operational Mode": "Write Back",
-    "Socket Designation": "L3 Cache",
-    "Speed": "Unknown",
-    "Supported SRAM Types:": [
-      "Synchronous"
-    ],
-    "System Type": "Unified"
-  },
-  "Chassis Information": {
-    "Asset Tag": "No Asset Information",
-    "Boot-up State": "Unknown",
-    "Contained Elements": "0",
-    "Height": "Unspecified",
-    "Lock": "Not Present",
-    "Manufacturer": "LENOVO",
-    "Number Of Power Cords": "Unspecified",
-    "OEM Information": "0x00000000",
-    "Power Supply State": "Unknown",
-    "SKU Number": "Not Specified",
-    "Security Status": "Unknown",
-    "Serial Number": "XXXXXXXX",
-    "Thermal State": "Unknown",
-    "Type": "Notebook",
-    "Version": "None"
-  },
-  "Group Associations": {
-    "Items": [
-      "0x0000 (OEM-specific)"
-    ],
-    "Name": "$MEI"
-  },
-  "Hardware Security": {
-    "Administrator Password Status": "Disabled",
-    "Front Panel Reset Status": "Not Implemented",
-    "Keyboard Password Status": "Not Implemented",
-    "Power-On Password Status": "Disabled"
-  },
-  "Inactive": {},
-  "Memory Array Mapped Address": {
-    "Ending Address": "0x00FFFFFFFFF",
-    "Partition Width": "2",
-    "Physical Array Handle": "0x0003",
-    "Range Size": "64 GB",
-    "Starting Address": "0x00000000000"
-  },
-  "Memory Device": {
-    "Array Handle": "0x0003",
-    "Asset Tag": "None",
-    "Bank Locator": "BANK 2",
-    "Configured Memory Speed": "2667 MT/s",
-    "Configured Voltage": "1.2 V",
-    "Data Width": "64 bits",
-    "Error Information Handle": "Not Provided",
-    "Form Factor": "SODIMM",
-    "Locator": "ChannelB-DIMM0",
-    "Manufacturer": "Micron",
-    "Maximum Voltage": "Unknown",
-    "Minimum Voltage": "Unknown",
-    "Part Number": "16ATF4G64HZ-2G6B2",
-    "Rank": "2",
-    "Serial Number": "XXXXXXXX",
-    "Set": "None",
-    "Size": "32 GB",
-    "Speed": "2667 MT/s",
-    "Total Width": "64 bits",
-    "Type": "DDR4",
-    "Type Detail": "Synchronous"
-  },
-  "Physical Memory Array": {
-    "Error Correction Type": "None",
-    "Error Information Handle": "Not Provided",
-    "Location": "System Board Or Motherboard",
-    "Maximum Capacity": "64 GB",
-    "Number Of Devices": "4",
-    "Use": "System Memory"
-  },
-  "Port Connector Information": {
-    "External Connector Type": "Mini Jack (headphones)",
-    "External Reference Designator": "Headphone/Microphone Combo Jack1",
-    "Internal Connector Type": "None",
-    "Internal Reference Designator": "Not Available",
-    "Port Type": "Audio Port"
-  },
-  "Portable Battery": {
-    "Design Capacity": "80400 mWh",
-    "Design Voltage": "15360 mV",
-    "Location": "Front",
-    "Manufacturer": "SMP",
-    "Maximum Error": "Unknown",
-    "Name": "01YU911",
-    "OEM-specific Information": "0x00000000",
-    "SBDS Chemistry": "LiP",
-    "SBDS Manufacture Date": "2019-12-10",
-    "SBDS Serial Number": "09E9",
-    "SBDS Version": "03.01"
-  },
-  "Processor Information": {
-    "Asset Tag": "None",
-    "Characteristics:": [
-      "64-bit capable",
-      "Multi-Core",
-      "Hardware Thread",
-      "Execute Protection",
-      "Enhanced Virtualization",
-      "Power/Performance Control"
-    ],
-    "Core Count": "8",
-    "Core Enabled": "8",
-    "Current Speed": "2300 MHz",
-    "External Clock": "100 MHz",
-    "Family": "Core i9",
-    "Flags:": [
-      "FPU (Floating-point unit on-chip)",
-      "VME (Virtual mode extension)",
-      "DE (Debugging extension)",
-      "PSE (Page size extension)",
-      "TSC (Time stamp counter)",
-      "MSR (Model specific registers)",
-      "PAE (Physical address extension)",
-      "MCE (Machine check exception)",
-      "CX8 (CMPXCHG8 instruction supported)",
-      "APIC (On-chip APIC hardware supported)",
-      "SEP (Fast system call)",
-      "MTRR (Memory type range registers)",
-      "PGE (Page global enable)",
-      "MCA (Machine check architecture)",
-      "CMOV (Conditional move instruction supported)",
-      "PAT (Page attribute table)",
-      "PSE-36 (36-bit page size extension)",
-      "CLFSH (CLFLUSH instruction supported)",
-      "DS (Debug store)",
-      "ACPI (ACPI supported)",
-      "MMX (MMX technology supported)",
-      "FXSR (FXSAVE and FXSTOR instructions supported)",
-      "SSE (Streaming SIMD extensions)",
-      "SSE2 (Streaming SIMD extensions 2)",
-      "SS (Self-snoop)",
-      "HTT (Multi-threading)",
-      "TM (Thermal monitor supported)",
-      "PBE (Pending break enabled)"
-    ],
-    "ID": "ED 06 09 00 FF FB EB BF",
-    "L1 Cache Handle": "0x000D",
-    "L2 Cache Handle": "0x000E",
-    "L3 Cache Handle": "0x000F",
-    "Manufacturer": "Intel(R) Corporation",
-    "Max Speed": "2300 MHz",
-    "Part Number": "None",
-    "Serial Number": "None",
-    "Signature": "Type 0, Family 6, Model 158, Stepping 13",
-    "Socket Designation": "U3E1",
-    "Status": "Populated, Enabled",
-    "Thread Count": "16",
-    "Type": "Central Processor",
-    "Upgrade": "Socket BGA1440",
-    "Version": "Intel(R) Core(TM) i9-9880H CPU @ 2.30GHz",
-    "Voltage": "0.8 V"
-  },
-  "System Configuration Options": {},
-  "System Event Log": {
-    "Access Address": "0x00F0",
-    "Access Method": "General-purpose non-volatile data functions",
-    "Area Length": "786 bytes",
-    "Change Token": "0x00000030",
-    "Data Format 1": "POST results bitmap",
-    "Data Format 2": "None",
-    "Data Format 3": "None",
-    "Data Format 4": "None",
-    "Data Start Offset": "0x0010",
-    "Descriptor 1": "POST error",
-    "Descriptor 2": "PCI system error",
-    "Descriptor 3": "System reconfigured",
-    "Descriptor 4": "Log area reset/cleared",
-    "Header Format": "Type 1",
-    "Header Length": "16 bytes",
-    "Header Start Offset": "0x0000",
-    "Status": "Valid, Not Full",
-    "Supported Log Type Descriptors": "4"
-  },
-  "System Information": {
-    "Family": "ThinkPad P1 Gen 2",
-    "Manufacturer": "LENOVO",
-    "Product Name": "20QTS00Y00",
-    "SKU Number": "LENOVO_MT_20QT_BU_Think_FM_ThinkPad P1 Gen 2",
-    "Serial Number": "XXXXXXXX",
-    "UUID": "069a9e4c-2eec-11b2-a85c-e9c6a8e86998",
-    "Version": "ThinkPad P1 Gen 2",
-    "Wake-up Type": "Power Switch"
-  },
-  "System Slot Information": {
-    "Bus Address": "00ff:ff:1f.7",
-    "Characteristics:": [
-      "Hot-plug devices are supported"
-    ],
-    "Current Usage": "Available",
-    "Designation": "Media Card Slot",
-    "Length": "Other",
-    "Type": "Other"
-  },
-  "ThinkPad Embedded Controller Program": {
-    "Release Date": "05/07/2020",
-    "Version ID": "N2OHT36W"
-  },
-  "ThinkVantage Technologies": {
-    "Diagnostics": "No",
-    "Version": "1"
-  }
-}
-`
-
-func TestParse(t *testing.T) {
-	output := dmiOutputToMap(bytes.NewBufferString(testInput))
-	outputBuffer := bytes.NewBuffer(nil)
-	enc := json.NewEncoder(outputBuffer)
-	enc.SetIndent("", "  ")
-	if err := enc.Encode(output); err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, testOutput, outputBuffer.String())
-}
diff --git a/pkg/register/register.go b/pkg/register/register.go
index 30b08bf1d..e2f4b9ef5 100644
--- a/pkg/register/register.go
+++ b/pkg/register/register.go
@@ -33,7 +33,6 @@ import (
 	"gopkg.in/yaml.v3"
 
 	elementalv1 "github.com/rancher/elemental-operator/api/v1beta1"
-	"github.com/rancher/elemental-operator/pkg/dmidecode"
 	"github.com/rancher/elemental-operator/pkg/hostinfo"
 	"github.com/rancher/elemental-operator/pkg/log"
 	"github.com/rancher/elemental-operator/pkg/plainauth"
@@ -102,12 +101,9 @@ func (r *client) Register(reg elementalv1.Registration, caCert []byte, state *St
 	}
 
 	if !reg.NoSMBIOS {
-		log.Infof("Send SMBIOS data")
-		if err := sendSMBIOSData(conn); err != nil {
-			return nil, fmt.Errorf("failed to send SMBIOS data: %w", err)
-		}
+		log.Infof("Send Template Labels System Data")
 		if err := sendSystemData(conn, protoVersion); err != nil {
-			return nil, fmt.Errorf("failed to send system data: %w", err)
+			return nil, fmt.Errorf("failed to send Template Labels System Data: %w", err)
 		}
 	}
 
@@ -250,19 +246,6 @@ func negotiateProtoVersion(conn *websocket.Conn) (MessageType, error) {
 	return MessageType(data[0]), err
 }
 
-func sendSMBIOSData(conn *websocket.Conn) error {
-	data, err := dmidecode.Decode()
-	if err != nil {
-		return fmt.Errorf("reading dmidecode data: %w", err)
-	}
-	err = SendJSONData(conn, MsgSmbios, data)
-	if err != nil {
-		log.Debugf("SMBIOS data:\n%s", litter.Sdump(data))
-		return err
-	}
-	return nil
-}
-
 func sendSystemData(conn *websocket.Conn, protoVersion MessageType) error {
 	data, err := hostinfo.Host()
 	if err != nil {