diff --git a/proto/viam/app/v1/app.proto b/proto/viam/app/v1/app.proto
index a61643ce2..7a58a4f5b 100644
--- a/proto/viam/app/v1/app.proto
+++ b/proto/viam/app/v1/app.proto
@@ -37,6 +37,12 @@ service AppService {
   // Delete an organization
   rpc DeleteOrganization(DeleteOrganizationRequest) returns (DeleteOrganizationResponse);
 
+  // Get user-defined metadata for an organization
+  rpc GetOrganizationMetadata(GetOrganizationMetadataRequest) returns (GetOrganizationMetadataResponse);
+
+  // Update user-defined metadata for an organization
+  rpc UpdateOrganizationMetadata(UpdateOrganizationMetadataRequest) returns (UpdateOrganizationMetadataResponse);
+
   // List all members of an organization and all invited members to the organization.
   rpc ListOrganizationMembers(ListOrganizationMembersRequest) returns (ListOrganizationMembersResponse);
 
@@ -69,6 +75,12 @@ service AppService {
   // Delete a location
   rpc DeleteLocation(DeleteLocationRequest) returns (DeleteLocationResponse);
 
+  // Get user-defined metadata for a location
+  rpc GetLocationMetadata(GetLocationMetadataRequest) returns (GetLocationMetadataResponse);
+
+  // Update user-defined metadata for a location
+  rpc UpdateLocationMetadata(UpdateLocationMetadataRequest) returns (UpdateLocationMetadataResponse);
+
   // Get a list of locations
   rpc ListLocations(ListLocationsRequest) returns (ListLocationsResponse);
 
@@ -91,6 +103,12 @@ service AppService {
   // Get a specific robot by ID
   rpc GetRobot(GetRobotRequest) returns (GetRobotResponse);
 
+  // Get user-defined metadata for a robot
+  rpc GetRobotMetadata(GetRobotMetadataRequest) returns (GetRobotMetadataResponse);
+
+  // Update user-defined metadata for an robot
+  rpc UpdateRobotMetadata(UpdateRobotMetadataRequest) returns (UpdateRobotMetadataResponse);
+
   // Get Rover Rental Location Robots
   rpc GetRoverRentalRobots(GetRoverRentalRobotsRequest) returns (GetRoverRentalRobotsResponse);
 
@@ -115,6 +133,12 @@ service AppService {
   // Delete a robot part
   rpc DeleteRobotPart(DeleteRobotPartRequest) returns (DeleteRobotPartResponse);
 
+  // Get user-defined metadata for a robot part
+  rpc GetRobotPartMetadata(GetRobotPartMetadataRequest) returns (GetRobotPartMetadataResponse);
+
+  // Update user-defined metadata for an robot part
+  rpc UpdateRobotPartMetadata(UpdateRobotPartMetadataRequest) returns (UpdateRobotPartMetadataResponse);
+
   // Gets the Robot API Keys for the robot
   rpc GetRobotAPIKeys(GetRobotAPIKeysRequest) returns (GetRobotAPIKeysResponse);
 
@@ -311,6 +335,21 @@ message DeleteOrganizationRequest {
 
 message DeleteOrganizationResponse {}
 
+message GetOrganizationMetadataRequest {
+  string organization_id = 1;
+}
+
+message GetOrganizationMetadataResponse {
+  bytes data = 1;
+}
+
+message UpdateOrganizationMetadataRequest {
+  string organization_id = 1;
+  bytes data = 2;
+}
+
+message UpdateOrganizationMetadataResponse {}
+
 message ListOrganizationMembersRequest {
   string organization_id = 1;
 }
@@ -480,6 +519,21 @@ message DeleteLocationRequest {
 
 message DeleteLocationResponse {}
 
+message GetLocationMetadataRequest {
+  string location_id = 1;
+}
+
+message GetLocationMetadataResponse {
+  bytes data = 1;
+}
+
+message UpdateLocationMetadataRequest {
+  string location_id = 1;
+  bytes data = 2;
+}
+
+message UpdateLocationMetadataResponse {}
+
 message ListLocationsRequest {
   // Organization ID under which to list all locations.
   string organization_id = 1;
@@ -635,6 +689,21 @@ message DeleteRobotPartRequest {
   string part_id = 1;
 }
 
+message GetRobotPartMetadataRequest {
+  string id = 1;
+}
+
+message GetRobotPartMetadataResponse {
+  bytes data = 1;
+}
+
+message UpdateRobotPartMetadataRequest {
+  string id = 1;
+  bytes data = 2;
+}
+
+message UpdateRobotPartMetadataResponse {}
+
 message GetRobotAPIKeysRequest {
   string robot_id = 1;
 }
@@ -745,6 +814,21 @@ message DeleteRobotRequest {
 
 message DeleteRobotResponse {}
 
+message GetRobotMetadataRequest {
+  string id = 1;
+}
+
+message GetRobotMetadataResponse {
+  bytes data = 1;
+}
+
+message UpdateRobotMetadataRequest {
+  string id = 1;
+  bytes data = 2;
+}
+
+message UpdateRobotMetadataResponse {}
+
 message MarkPartAsMainRequest {
   string part_id = 1;
 }