diff --git a/src/schemas/json/bitrise.json b/src/schemas/json/bitrise.json
index ba6123e5e52..ba5fb45933b 100644
--- a/src/schemas/json/bitrise.json
+++ b/src/schemas/json/bitrise.json
@@ -423,37 +423,24 @@
       "additionalProperties": false,
       "type": "object"
     },
-    "PushTriggerMapItemModelCommitsCondition": {
-      "oneOf": [
-        {
-          "required": ["pattern"],
-          "properties": {
-            "pattern": {
-              "type": "string",
-              "description": "A glob pattern used to match against the condition."
-            },
-            "last_commit": {
-              "type": "boolean",
-              "description": "Defines whether Bitrise should evaluate every commit message or changed file in a code push or only those belonging to the most recent commit. Its default value is `false`."
-            }
-          }
+    "PushTriggerMapItemCommitsConditionModel": {
+      "type": "object",
+      "properties": {
+        "pattern": {
+          "type": "string",
+          "description": "A glob pattern used to match against the condition."
         },
-        {
-          "required": ["regex"],
-          "properties": {
-            "regex": {
-              "type": "string",
-              "description": "A regular expression pattern used to match against the condition."
-            },
-            "last_commit": {
-              "type": "boolean",
-              "description": "Defines whether Bitrise should evaluate every commit message or changed file in a code push or only those belonging to the most recent commit. Its default value is `false`."
-            }
-          }
+        "regex": {
+          "type": "string",
+          "description": "A regular expression pattern used to match against the condition."
+        },
+        "last_commit": {
+          "type": "boolean",
+          "description": "Defines whether Bitrise should evaluate every commit message or changed file in a code push or only those belonging to the most recent commit. Its default value is `false`."
         }
-      ],
-      "additionalProperties": false,
-      "type": "object"
+      },
+      "oneOf": [{ "required": ["pattern"] }, { "required": ["regex"] }],
+      "additionalProperties": false
     },
     "PushTriggerModel": {
       "properties": {
@@ -466,21 +453,21 @@
         },
         "branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "A branch of the project's repository. Bitrise triggers a build if code is pushed to the branch defined in this property."
         },
         "commit_message": {
           "oneOf": [
-            { "$ref": "#/definitions/PushTriggerMapItemModelCommitsCondition" },
+            { "$ref": "#/definitions/PushTriggerMapItemCommitsConditionModel" },
             { "type": "string" }
           ],
           "description": "Define a Git commit message that should trigger a Bitrise build."
         },
         "changed_files": {
           "oneOf": [
-            { "$ref": "#/definitions/PushTriggerMapItemModelCommitsCondition" },
+            { "$ref": "#/definitions/PushTriggerMapItemCommitsConditionModel" },
             { "type": "string" }
           ],
           "description": "Set a filepath or a folder. If any file or files change in that location, Bitrise triggers a build."
@@ -505,42 +492,42 @@
         },
         "source_branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Bitrise triggers a build if the branch name in this property matches the source branch of a pull request opened in the project's repository."
         },
         "target_branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Bitrise triggers a build if the branch name in the property matches the target branch of a pull request opened in the project's repository."
         },
         "label": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "If a pull request's label matches the label in this property, Bitrise triggers a build."
         },
         "comment": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "This property looks for comments on pull requests to trigger Bitrise builds."
         },
         "commit_message": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Define a Git commit message that should trigger a Bitrise build."
         },
         "changed_files": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Set a filepath or a folder. If any file or files change in that location in a pull request, Bitrise triggers a build."
@@ -561,7 +548,7 @@
         },
         "name": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "This property looks for the name of a Git tag to trigger a Bitrise build."
@@ -570,15 +557,20 @@
       "additionalProperties": false,
       "type": "object"
     },
-    "TriggerMapItemModelRegexCondition": {
+    "TriggerMapItemRegexConditionModel": {
+      "type": "object",
       "properties": {
+        "pattern": {
+          "type": "string",
+          "description": "A glob pattern used to match against the condition."
+        },
         "regex": {
           "type": "string",
-          "description": "A regular expression pattern used to match against specific code event attributes."
+          "description": "A regular expression pattern used to match against the condition."
         }
       },
-      "additionalProperties": false,
-      "type": "object"
+      "oneOf": [{ "required": ["pattern"] }, { "required": ["regex"] }],
+      "additionalProperties": false
     },
     "TriggerMapItemModel": {
       "properties": {
@@ -602,21 +594,21 @@
 
         "push_branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "A branch of the project's repository. Bitrise triggers a build if code is pushed to the branch defined in this property."
         },
         "commit_message": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Define a Git commit message that should trigger a Bitrise build."
         },
         "changed_files": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Set a filepath or a folder. If any file or files change in that location, Bitrise triggers a build."
@@ -624,14 +616,14 @@
 
         "pull_request_source_branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Bitrise triggers a build if the branch name in this property matches the source branch of a pull request opened in the project's repository."
         },
         "pull_request_target_branch": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Bitrise triggers a build if the branch name in the property matches the target branch of a pull request opened in the project's repository."
@@ -642,14 +634,14 @@
         },
         "pull_request_label": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "You can mark pull requests with labels. If a pull request's label matches the label in this property, Bitrise triggers a build."
         },
         "pull_request_comment": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "This property looks for comments on pull requests to trigger Bitrise builds."
@@ -657,7 +649,7 @@
 
         "tag": {
           "oneOf": [
-            { "$ref": "#/definitions/TriggerMapItemModelRegexCondition" },
+            { "$ref": "#/definitions/TriggerMapItemRegexConditionModel" },
             { "type": "string" }
           ],
           "description": "Bitrise triggers a build when a Git tag matching the tag defined in this property is pushed to the project's repository."