diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 97569a934ce..7b5a232fb3c 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -97,7 +97,8 @@ include:
   - filename: etc/evergreen_yml_components/copybara/copybara.yml
   - filename: etc/evergreen_yml_components/copybara/copybara_gen.yml
 
-  - filename: monguard/.evergreen/config.yml
+  - filename: monguard/.evergreen/config_mongodb_master.yml
+  - filename: monguard/.evergreen/config_tasks.yml
 
 parameters:
   - key: evergreen_config_file_path
diff --git a/evergreen/activate_task.py b/evergreen/activate_task.py
index 950a4101b72..051b0a18fe7 100755
--- a/evergreen/activate_task.py
+++ b/evergreen/activate_task.py
@@ -18,6 +18,10 @@ def main(
     expansions = read_config_file(expansions_file)
     evg_api = evergreen_conn.get_evergreen_api()
 
+    # skip if in commit-queue, commit-queue patches cannot be modified
+    if expansions.get("is_commit_queue", False):
+        return
+
     # Skip activation if the patch author is the excluded user
     if (
         (skip_for_patch_author is not None) and expansions.get("author") == skip_for_patch_author