diff --git a/cli/tink/cmd/hardware/push.go b/cli/tink/cmd/hardware/push.go
index 07f4b51be..cde584f9c 100644
--- a/cli/tink/cmd/hardware/push.go
+++ b/cli/tink/cmd/hardware/push.go
@@ -34,7 +34,12 @@ var pushCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, j := range args {
-			if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: j}); err != nil {
+			hw := hardware.Hardware{}
+			err := json.Unmarshal([]byte(j), &hw)
+			if err != nil {
+				log.Fatal(err)
+			}
+			if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: &hw}); err != nil {
 				log.Fatal(err)
 			}
 		}
diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go
index 914e42bb9..1f0453f9d 100644
--- a/grpc-server/hardware.go
+++ b/grpc-server/hardware.go
@@ -23,39 +23,31 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware.
 	// must be a copy so deferred cacheInFlight.Dec matches the Inc
 	labels = prometheus.Labels{"method": "Push", "op": ""}
 
-	var h struct {
-		ID    string
-		State string
-	}
-	err := json.Unmarshal([]byte(in.Data), &h)
-	if err != nil {
+	hw := in.Data
+	if hw.Id == "" {
 		metrics.CacheTotals.With(labels).Inc()
 		metrics.CacheErrors.With(labels).Inc()
-		err = errors.Wrap(err, "unmarshal json")
+		err := errors.New("id must be set to a UUID")
 		logger.Error(err)
 		return &hardware.Empty{}, err
 	}
 
-	if h.ID == "" {
-		metrics.CacheTotals.With(labels).Inc()
-		metrics.CacheErrors.With(labels).Inc()
-		err = errors.New("id must be set to a UUID")
-		logger.Error(err)
-		return &hardware.Empty{}, err
-	}
-
-	logger.With("id", h.ID).Info("data pushed")
+	logger.With("id", hw.Id).Info("data pushed")
 
 	var fn func() error
 	msg := ""
-	if h.State != "deleted" {
+	data, err := json.Marshal(hw)
+	if err != nil {
+		logger.Error(err)
+	}
+	if hw.Metadata.State != "deleted" {
 		labels["op"] = "insert"
 		msg = "inserting into DB"
-		fn = func() error { return db.InsertIntoDB(ctx, s.db, in.Data) }
+		fn = func() error { return db.InsertIntoDB(ctx, s.db, string(data)) }
 	} else {
 		msg = "deleting from DB"
 		labels["op"] = "delete"
-		fn = func() error { return db.DeleteFromDB(ctx, s.db, h.ID) }
+		fn = func() error { return db.DeleteFromDB(ctx, s.db, hw.Id) }
 	}
 
 	metrics.CacheTotals.With(labels).Inc()
@@ -75,12 +67,12 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware.
 	}
 
 	s.watchLock.RLock()
-	if ch := s.watch[h.ID]; ch != nil {
+	if ch := s.watch[hw.Id]; ch != nil {
 		select {
-		case ch <- in.Data:
+		case ch <- string(data):
 		default:
 			metrics.WatchMissTotal.Inc()
-			logger.With("id", h.ID).Info("skipping blocked watcher")
+			logger.With("id", hw.Id ).Info("skipping blocked watcher")
 		}
 	}
 	s.watchLock.RUnlock()
diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go
index ab10a5ca0..656ea58ae 100644
--- a/protos/hardware/hardware.pb.go
+++ b/protos/hardware/hardware.pb.go
@@ -26,10 +26,10 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type PushRequest struct {
-	Data                 string   `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Data                 *Hardware `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
 func (m *PushRequest) Reset()         { *m = PushRequest{} }
@@ -57,11 +57,11 @@ func (m *PushRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_PushRequest proto.InternalMessageInfo
 
-func (m *PushRequest) GetData() string {
+func (m *PushRequest) GetData() *Hardware {
 	if m != nil {
 		return m.Data
 	}
-	return ""
+	return nil
 }
 
 type Empty struct {
@@ -1157,94 +1157,94 @@ func init() {
 }
 
 var fileDescriptor_61ac56d7fc2e671f = []byte{
-	// 1378 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x8e, 0x1b, 0xc5,
-	0x16, 0x56, 0xdb, 0x1e, 0xbb, 0x7d, 0xec, 0x99, 0xb9, 0xa9, 0x9b, 0x9b, 0xf4, 0xed, 0xfb, 0xa3,
-	0xc9, 0x44, 0xf7, 0x32, 0xca, 0xc2, 0x93, 0x0c, 0x11, 0x08, 0x04, 0x48, 0x99, 0x49, 0x42, 0x0c,
-	0x9a, 0x19, 0xab, 0x9d, 0x1f, 0xfe, 0xa4, 0x56, 0xb9, 0xbb, 0x6c, 0x97, 0xa6, 0xbb, 0xab, 0xa9,
-	0xaa, 0x8e, 0xe3, 0x15, 0x12, 0x0b, 0x16, 0x20, 0x56, 0xac, 0xd8, 0xb2, 0x61, 0x8b, 0xd8, 0xf1,
-	0x1c, 0xbc, 0x02, 0xe2, 0x09, 0x78, 0x00, 0x74, 0xaa, 0xab, 0x1d, 0x4f, 0x22, 0xa1, 0xcc, 0x0f,
-	0x61, 0x57, 0xe7, 0xab, 0x53, 0x5f, 0x9d, 0x3a, 0xe7, 0xab, 0x53, 0xdd, 0x70, 0x79, 0x4a, 0x65,
-	0x3c, 0xa3, 0x92, 0x6d, 0x57, 0x83, 0x5e, 0x2e, 0x85, 0x16, 0xe4, 0xda, 0x84, 0xeb, 0x69, 0x31,
-	0xea, 0x45, 0x22, 0xed, 0x69, 0x9e, 0x1d, 0x31, 0x39, 0x62, 0x49, 0x62, 0x86, 0xa5, 0x87, 0xea,
-	0x55, 0x2b, 0xfc, 0x7f, 0x4f, 0x84, 0x98, 0x24, 0x6c, 0x9b, 0xe6, 0x7c, 0x9b, 0x66, 0x99, 0xd0,
-	0x54, 0x73, 0x91, 0xa9, 0xd2, 0x6f, 0xf3, 0x0a, 0x74, 0x06, 0x85, 0x9a, 0x06, 0xec, 0xd3, 0x82,
-	0x29, 0x4d, 0x08, 0x34, 0x62, 0xaa, 0xa9, 0xe7, 0x6c, 0x38, 0x5b, 0xed, 0xc0, 0x8c, 0x37, 0x5b,
-	0xb0, 0x72, 0x27, 0xcd, 0xf5, 0x7c, 0xf3, 0x1d, 0x80, 0x77, 0x99, 0xae, 0x5c, 0xff, 0x06, 0xf5,
-	0x94, 0x46, 0xd6, 0x13, 0x87, 0x64, 0x0d, 0x6a, 0x3c, 0xf7, 0x6a, 0x06, 0xa8, 0xf1, 0xdc, 0xd8,
-	0xb1, 0x57, 0xb7, 0x76, 0xbc, 0xf9, 0x93, 0x07, 0xee, 0x3d, 0x1b, 0x96, 0x9d, 0x74, 0xaa, 0x49,
-	0xb2, 0x0f, 0x8d, 0x78, 0x1a, 0x95, 0xcb, 0x3b, 0x3b, 0x6f, 0xf4, 0x5e, 0xfc, 0x84, 0xbd, 0x8a,
-	0xb3, 0x77, 0xfb, 0xde, 0xde, 0x20, 0x30, 0x34, 0xe4, 0x21, 0xb4, 0x32, 0xa6, 0x47, 0x42, 0x68,
-	0x13, 0x40, 0x67, 0xe7, 0xad, 0x53, 0x31, 0x1e, 0x94, 0x1c, 0x41, 0x45, 0x66, 0x79, 0x67, 0x42,
-	0x1e, 0x79, 0x8d, 0x8d, 0xfa, 0x59, 0x78, 0x91, 0x23, 0xa8, 0xc8, 0xc8, 0x87, 0xe0, 0xa6, 0x4c,
-	0x53, 0x93, 0xfc, 0x15, 0x13, 0xf0, 0xdb, 0xa7, 0x22, 0xde, 0xb7, 0x24, 0xc1, 0x82, 0xce, 0xff,
-	0xb2, 0x06, 0x0d, 0xcc, 0xcc, 0x0b, 0x54, 0xcc, 0x07, 0x77, 0x2a, 0x94, 0xce, 0x68, 0xca, 0x6c,
-	0xdd, 0x16, 0x36, 0xf9, 0x0f, 0x40, 0xc2, 0xa8, 0x62, 0xa1, 0xe6, 0x29, 0xf3, 0x1a, 0x1b, 0xce,
-	0x56, 0x3d, 0x68, 0x1b, 0xe4, 0x3e, 0x4f, 0x19, 0xb9, 0x02, 0x5d, 0x74, 0x0b, 0x15, 0x93, 0x8f,
-	0x99, 0x54, 0xde, 0xca, 0x46, 0x7d, 0xab, 0x1d, 0x74, 0x10, 0x1b, 0x96, 0x10, 0xba, 0xe0, 0xda,
-	0x85, 0x4b, 0xb3, 0x74, 0x41, 0xac, 0x72, 0xf1, 0xa0, 0x35, 0xa1, 0x9a, 0xcd, 0xe8, 0xdc, 0x6b,
-	0x99, 0xfd, 0x2b, 0x13, 0x95, 0x49, 0x65, 0x34, 0xf5, 0xdc, 0x52, 0x99, 0x38, 0x46, 0xac, 0x60,
-	0x63, 0xee, 0xb5, 0x37, 0x9c, 0x2d, 0x37, 0x30, 0x63, 0x0c, 0x93, 0x8f, 0x69, 0xc4, 0x42, 0x73,
-	0x08, 0x30, 0xde, 0x6d, 0x83, 0x1c, 0xd0, 0x94, 0xf9, 0xdf, 0xd6, 0xa1, 0x65, 0x8b, 0x4a, 0xfe,
-	0x05, 0x6d, 0x9a, 0x24, 0x62, 0x16, 0xe6, 0x4f, 0x98, 0xc9, 0x8a, 0x1b, 0xb8, 0x06, 0x18, 0x3c,
-	0x61, 0xe4, 0x7f, 0xb0, 0x56, 0x4e, 0x62, 0x79, 0xc6, 0x89, 0x98, 0x99, 0x34, 0xb9, 0xc1, 0xaa,
-	0x41, 0x1f, 0x59, 0x90, 0x3c, 0x80, 0x06, 0xc7, 0xe5, 0xa5, 0xc8, 0x6e, 0x9d, 0x45, 0x64, 0xbd,
-	0xfe, 0xe0, 0x83, 0x3b, 0x81, 0xa1, 0x23, 0x29, 0x74, 0x11, 0x52, 0x5a, 0xd2, 0x3c, 0x67, 0xd2,
-	0xa4, 0xbb, 0xb3, 0xd3, 0x3f, 0x13, 0xfd, 0xee, 0x12, 0x61, 0x70, 0x8c, 0xde, 0xbf, 0x09, 0x0d,
-	0xdc, 0x1c, 0x15, 0x52, 0xc8, 0xa4, 0x52, 0x48, 0x21, 0x13, 0x54, 0x44, 0x24, 0x32, 0xcd, 0x32,
-	0xad, 0xac, 0x4e, 0x16, 0xb6, 0x7f, 0x00, 0xdd, 0x65, 0x4e, 0x72, 0x09, 0x9a, 0x47, 0x4c, 0x66,
-	0xac, 0x22, 0xb0, 0x16, 0xe2, 0x3c, 0xe3, 0x5a, 0xc6, 0x96, 0xc1, 0x5a, 0xa8, 0x3e, 0xa1, 0xaa,
-	0xfe, 0x20, 0x94, 0xff, 0x83, 0x63, 0x6a, 0x63, 0xee, 0x43, 0xd5, 0x0e, 0x9c, 0x73, 0x6f, 0x07,
-	0xb5, 0x73, 0x6c, 0x07, 0xfe, 0xaf, 0x6b, 0xe0, 0x56, 0x57, 0x8e, 0x5c, 0x84, 0x15, 0xa5, 0xa9,
-	0x66, 0xf6, 0xf8, 0xa5, 0x81, 0xaa, 0x1f, 0x89, 0x2c, 0xe6, 0xd9, 0x24, 0x4c, 0x45, 0xcc, 0xcc,
-	0xfe, 0xf5, 0xa0, 0x63, 0xb1, 0x7d, 0x11, 0x33, 0x92, 0x41, 0x37, 0xa5, 0x59, 0x31, 0xa6, 0x91,
-	0x2e, 0x24, 0x93, 0x56, 0x4c, 0xef, 0x9d, 0xa9, 0x01, 0xf4, 0xf6, 0x97, 0x18, 0x83, 0x63, 0xfc,
-	0x64, 0x04, 0x2e, 0xcf, 0x94, 0xa6, 0x59, 0xc4, 0xac, 0xb2, 0xee, 0x9e, 0x6d, 0xaf, 0xbe, 0x65,
-	0x0b, 0x16, 0xbc, 0xe4, 0x13, 0x68, 0x46, 0x85, 0xd2, 0x22, 0xb5, 0xed, 0xec, 0xf6, 0xd9, 0x76,
-	0xd8, 0x33, 0x5c, 0x81, 0xe5, 0xc4, 0x13, 0x8c, 0x69, 0xc4, 0x13, 0xae, 0xe7, 0x5e, 0xf3, 0x3c,
-	0x4e, 0x70, 0xd7, 0xb2, 0x05, 0x0b, 0x5e, 0x7f, 0x07, 0xba, 0xcb, 0x39, 0x7c, 0xee, 0xc5, 0x22,
-	0xd0, 0x50, 0x49, 0x31, 0xb1, 0xa2, 0x36, 0x63, 0xff, 0x7b, 0x17, 0xdc, 0x2a, 0x19, 0xcf, 0x2d,
-	0x58, 0xe8, 0xa3, 0xb6, 0xac, 0x8f, 0x3f, 0xea, 0xb9, 0xc7, 0x3a, 0x54, 0xe3, 0x99, 0x0e, 0x75,
-	0x09, 0x9a, 0x92, 0xa9, 0xa8, 0x60, 0x26, 0xc3, 0x6e, 0x60, 0x2d, 0x32, 0x86, 0xda, 0xe1, 0xd0,
-	0x66, 0xe5, 0xe1, 0xf9, 0xd4, 0xb5, 0x77, 0x98, 0x33, 0x49, 0x35, 0xcf, 0x26, 0xc3, 0xb9, 0xd2,
-	0x2c, 0x0d, 0x6a, 0x87, 0x43, 0xec, 0xb4, 0x34, 0x99, 0xd1, 0xb9, 0x32, 0xd1, 0xb5, 0x4c, 0x0c,
-	0xed, 0x12, 0xc1, 0xf0, 0xfe, 0x0f, 0xeb, 0xd8, 0xca, 0x42, 0x15, 0x49, 0x9e, 0xeb, 0x10, 0xfb,
-	0x4a, 0xd9, 0xbb, 0x57, 0x11, 0x1e, 0x1a, 0xf4, 0x81, 0x4c, 0xc8, 0xc7, 0x50, 0xe7, 0xb9, 0xf2,
-	0xda, 0xe6, 0x35, 0xed, 0x9f, 0x53, 0xbc, 0xfd, 0x41, 0x80, 0xac, 0x98, 0xdc, 0x42, 0x31, 0x69,
-	0x9e, 0xd5, 0xf2, 0x2d, 0x58, 0xd8, 0x64, 0x07, 0xfe, 0x11, 0xc9, 0x79, 0xae, 0x59, 0x1c, 0x4a,
-	0x21, 0x74, 0x98, 0x53, 0xa5, 0x66, 0x42, 0xc6, 0x5e, 0xc7, 0x38, 0xfe, 0xdd, 0x4e, 0x06, 0x42,
-	0xe8, 0x81, 0x9d, 0xc2, 0x9a, 0x6b, 0x3a, 0x51, 0x5e, 0xd7, 0x3c, 0x5d, 0x66, 0x4c, 0xa6, 0xd0,
-	0x52, 0x5a, 0x48, 0x3a, 0x61, 0xde, 0xaa, 0x49, 0xfa, 0xc1, 0x39, 0x1d, 0x62, 0x58, 0xb2, 0x06,
-	0x15, 0x3d, 0xf9, 0x27, 0xb8, 0x4a, 0x4d, 0xc3, 0x23, 0x36, 0x57, 0xde, 0x9a, 0x89, 0xa0, 0xa5,
-	0xd4, 0xf4, 0x7d, 0x36, 0x57, 0xe4, 0x2a, 0xac, 0xda, 0x4f, 0x89, 0x50, 0x32, 0x1a, 0xcf, 0xbd,
-	0x75, 0x53, 0x8f, 0xae, 0x05, 0x03, 0xc4, 0xfc, 0xaf, 0x1d, 0x58, 0x7f, 0xa6, 0x92, 0x0b, 0x15,
-	0x3b, 0x4f, 0x55, 0x8c, 0xca, 0x8a, 0xb9, 0xd2, 0x52, 0x54, 0x0d, 0xbb, 0xb4, 0xf0, 0x75, 0xc6,
-	0x57, 0x9a, 0x8b, 0xcc, 0x2a, 0xb5, 0x32, 0x51, 0xa8, 0x3c, 0xa5, 0x13, 0x16, 0x6a, 0x3a, 0x31,
-	0x42, 0x6d, 0x07, 0xae, 0x01, 0xee, 0xd3, 0x09, 0xb9, 0x0c, 0x2d, 0xa1, 0x42, 0xb3, 0xcb, 0x4a,
-	0xc9, 0x27, 0xd4, 0x10, 0x6f, 0xcb, 0x77, 0x0e, 0xd4, 0xfa, 0x03, 0xa4, 0xa5, 0x71, 0x2c, 0x99,
-	0x52, 0x36, 0x8a, 0xca, 0xc4, 0x99, 0x8c, 0xe9, 0x94, 0xaa, 0x23, 0x1b, 0x49, 0x65, 0x2e, 0x7f,
-	0x28, 0xd4, 0x8f, 0x7f, 0x28, 0x5c, 0x82, 0xe6, 0x98, 0xa6, 0x3c, 0x99, 0xdb, 0x6f, 0x14, 0x6b,
-	0x21, 0x9e, 0x17, 0xa3, 0x84, 0x47, 0xd5, 0x75, 0x29, 0x2d, 0xf2, 0x5f, 0x80, 0x94, 0x66, 0x74,
-	0xc2, 0x52, 0x96, 0x69, 0x73, 0x6d, 0xdc, 0x60, 0x09, 0xf1, 0x1f, 0x40, 0xcb, 0x16, 0x02, 0x2f,
-	0x70, 0xcc, 0xd5, 0x11, 0x86, 0x89, 0xc9, 0x2f, 0x0d, 0xcc, 0xa0, 0xa4, 0x1c, 0x1f, 0x37, 0xa3,
-	0x09, 0x1c, 0x93, 0x0d, 0xe8, 0x8c, 0x79, 0xc2, 0x94, 0xc9, 0x31, 0xbe, 0x71, 0xe6, 0x4b, 0x67,
-	0x09, 0xf2, 0x7f, 0x74, 0xa0, 0x59, 0x36, 0x35, 0xf2, 0x19, 0xac, 0xe7, 0x92, 0x99, 0xce, 0x99,
-	0x24, 0x2c, 0x0e, 0x85, 0xb2, 0xcf, 0xde, 0x9f, 0x75, 0x7b, 0xd7, 0x96, 0xb7, 0x3b, 0x54, 0xe4,
-	0x15, 0x0c, 0x80, 0x3f, 0xa6, 0x9a, 0x85, 0xaa, 0x18, 0x65, 0xcc, 0xbc, 0xf5, 0x18, 0xf1, 0x9a,
-	0x85, 0x87, 0x25, 0xea, 0x3f, 0x01, 0xb7, 0x6a, 0x94, 0x58, 0xf2, 0x3c, 0xa1, 0x59, 0xb8, 0xa4,
-	0x1e, 0x17, 0x01, 0xac, 0x2c, 0xb9, 0x06, 0x17, 0xcc, 0xa4, 0xd5, 0x47, 0xb8, 0xd4, 0x28, 0xd7,
-	0x71, 0xe2, 0x61, 0x89, 0x1b, 0xdf, 0xab, 0xb0, 0x5a, 0xf5, 0xdc, 0x30, 0xc2, 0x17, 0xb2, 0x2c,
-	0x68, 0xb7, 0x02, 0xf7, 0x44, 0xcc, 0x76, 0x7e, 0x6b, 0xc2, 0x7a, 0x75, 0x42, 0xfc, 0x58, 0xe4,
-	0x11, 0x23, 0x5f, 0x39, 0xd0, 0xc0, 0x9f, 0x17, 0xf2, 0xfa, 0x49, 0xf2, 0xb4, 0xf4, 0xbb, 0xe3,
-	0xdf, 0x38, 0xc9, 0xc2, 0xf2, 0x27, 0xe8, 0xf2, 0xe7, 0x3f, 0xff, 0xf2, 0x4d, 0xed, 0xc2, 0x66,
-	0x77, 0xfb, 0xf1, 0x8d, 0xc5, 0x6f, 0xd9, 0x9b, 0xce, 0x35, 0x52, 0xc0, 0xca, 0xee, 0x7c, 0xff,
-	0xd6, 0x1e, 0x79, 0xed, 0x24, 0xa4, 0x4f, 0x7f, 0xa8, 0xfc, 0x9b, 0xa7, 0xa9, 0x36, 0xd1, 0xd0,
-	0xd8, 0x9d, 0xf7, 0x07, 0x7f, 0xc9, 0xae, 0xb7, 0x5f, 0xf2, 0xae, 0x5f, 0x38, 0x50, 0xbf, 0x95,
-	0x24, 0xe4, 0xe4, 0x65, 0x3b, 0xdd, 0x86, 0x9b, 0x17, 0x4d, 0xb1, 0xd7, 0xc8, 0xb1, 0x62, 0x5f,
-	0x77, 0x48, 0x06, 0xcd, 0x7e, 0x36, 0xc1, 0xbf, 0xe0, 0x53, 0x84, 0x72, 0xf2, 0x25, 0x64, 0x06,
-	0x2b, 0x8f, 0xa8, 0x8e, 0xa6, 0x2f, 0x37, 0xdf, 0xd7, 0x9d, 0x5d, 0xf8, 0xc8, 0xad, 0xe0, 0x51,
-	0xd3, 0xf8, 0xbd, 0xfa, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x29, 0x3e, 0x15, 0x96, 0x10,
-	0x00, 0x00,
+	// 1379 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x8f, 0x1b, 0x35,
+	0x14, 0xd7, 0x24, 0xd9, 0x64, 0xf2, 0x92, 0xdd, 0xa5, 0xa6, 0xb4, 0xc3, 0xf0, 0x47, 0xcb, 0x56,
+	0xc0, 0xaa, 0x87, 0x6c, 0x1b, 0x2a, 0x10, 0x08, 0x90, 0xba, 0xdb, 0x96, 0x06, 0xb4, 0xbb, 0x91,
+	0xd3, 0x3f, 0xfc, 0x93, 0x46, 0xce, 0x8c, 0x33, 0xb1, 0x76, 0x66, 0x3c, 0xd8, 0x9e, 0xa6, 0x39,
+	0x21, 0x71, 0xe0, 0x00, 0xe2, 0xc4, 0x89, 0x2b, 0x17, 0xae, 0x88, 0x1b, 0x9f, 0x83, 0xaf, 0x80,
+	0xf8, 0x04, 0x7c, 0x00, 0x64, 0x8f, 0x27, 0xcd, 0xb6, 0x12, 0xea, 0xfe, 0xa1, 0xdc, 0xfc, 0x7e,
+	0xb6, 0x7f, 0xef, 0xf9, 0xbd, 0xe7, 0xf7, 0x6c, 0xb8, 0x38, 0x25, 0x22, 0x9a, 0x11, 0x41, 0xb7,
+	0xab, 0x41, 0x2f, 0x17, 0x5c, 0x71, 0x74, 0x39, 0x66, 0x6a, 0x5a, 0x8c, 0x7b, 0x21, 0x4f, 0x7b,
+	0x8a, 0x65, 0x87, 0x54, 0x8c, 0x69, 0x92, 0x98, 0x61, 0xb9, 0x42, 0xf6, 0xaa, 0x1d, 0xfe, 0xcb,
+	0x31, 0xe7, 0x71, 0x42, 0xb7, 0x49, 0xce, 0xb6, 0x49, 0x96, 0x71, 0x45, 0x14, 0xe3, 0x99, 0x2c,
+	0xd7, 0x6d, 0xde, 0x87, 0xce, 0xb0, 0x90, 0x53, 0x4c, 0xbf, 0x2a, 0xa8, 0x54, 0xe8, 0x36, 0x34,
+	0x22, 0xa2, 0x88, 0xe7, 0x6c, 0x38, 0x5b, 0x9d, 0xfe, 0xb5, 0xde, 0xd3, 0xeb, 0xe9, 0xdd, 0xb6,
+	0x03, 0x6c, 0x18, 0x36, 0x5b, 0xb0, 0x72, 0x33, 0xcd, 0xd5, 0x7c, 0xf3, 0x43, 0x80, 0x8f, 0xa8,
+	0xaa, 0x14, 0x3c, 0x07, 0xf5, 0x94, 0x84, 0x86, 0xbf, 0x8d, 0xf5, 0x10, 0xad, 0x41, 0x8d, 0xe5,
+	0x5e, 0xcd, 0x00, 0x35, 0x96, 0x1b, 0x39, 0xf2, 0xea, 0x56, 0x8e, 0x36, 0x7f, 0xf7, 0xc0, 0xad,
+	0xb8, 0xed, 0xa4, 0x53, 0x4d, 0xa2, 0x3d, 0x68, 0x44, 0xd3, 0xb0, 0xdc, 0xde, 0xe9, 0xbf, 0x7b,
+	0x12, 0x7b, 0x7b, 0x37, 0x6e, 0xef, 0x0e, 0xb1, 0xa1, 0x41, 0xf7, 0xa0, 0x95, 0x51, 0x35, 0xe6,
+	0x5c, 0x19, 0x03, 0x3a, 0xfd, 0xf7, 0x4f, 0xc4, 0xb8, 0x5f, 0x72, 0xe0, 0x8a, 0xcc, 0xf2, 0xce,
+	0xb8, 0x38, 0xf4, 0x1a, 0x1b, 0xf5, 0xd3, 0xf0, 0x6a, 0x0e, 0x5c, 0x91, 0xa1, 0xcf, 0xc0, 0x4d,
+	0xa9, 0x22, 0x26, 0x64, 0x2b, 0xc6, 0xe0, 0x0f, 0x4e, 0x44, 0xbc, 0x67, 0x49, 0xf0, 0x82, 0xce,
+	0xff, 0xae, 0x06, 0x0d, 0xed, 0x99, 0xa7, 0x88, 0x98, 0x0f, 0xee, 0x94, 0x4b, 0x95, 0x91, 0x94,
+	0xda, 0xb8, 0x2d, 0x64, 0xf4, 0x0a, 0x40, 0x42, 0x89, 0xa4, 0x81, 0x62, 0x29, 0xf5, 0x1a, 0x1b,
+	0xce, 0x56, 0x1d, 0xb7, 0x0d, 0x72, 0x87, 0xa5, 0x14, 0xbd, 0x06, 0x5d, 0xbd, 0x2c, 0x90, 0x54,
+	0x3c, 0xa0, 0x42, 0x7a, 0x2b, 0x1b, 0xf5, 0xad, 0x36, 0xee, 0x68, 0x6c, 0x54, 0x42, 0x7a, 0x89,
+	0xde, 0xbb, 0x58, 0xd2, 0x2c, 0x97, 0x68, 0xac, 0x5a, 0xe2, 0x41, 0x2b, 0x26, 0x8a, 0xce, 0xc8,
+	0xdc, 0x6b, 0x19, 0xfd, 0x95, 0x88, 0x10, 0x34, 0x88, 0x08, 0xa7, 0x9e, 0x6b, 0x60, 0x33, 0xd6,
+	0x58, 0x41, 0x27, 0xcc, 0x6b, 0x6f, 0x38, 0x5b, 0x2e, 0x36, 0x63, 0x6d, 0x26, 0x9b, 0x90, 0x90,
+	0x06, 0xe6, 0x10, 0x60, 0x56, 0xb7, 0x0d, 0xb2, 0x4f, 0x52, 0xea, 0xff, 0x54, 0x87, 0x96, 0x0d,
+	0x2a, 0x7a, 0x09, 0xda, 0x24, 0x49, 0xf8, 0x2c, 0xc8, 0x1f, 0x52, 0xe3, 0x15, 0x17, 0xbb, 0x06,
+	0x18, 0x3e, 0xa4, 0xe8, 0x75, 0x58, 0x2b, 0x27, 0x75, 0x78, 0x26, 0x09, 0x9f, 0x19, 0x37, 0xb9,
+	0x78, 0xd5, 0xa0, 0xf7, 0x2d, 0x88, 0xee, 0x42, 0x83, 0xe9, 0xed, 0x65, 0x92, 0x5d, 0x3f, 0x4d,
+	0x92, 0xf5, 0x06, 0xc3, 0x4f, 0x6f, 0x62, 0x43, 0x87, 0x52, 0xe8, 0x6a, 0x48, 0x2a, 0x41, 0xf2,
+	0x9c, 0x0a, 0xe3, 0xee, 0x4e, 0x7f, 0x70, 0x2a, 0xfa, 0x9d, 0x25, 0x42, 0x7c, 0x84, 0xde, 0xbf,
+	0x06, 0x0d, 0xad, 0x5c, 0x67, 0x48, 0x21, 0x92, 0x2a, 0x43, 0x0a, 0x91, 0xe8, 0x8c, 0x08, 0x79,
+	0xa6, 0x68, 0xa6, 0xa4, 0xcd, 0x93, 0x85, 0xec, 0xef, 0x43, 0x77, 0x99, 0x13, 0x5d, 0x80, 0xe6,
+	0x21, 0x15, 0x19, 0xad, 0x08, 0xac, 0xa4, 0x71, 0x96, 0x31, 0x25, 0x22, 0xcb, 0x60, 0x25, 0x9d,
+	0x7d, 0x5c, 0x56, 0xf5, 0x81, 0x4b, 0xff, 0x57, 0xc7, 0xc4, 0xc6, 0xdc, 0x87, 0xaa, 0x1c, 0x38,
+	0x67, 0x5e, 0x0e, 0x6a, 0x67, 0x58, 0x0e, 0xfc, 0xbf, 0xd6, 0xc0, 0xad, 0xae, 0x1c, 0x3a, 0x0f,
+	0x2b, 0x52, 0x11, 0x45, 0xed, 0xf1, 0x4b, 0x41, 0x67, 0xfd, 0x98, 0x67, 0x11, 0xcb, 0xe2, 0x20,
+	0xe5, 0x11, 0x35, 0xfa, 0xeb, 0xb8, 0x63, 0xb1, 0x3d, 0x1e, 0x51, 0x94, 0x41, 0x37, 0x25, 0x59,
+	0x31, 0x21, 0xa1, 0x2a, 0x04, 0x15, 0x36, 0x99, 0x3e, 0x3e, 0x55, 0x01, 0xe8, 0xed, 0x2d, 0x31,
+	0xe2, 0x23, 0xfc, 0x68, 0x0c, 0x2e, 0xcb, 0xa4, 0x22, 0x59, 0x48, 0x6d, 0x66, 0xdd, 0x3a, 0x9d,
+	0xae, 0x81, 0x65, 0xc3, 0x0b, 0x5e, 0xf4, 0x25, 0x34, 0xc3, 0x42, 0x2a, 0x9e, 0xda, 0x72, 0x76,
+	0xe3, 0x74, 0x1a, 0x76, 0x0d, 0x17, 0xb6, 0x9c, 0xfa, 0x04, 0x13, 0x12, 0xb2, 0x84, 0xa9, 0xb9,
+	0xd7, 0x3c, 0x8b, 0x13, 0xdc, 0xb2, 0x6c, 0x78, 0xc1, 0xeb, 0xf7, 0xa1, 0xbb, 0xec, 0xc3, 0x27,
+	0x3a, 0x16, 0x82, 0x86, 0x4c, 0x8a, 0xd8, 0x26, 0xb5, 0x19, 0xfb, 0xbf, 0xb8, 0xe0, 0x56, 0xce,
+	0x78, 0x62, 0xc3, 0x22, 0x3f, 0x6a, 0xcb, 0xf9, 0xf1, 0x6f, 0x35, 0xf7, 0x48, 0x85, 0x6a, 0x3c,
+	0x56, 0xa1, 0x2e, 0x40, 0x53, 0x50, 0x19, 0x16, 0xd4, 0x78, 0xd8, 0xc5, 0x56, 0x42, 0x13, 0xa8,
+	0x1d, 0x8c, 0xac, 0x57, 0xee, 0x9d, 0x4d, 0x5c, 0x7b, 0x07, 0x39, 0x15, 0x44, 0xb1, 0x2c, 0x1e,
+	0xcd, 0xa5, 0xa2, 0x29, 0xae, 0x1d, 0x8c, 0x74, 0xa5, 0x25, 0xc9, 0x8c, 0xcc, 0xa5, 0xb1, 0xae,
+	0x65, 0x6c, 0x68, 0x97, 0x88, 0x36, 0xef, 0x0d, 0x58, 0xd7, 0xa5, 0x2c, 0x90, 0xa1, 0x60, 0xb9,
+	0x0a, 0x74, 0x5d, 0x29, 0x6b, 0xf7, 0xaa, 0x86, 0x47, 0x06, 0xbd, 0x2b, 0x12, 0xf4, 0x05, 0xd4,
+	0x59, 0x2e, 0xbd, 0xb6, 0xe9, 0xa6, 0x83, 0x33, 0xb2, 0x77, 0x30, 0xc4, 0x9a, 0x55, 0x3b, 0xb7,
+	0x90, 0x54, 0x98, 0xb6, 0x5a, 0xf6, 0x82, 0x85, 0x8c, 0xfa, 0xf0, 0x42, 0x28, 0xe6, 0xb9, 0xa2,
+	0x51, 0x20, 0x38, 0x57, 0x41, 0x4e, 0xa4, 0x9c, 0x71, 0x11, 0x79, 0x1d, 0xb3, 0xf0, 0x79, 0x3b,
+	0x89, 0x39, 0x57, 0x43, 0x3b, 0xa5, 0x63, 0xae, 0x48, 0x2c, 0xbd, 0xae, 0x69, 0x5d, 0x66, 0x8c,
+	0xa6, 0xd0, 0x92, 0x8a, 0x0b, 0x12, 0x53, 0x6f, 0xd5, 0x38, 0x7d, 0xff, 0x8c, 0x0e, 0x31, 0x2a,
+	0x59, 0x71, 0x45, 0x8f, 0x5e, 0x04, 0x57, 0xca, 0x69, 0x70, 0x48, 0xe7, 0xd2, 0x5b, 0x33, 0x16,
+	0xb4, 0xa4, 0x9c, 0x7e, 0x42, 0xe7, 0x12, 0x5d, 0x82, 0x55, 0xfb, 0x94, 0x08, 0x04, 0x25, 0xd1,
+	0xdc, 0x5b, 0x37, 0xf1, 0xe8, 0x5a, 0x10, 0x6b, 0xcc, 0xff, 0xc1, 0x81, 0xf5, 0xc7, 0x22, 0xb9,
+	0xc8, 0x62, 0xe7, 0x51, 0x16, 0xeb, 0xcc, 0x8a, 0x98, 0x54, 0x82, 0x57, 0x05, 0xbb, 0x94, 0x74,
+	0x77, 0xd6, 0x5d, 0x9a, 0xf1, 0xcc, 0x66, 0x6a, 0x25, 0xea, 0x44, 0x65, 0x29, 0x89, 0x69, 0xa0,
+	0x48, 0x6c, 0x12, 0xb5, 0x8d, 0x5d, 0x03, 0xdc, 0x21, 0x31, 0xba, 0x08, 0x2d, 0x2e, 0x03, 0xa3,
+	0x65, 0xa5, 0xe4, 0xe3, 0x72, 0xa4, 0x6f, 0xcb, 0xcf, 0x0e, 0xd4, 0x06, 0x43, 0x4d, 0x4b, 0xa2,
+	0x48, 0x50, 0x29, 0xad, 0x15, 0x95, 0xa8, 0x67, 0x32, 0xaa, 0x52, 0x22, 0x0f, 0xad, 0x25, 0x95,
+	0xb8, 0xfc, 0x50, 0xa8, 0x1f, 0x7d, 0x28, 0x5c, 0x80, 0xe6, 0x84, 0xa4, 0x2c, 0x99, 0xdb, 0x37,
+	0x8a, 0x95, 0x34, 0x9e, 0x17, 0xe3, 0x84, 0x85, 0xd5, 0x75, 0x29, 0x25, 0xf4, 0x2a, 0x40, 0x4a,
+	0x32, 0x12, 0xd3, 0x94, 0x66, 0xca, 0x5c, 0x1b, 0x17, 0x2f, 0x21, 0xfe, 0x5d, 0x68, 0xd9, 0x40,
+	0xe8, 0x0b, 0x1c, 0x31, 0x79, 0xa8, 0xcd, 0xd4, 0xce, 0x2f, 0x05, 0xed, 0x41, 0x41, 0x98, 0x6e,
+	0x6e, 0x26, 0x27, 0xf4, 0x18, 0x6d, 0x40, 0x67, 0xc2, 0x12, 0x2a, 0x8d, 0x8f, 0x75, 0x8f, 0x33,
+	0x2f, 0x9d, 0x25, 0xc8, 0xff, 0xcd, 0x81, 0x66, 0x59, 0xd4, 0xd0, 0xd7, 0xb0, 0x9e, 0x0b, 0x6a,
+	0x2a, 0x67, 0x92, 0xd0, 0x28, 0xe0, 0xd2, 0xb6, 0xbd, 0xff, 0xea, 0xf6, 0xae, 0x2d, 0xab, 0x3b,
+	0x90, 0xe8, 0x4d, 0x6d, 0x00, 0x7b, 0x40, 0x14, 0x0d, 0x64, 0x31, 0xce, 0xa8, 0xe9, 0xf5, 0xda,
+	0xe2, 0x35, 0x0b, 0x8f, 0x4a, 0xd4, 0x7f, 0x08, 0x6e, 0x55, 0x28, 0x75, 0xc8, 0xf3, 0x84, 0x64,
+	0xc1, 0x52, 0xf6, 0xb8, 0x1a, 0xd0, 0x91, 0x45, 0x97, 0xe1, 0x9c, 0x99, 0xb4, 0xf9, 0x11, 0x2c,
+	0x15, 0xca, 0x75, 0x3d, 0x71, 0xaf, 0xc4, 0xcd, 0xda, 0x4b, 0xb0, 0x5a, 0xd5, 0xdc, 0x20, 0xd4,
+	0x1d, 0xb2, 0x0c, 0x68, 0xb7, 0x02, 0x77, 0x79, 0x44, 0xfb, 0x7f, 0x37, 0x61, 0xbd, 0x3a, 0xa1,
+	0x7e, 0x2c, 0xb2, 0x90, 0xa2, 0xef, 0x1d, 0x68, 0xe8, 0x2f, 0x0f, 0x7a, 0xe7, 0x38, 0x7e, 0x5a,
+	0xfa, 0x24, 0xf9, 0x57, 0x8f, 0xb3, 0xb1, 0xfc, 0x04, 0x5d, 0xfc, 0xe6, 0x8f, 0x3f, 0x7f, 0xac,
+	0x9d, 0xdb, 0xec, 0x6e, 0x3f, 0xb8, 0xba, 0xf8, 0xcc, 0xbd, 0xe7, 0x5c, 0x46, 0x05, 0xac, 0xec,
+	0xcc, 0xf7, 0xae, 0xef, 0xa2, 0xb7, 0x8f, 0x43, 0xfa, 0xe8, 0x43, 0xe5, 0x9f, 0xe8, 0x8f, 0x86,
+	0x14, 0x34, 0x76, 0xe6, 0x83, 0xe1, 0xff, 0xa2, 0xf5, 0xc6, 0x33, 0xd6, 0xfa, 0xad, 0x03, 0xf5,
+	0xeb, 0x49, 0x82, 0x8e, 0x1f, 0xb6, 0x93, 0x29, 0xdc, 0x3c, 0x6f, 0x82, 0xbd, 0x86, 0x8e, 0x04,
+	0xfb, 0x8a, 0x83, 0x32, 0x68, 0x0e, 0xb2, 0x58, 0xff, 0x82, 0x4f, 0x60, 0xca, 0xf1, 0xb7, 0xa0,
+	0x19, 0xac, 0xdc, 0x27, 0x2a, 0x9c, 0x3e, 0x5b, 0x7f, 0x5f, 0x71, 0x76, 0xe0, 0x73, 0xb7, 0x82,
+	0xc7, 0x4d, 0xb3, 0xee, 0xad, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x29, 0x55, 0xfa, 0x6a, 0xcc,
+	0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto
index fba1fc07e..9b4c912da 100644
--- a/protos/hardware/hardware.proto
+++ b/protos/hardware/hardware.proto
@@ -26,7 +26,7 @@ service HardwareService {
 }
 
 message PushRequest {
-	string data = 1;
+	Hardware data = 1;
 }
 
 message Empty {
diff --git a/test/framework/hardware.go b/test/framework/hardware.go
index 5b8f77aab..cc5c87b9e 100644
--- a/test/framework/hardware.go
+++ b/test/framework/hardware.go
@@ -2,6 +2,7 @@ package framework
 
 import (
 	"context"
+	"encoding/json"
 	"io/ioutil"
 	"os"
 
@@ -9,18 +10,18 @@ import (
 	"github.com/tinkerbell/tink/protos/hardware"
 )
 
-func readHwData(file string) (string, error) {
+func readHwData(file string) ([]byte, error) {
 	f, err := os.Open(file)
 	if err != nil {
-		return "", err
+		return []byte(""), err
 	}
 	defer f.Close()
 
 	data, err := ioutil.ReadAll(f)
 	if err != nil {
-		return "", err
+		return []byte(""), err
 	}
-	return string(data), nil
+	return data, nil
 }
 
 // PushHardwareData : push hardware data
@@ -31,7 +32,9 @@ func PushHardwareData(hwDataFiles []string) error {
 		if err != nil {
 			return err
 		}
-		_, err = client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: data})
+		hw := hardware.Hardware{}
+		err = json.Unmarshal(data, &hw)
+		_, err = client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: &hw})
 		if err != nil {
 			return err
 		}