diff --git a/proto/viam/app/v1/app.proto b/proto/viam/app/v1/app.proto
index ac37d6317..181108a12 100644
--- a/proto/viam/app/v1/app.proto
+++ b/proto/viam/app/v1/app.proto
@@ -310,6 +310,25 @@ service AppService {
   rpc GetAppContent(GetAppContentRequest) returns (GetAppContentResponse);
 
   rpc GetAppBranding(GetAppBrandingRequest) returns (GetAppBrandingResponse);
+
+  // Upload a device push token for the user.
+  rpc UploadDevicePushToken(UploadDevicePushTokenRequest) returns (UploadDevicePushTokenResponse);
+
+  // Delete a device push token for the user.
+  rpc DeleteDevicePushToken(DeleteDevicePushTokenRequest) returns (DeleteDevicePushTokenResponse);
+
+  // Gets all device push tokens for the user.
+  rpc GetDevicePushTokens(GetDevicePushTokensRequest) returns (GetDevicePushTokensResponse);
+
+  // Set the Firebase config JSON for a specific app bundle id.
+  rpc SetFirebaseConfig(SetFirebaseConfigRequest) returns (SetFirebaseConfigResponse);
+
+  // Read the bundle ID for an organization.
+  // This RPC returns only the bundle_id configured for the org, not the Firebase config JSON.
+  rpc GetFirebaseConfig(GetFirebaseConfigRequest) returns (GetFirebaseConfigResponse);
+
+  // Deletes a Firebase config JSON for a specific app bundle id.
+  rpc DeleteFirebaseConfig(DeleteFirebaseConfigRequest) returns (DeleteFirebaseConfigResponse);
 }
 
 enum OnlineState {
@@ -2022,3 +2041,56 @@ message MachinePickerCustomizations {
   optional string heading = 1;
   optional string subheading = 2;
 }
+
+// Device push token messages
+
+message UploadDevicePushTokenRequest {
+  string email = 1;
+  string bundle_id = 2;
+  string device_token = 3;
+  string device_uuid = 4;
+}
+
+message UploadDevicePushTokenResponse {}
+
+message DeleteDevicePushTokenRequest {
+  string email = 1;
+  string bundle_id = 2;
+  string device_uuid = 3;
+}
+
+message DeleteDevicePushTokenResponse {}
+
+message GetDevicePushTokensRequest {
+  string email = 1;
+  string bundle_id = 2;
+}
+
+message GetDevicePushTokensResponse {
+  repeated string device_tokens = 1;
+}
+
+// Firebase config messages
+
+message SetFirebaseConfigRequest {
+  string org_id = 1;
+  string bundle_id = 2;
+  string config_json = 3;
+}
+
+message SetFirebaseConfigResponse {}
+
+message GetFirebaseConfigRequest {
+  string org_id = 1;
+}
+
+message GetFirebaseConfigResponse {
+  string bundle_id = 1;
+}
+
+message DeleteFirebaseConfigRequest {
+  string org_id = 1;
+  string bundle_id = 2;
+}
+
+message DeleteFirebaseConfigResponse {}