diff --git a/Solutions/1Password/Package/3.0.2.zip b/Solutions/1Password/Package/3.0.2.zip
index 5874b55b357..fefbae91ad9 100644
Binary files a/Solutions/1Password/Package/3.0.2.zip and b/Solutions/1Password/Package/3.0.2.zip differ
diff --git a/Solutions/1Password/Package/mainTemplate.json b/Solutions/1Password/Package/mainTemplate.json
index a15afd820e8..5dbe975040b 100644
--- a/Solutions/1Password/Package/mainTemplate.json
+++ b/Solutions/1Password/Package/mainTemplate.json
@@ -1341,13 +1341,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -1467,13 +1467,13 @@
                   "alertDynamicProperties": []
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -1590,13 +1590,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -1693,13 +1693,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": false,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "5h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "5h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": false
+                  }
                 }
               }
             },
@@ -1825,13 +1825,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AnyAlert",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AnyAlert",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -1948,13 +1948,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2080,13 +2080,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2212,13 +2212,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2344,13 +2344,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2476,13 +2476,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2599,13 +2599,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2722,13 +2722,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -2848,13 +2848,13 @@
                   "alertDynamicProperties": []
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": false,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": false
+                  }
                 }
               }
             },
@@ -2972,13 +2972,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -3104,13 +3104,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "30m",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "30m"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -3229,13 +3229,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -3352,13 +3352,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },
@@ -3475,13 +3475,13 @@
                   "aggregationKind": "SingleAlert"
                 },
                 "incidentConfiguration": {
+                  "createIncident": true,
                   "groupingConfiguration": {
-                    "enabled": true,
-                    "matchingMethod": "AllEntities",
+                    "lookbackDuration": "1h",
                     "reopenClosedIncident": false,
-                    "lookbackDuration": "1h"
-                  },
-                  "createIncident": true
+                    "matchingMethod": "AllEntities",
+                    "enabled": true
+                  }
                 }
               }
             },