diff --git a/.github/rules/All Branch Rules.json b/.github/rules/All Branch Rules.json
index 181ad7081..eecd56bf7 100644
--- a/.github/rules/All Branch Rules.json	
+++ b/.github/rules/All Branch Rules.json	
@@ -8,7 +8,7 @@
   "conditions": {
     "ref_name": {
       "exclude": ["refs/heads/main", "refs/heads/develop"],
-      "include": ["~ALL"]
+      "include": ["~DEFAULT_BRANCH", "refs/heads/main"]
     }
   },
   "rules": [
@@ -29,7 +29,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],
diff --git a/.github/rules/Main_Develop Branch Rules.json b/.github/rules/Main_Develop Branch Rules.json
index cee11c1ca..45f76cc69 100644
--- a/.github/rules/Main_Develop Branch Rules.json	
+++ b/.github/rules/Main_Develop Branch Rules.json	
@@ -21,7 +21,7 @@
     {
       "type": "merge_queue",
       "parameters": {
-        "merge_method": "SQUASH",
+        "merge_method": "MERGE",
         "max_entries_to_build": 8,
         "min_entries_to_merge": 1,
         "max_entries_to_merge": 5,
@@ -44,7 +44,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],