diff --git a/pkg/pb/referralmanager.pb.go b/pkg/pb/referralmanager.pb.go
index f96a08231..539ce867e 100644
--- a/pkg/pb/referralmanager.pb.go
+++ b/pkg/pb/referralmanager.pb.go
@@ -25,7 +25,8 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type GetTokensRequest struct {
-	UserId               []byte   `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	OwnerUserId          []byte   `protobuf:"bytes,1,opt,name=owner_user_id,json=ownerUserId,proto3" json:"owner_user_id,omitempty"`
+	OwnerSatelliteId     NodeID   `protobuf:"bytes,2,opt,name=owner_satellite_id,json=ownerSatelliteId,proto3,customtype=NodeID" json:"owner_satellite_id"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -55,15 +56,15 @@ func (m *GetTokensRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetTokensRequest proto.InternalMessageInfo
 
-func (m *GetTokensRequest) GetUserId() []byte {
+func (m *GetTokensRequest) GetOwnerUserId() []byte {
 	if m != nil {
-		return m.UserId
+		return m.OwnerUserId
 	}
 	return nil
 }
 
 type GetTokensResponse struct {
-	Token                [][]byte `protobuf:"bytes,1,rep,name=token,proto3" json:"token,omitempty"`
+	TokenSecrets         [][]byte `protobuf:"bytes,1,rep,name=token_secrets,json=tokenSecrets,proto3" json:"token_secrets,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -93,9 +94,9 @@ func (m *GetTokensResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetTokensResponse proto.InternalMessageInfo
 
-func (m *GetTokensResponse) GetToken() [][]byte {
+func (m *GetTokensResponse) GetTokenSecrets() [][]byte {
 	if m != nil {
-		return m.Token
+		return m.TokenSecrets
 	}
 	return nil
 }
@@ -187,25 +188,27 @@ func init() {
 func init() { proto.RegisterFile("referralmanager.proto", fileDescriptor_45d96ad24f1e021c) }
 
 var fileDescriptor_45d96ad24f1e021c = []byte{
-	// 285 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x4a, 0x4d, 0x4b,
-	0x2d, 0x2a, 0x4a, 0xcc, 0xc9, 0x4d, 0xcc, 0x4b, 0x4c, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x17, 0xe2, 0x47, 0x13, 0x96, 0xe2, 0x4a, 0xcf, 0x4f, 0xcf, 0x87, 0x48, 0x2a, 0x69, 0x73,
-	0x09, 0xb8, 0xa7, 0x96, 0x84, 0xe4, 0x67, 0xa7, 0xe6, 0x15, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16,
-	0x97, 0x08, 0x89, 0x73, 0xb1, 0x97, 0x16, 0xa7, 0x16, 0xc5, 0x67, 0xa6, 0x48, 0x30, 0x2a, 0x30,
-	0x6a, 0xf0, 0x04, 0xb1, 0x81, 0xb8, 0x9e, 0x29, 0x4a, 0x9a, 0x5c, 0x82, 0x48, 0x8a, 0x8b, 0x0b,
-	0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x44, 0xb8, 0x58, 0x4b, 0x40, 0x22, 0x12, 0x8c, 0x0a, 0xcc, 0x1a,
-	0x3c, 0x41, 0x10, 0x8e, 0xd2, 0x04, 0x46, 0x2e, 0xa1, 0xa0, 0xd4, 0x94, 0xd4, 0xd4, 0x5c, 0xb0,
-	0x72, 0x98, 0xd1, 0x48, 0x8a, 0x19, 0xe1, 0x8a, 0x85, 0x54, 0xb8, 0xf8, 0x8a, 0xc0, 0x6a, 0xe3,
-	0x61, 0xf6, 0x32, 0x81, 0xa5, 0x79, 0x20, 0xa2, 0xa1, 0x60, 0xdb, 0x85, 0xec, 0xb8, 0x84, 0xa1,
-	0xaa, 0x8a, 0x13, 0x4b, 0x52, 0x73, 0x72, 0x32, 0x4b, 0x52, 0x41, 0x4a, 0x99, 0x41, 0x4a, 0x9d,
-	0xf8, 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x9e, 0xcd, 0x2f, 0x3f, 0x25, 0xd5, 0xd3, 0x25,
-	0x48, 0x10, 0xa2, 0x34, 0x18, 0xa6, 0xd2, 0x33, 0x45, 0x49, 0x94, 0x4b, 0x18, 0xc5, 0x45, 0x10,
-	0xf7, 0x1b, 0xed, 0x67, 0xe4, 0xe2, 0x0f, 0x82, 0x86, 0x90, 0x2f, 0x24, 0x84, 0x84, 0x82, 0xb8,
-	0x38, 0xe1, 0x1e, 0x15, 0x52, 0xd4, 0x43, 0x0f, 0x57, 0xf4, 0x10, 0x93, 0x52, 0xc2, 0xa7, 0x04,
-	0x1a, 0x4e, 0x11, 0x5c, 0xdc, 0x48, 0xd6, 0x0b, 0x29, 0x63, 0x68, 0xc1, 0x0c, 0x2e, 0x29, 0x15,
-	0xfc, 0x8a, 0x20, 0x26, 0x3b, 0xb1, 0x44, 0x31, 0x15, 0x24, 0x25, 0xb1, 0x81, 0x23, 0xd4, 0x18,
-	0x10, 0x00, 0x00, 0xff, 0xff, 0x76, 0xe9, 0xfe, 0x01, 0x06, 0x02, 0x00, 0x00,
+	// 320 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbf, 0x4e, 0xc2, 0x50,
+	0x14, 0xc6, 0x2d, 0x28, 0x89, 0x87, 0xf2, 0xef, 0x22, 0x09, 0x61, 0x01, 0x0b, 0x03, 0x13, 0x83,
+	0x2e, 0x0e, 0xc6, 0x81, 0x98, 0x98, 0x0e, 0x3a, 0x5c, 0x34, 0x31, 0x2e, 0x4d, 0xb1, 0xc7, 0x86,
+	0x58, 0x7a, 0xeb, 0xb9, 0x97, 0xf8, 0x1a, 0xbe, 0x91, 0xab, 0xcf, 0xe0, 0xc0, 0xb3, 0x98, 0xde,
+	0x5b, 0x48, 0x29, 0x86, 0xb1, 0x5f, 0x7f, 0xa7, 0xe7, 0xfb, 0xbe, 0x53, 0xe8, 0x10, 0xbe, 0x21,
+	0x91, 0x1f, 0x2d, 0xfd, 0xd8, 0x0f, 0x91, 0x26, 0x09, 0x09, 0x25, 0x58, 0xa3, 0x20, 0xf7, 0x20,
+	0x14, 0xa1, 0x30, 0x2f, 0x1d, 0x05, 0xcd, 0x3b, 0x54, 0x8f, 0xe2, 0x1d, 0x63, 0xc9, 0xf1, 0x63,
+	0x85, 0x52, 0x31, 0x07, 0x6a, 0xe2, 0x33, 0x46, 0xf2, 0x56, 0x12, 0xc9, 0x5b, 0x04, 0x5d, 0x6b,
+	0x60, 0x8d, 0x6d, 0x5e, 0xd5, 0xe2, 0x93, 0x44, 0x72, 0x03, 0x76, 0x0d, 0xcc, 0x30, 0xd2, 0x57,
+	0x18, 0x45, 0x0b, 0x85, 0x29, 0x58, 0x4a, 0xc1, 0x69, 0xfd, 0x67, 0xdd, 0x3f, 0xfa, 0x5d, 0xf7,
+	0x2b, 0x0f, 0x22, 0x40, 0xf7, 0x96, 0x37, 0x35, 0x39, 0xdb, 0x80, 0x6e, 0xe0, 0x5c, 0x41, 0x2b,
+	0xb7, 0x55, 0x26, 0x22, 0x96, 0xc8, 0x86, 0x50, 0x53, 0xa9, 0xe2, 0x49, 0x7c, 0x25, 0x54, 0xb2,
+	0x6b, 0x0d, 0xca, 0x63, 0x9b, 0xdb, 0x5a, 0x9c, 0x19, 0xcd, 0xf9, 0xb2, 0x80, 0x71, 0x0c, 0x10,
+	0x97, 0x7a, 0x7a, 0x63, 0xf9, 0x0c, 0x4e, 0x34, 0x96, 0x59, 0x35, 0x0f, 0x6c, 0x04, 0x75, 0xd2,
+	0xec, 0x36, 0x89, 0x36, 0xc8, 0x6d, 0xa3, 0x66, 0x51, 0x6e, 0xa0, 0x9d, 0x51, 0x3b, 0x59, 0xca,
+	0xff, 0x66, 0x69, 0x19, 0x34, 0x1f, 0xa6, 0x03, 0xed, 0x1d, 0x47, 0x26, 0xce, 0xc5, 0xb7, 0x05,
+	0x0d, 0x9e, 0x35, 0x7f, 0x6f, 0x9a, 0x67, 0x1c, 0x4e, 0xb7, 0xb9, 0xd9, 0xf9, 0xa4, 0x78, 0xaf,
+	0xe2, 0x25, 0x7a, 0xce, 0x21, 0x24, 0xab, 0xed, 0x19, 0xaa, 0xb9, 0xf5, 0x6c, 0xb8, 0x37, 0xb2,
+	0x5f, 0x57, 0x6f, 0x74, 0x18, 0x32, 0x5f, 0x9e, 0x1e, 0xbf, 0x94, 0x92, 0xf9, 0xbc, 0xa2, 0x7f,
+	0x94, 0xcb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xaa, 0x93, 0xfc, 0x5e, 0x02, 0x00, 0x00,
 }
 
 type DRPCReferralManagerClient interface {
diff --git a/pkg/pb/referralmanager.proto b/pkg/pb/referralmanager.proto
index 4ff15541a..ba7084ccf 100644
--- a/pkg/pb/referralmanager.proto
+++ b/pkg/pb/referralmanager.proto
@@ -14,11 +14,12 @@ service ReferralManager {
 }
 
 message GetTokensRequest{
-    bytes user_id = 1;
+    bytes owner_user_id = 1;
+    bytes owner_satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false];
 }
 
 message GetTokensResponse {
- repeated bytes token = 1;
+ repeated bytes token_secrets = 1;
 }
 
 message RedeemTokenRequest {
diff --git a/proto.lock b/proto.lock
index 18b52e4e5..532deecc9 100644
--- a/proto.lock
+++ b/proto.lock
@@ -5984,8 +5984,23 @@
             "fields": [
               {
                 "id": 1,
-                "name": "user_id",
+                "name": "owner_user_id",
                 "type": "bytes"
+              },
+              {
+                "id": 2,
+                "name": "owner_satellite_id",
+                "type": "bytes",
+                "options": [
+                  {
+                    "name": "(gogoproto.customtype)",
+                    "value": "NodeID"
+                  },
+                  {
+                    "name": "(gogoproto.nullable)",
+                    "value": "false"
+                  }
+                ]
               }
             ]
           },
@@ -5994,7 +6009,7 @@
             "fields": [
               {
                 "id": 1,
-                "name": "token",
+                "name": "token_secrets",
                 "type": "bytes",
                 "is_repeated": true
               }