diff --git a/client/fingerprint/arch.go b/client/fingerprint/arch.go
index 16d8c99a878..71b5352a891 100644
--- a/client/fingerprint/arch.go
+++ b/client/fingerprint/arch.go
@@ -21,6 +21,6 @@ func NewArchFingerprint(logger *log.Logger) Fingerprint {
 }
 
 func (f *ArchFingerprint) Fingerprint(config *client.Config, node *structs.Node) (bool, error) {
-	node.Attributes["arch"] = runtime.GOARCH
+	node.Attributes["cpu.arch"] = runtime.GOARCH
 	return true, nil
 }
diff --git a/client/fingerprint/arch_test.go b/client/fingerprint/arch_test.go
index f92f9012122..4e4b94a6786 100644
--- a/client/fingerprint/arch_test.go
+++ b/client/fingerprint/arch_test.go
@@ -19,7 +19,7 @@ func TestArchFingerprint(t *testing.T) {
 	if !ok {
 		t.Fatalf("should apply")
 	}
-	if node.Attributes["arch"] == "" {
+	if node.Attributes["cpu.arch"] == "" {
 		t.Fatalf("missing arch")
 	}
 }