diff --git a/openapi-administration.json b/openapi-administration.json
index dab9211d4..2423e0744 100644
--- a/openapi-administration.json
+++ b/openapi-administration.json
@@ -187,6 +187,12 @@
                         "type": "string"
                     }
                 }
+            },
+            "RichObjectParameters": {
+                "type": "object",
+                "additionalProperties": {
+                    "$ref": "#/components/schemas/RichObjectParameter"
+                }
             }
         }
     },
@@ -422,20 +428,14 @@
                                         "description": "Message of the notification"
                                     },
                                     "subjectParameters": {
-                                        "type": "object",
-                                        "default": {},
-                                        "description": "Rich objects to fill the subject placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}",
-                                        "additionalProperties": {
-                                            "$ref": "#/components/schemas/RichObjectParameter"
-                                        }
+                                        "$ref": "#/components/schemas/RichObjectParameters",
+                                        "default": [],
+                                        "description": "Rich objects to fill the subject placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}"
                                     },
                                     "messageParameters": {
-                                        "type": "object",
-                                        "default": {},
-                                        "description": "Rich objects to fill the message placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}",
-                                        "additionalProperties": {
-                                            "$ref": "#/components/schemas/RichObjectParameter"
-                                        }
+                                        "$ref": "#/components/schemas/RichObjectParameters",
+                                        "default": [],
+                                        "description": "Rich objects to fill the message placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}"
                                     }
                                 }
                             }
diff --git a/openapi-full.json b/openapi-full.json
index 3875a3ee3..7dbc4dfe3 100644
--- a/openapi-full.json
+++ b/openapi-full.json
@@ -109,19 +109,13 @@
                         "type": "string"
                     },
                     "subjectRichParameters": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "$ref": "#/components/schemas/RichObjectParameter"
-                        }
+                        "$ref": "#/components/schemas/RichObjectParameters"
                     },
                     "messageRich": {
                         "type": "string"
                     },
                     "messageRichParameters": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "$ref": "#/components/schemas/RichObjectParameter"
-                        }
+                        "$ref": "#/components/schemas/RichObjectParameters"
                     },
                     "icon": {
                         "type": "string"
@@ -304,6 +298,12 @@
                         "type": "string"
                     }
                 }
+            },
+            "RichObjectParameters": {
+                "type": "object",
+                "additionalProperties": {
+                    "$ref": "#/components/schemas/RichObjectParameter"
+                }
             }
         }
     },
@@ -1226,20 +1226,14 @@
                                         "description": "Message of the notification"
                                     },
                                     "subjectParameters": {
-                                        "type": "object",
-                                        "default": {},
-                                        "description": "Rich objects to fill the subject placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}",
-                                        "additionalProperties": {
-                                            "$ref": "#/components/schemas/RichObjectParameter"
-                                        }
+                                        "$ref": "#/components/schemas/RichObjectParameters",
+                                        "default": [],
+                                        "description": "Rich objects to fill the subject placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}"
                                     },
                                     "messageParameters": {
-                                        "type": "object",
-                                        "default": {},
-                                        "description": "Rich objects to fill the message placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}",
-                                        "additionalProperties": {
-                                            "$ref": "#/components/schemas/RichObjectParameter"
-                                        }
+                                        "$ref": "#/components/schemas/RichObjectParameters",
+                                        "default": [],
+                                        "description": "Rich objects to fill the message placeholders, {@see \\OCP\\RichObjectStrings\\Definitions}"
                                     }
                                 }
                             }
diff --git a/openapi.json b/openapi.json
index d8bbee675..de06f3b7a 100644
--- a/openapi.json
+++ b/openapi.json
@@ -109,19 +109,13 @@
                         "type": "string"
                     },
                     "subjectRichParameters": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "$ref": "#/components/schemas/RichObjectParameter"
-                        }
+                        "$ref": "#/components/schemas/RichObjectParameters"
                     },
                     "messageRich": {
                         "type": "string"
                     },
                     "messageRichParameters": {
-                        "type": "object",
-                        "additionalProperties": {
-                            "$ref": "#/components/schemas/RichObjectParameter"
-                        }
+                        "$ref": "#/components/schemas/RichObjectParameters"
                     },
                     "icon": {
                         "type": "string"
@@ -285,6 +279,12 @@
                         "type": "string"
                     }
                 }
+            },
+            "RichObjectParameters": {
+                "type": "object",
+                "additionalProperties": {
+                    "$ref": "#/components/schemas/RichObjectParameter"
+                }
             }
         }
     },