diff --git a/signal-server-openapi.yaml b/signal-server-openapi.yaml
index 7cc2ab9b2..c199b827e 100644
--- a/signal-server-openapi.yaml
+++ b/signal-server-openapi.yaml
@@ -1192,15 +1192,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
   /v1/messages/uuid/{uuid}:
@@ -1223,15 +1223,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
   /v1/messages/report/{source}/{messageGuid}:
@@ -1504,15 +1504,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/profile:
     put:
       tags:
@@ -1819,15 +1819,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/subscription/boost/create:
     post:
       tags:
@@ -1847,15 +1847,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/subscription/boost/receipt_credentials:
     post:
       tags:
@@ -1880,15 +1880,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/subscription/boost/paypal/create:
     post:
       tags:
@@ -1908,15 +1908,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/subscription/{subscriberId}/create_payment_method/paypal:
     post:
       tags:
@@ -1942,15 +1942,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -1981,15 +1981,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2022,15 +2022,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2053,15 +2053,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2083,15 +2083,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2113,15 +2113,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2138,15 +2138,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       deprecated: true
   /v1/subscription/boost/badges:
     get:
@@ -2161,15 +2161,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       deprecated: true
   /v1/subscription/configuration:
     get:
@@ -2184,15 +2184,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
   /v1/subscription/boost/amounts/gift:
     get:
       tags:
@@ -2206,15 +2206,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       deprecated: true
   /v1/subscription/levels:
     get:
@@ -2229,15 +2229,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       deprecated: true
   /v1/subscription/{subscriberId}/default_payment_method/{paymentMethodId}:
     post:
@@ -2263,15 +2263,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       deprecated: true
       security:
       - authenticatedAccount: []
@@ -2308,15 +2308,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2355,15 +2355,15 @@ paths:
               schema:
                 type: object
                 properties:
-                  cancelled:
-                    type: boolean
-                  done:
-                    type: boolean
                   completedExceptionally:
                     type: boolean
                   numberOfDependents:
                     type: integer
                     format: int32
+                  cancelled:
+                    type: boolean
+                  done:
+                    type: boolean
       security:
       - authenticatedAccount: []
       - {}
@@ -2837,14 +2837,14 @@ components:
     ECPublicKey:
       type: object
       properties:
-        type:
-          type: integer
-          format: int32
         publicKeyBytes:
           type: array
           items:
             type: string
             format: byte
+        type:
+          type: integer
+          format: int32
     ECSignedPreKey:
       type: object
       properties:
@@ -3278,13 +3278,13 @@ components:
     WebSocketClient:
       type: object
       properties:
-        open:
-          type: boolean
-        userAgent:
-          type: string
         createdTimestamp:
           type: integer
           format: int64
+        userAgent:
+          type: string
+        open:
+          type: boolean
     WebSocketSessionContext:
       type: object
       properties: