diff --git a/.github/team.json b/.github/team.json
index 5395e93bd95003469f19164c70167909db1f6fd5..e17679b34bc183b22d8ce0e261dc79050c6a5c63 100644
--- a/.github/team.json
+++ b/.github/team.json
@@ -1,16 +1,25 @@
 {
   "teams": [
     {
-      "name": "Querying Components",
-      "label": ".Team/QueryingComponents",
+      "name": "Querying",
+      "label": ".Team/Querying",
       "projectUrl": "https://github.com/orgs/metabase/projects/97/views/1",
       "members": [
         "ranquild",
         "kamilmielnik",
         "nemanjaglumac",
-        "romeovs"
+        "romeovs",
+        "bshepherdson",
+        "metamben",
+        "lbrdnk",
+        "appleby"
       ]
     },
+    {
+      "name": "Drivers",
+      "label": ".Team/Drivers",
+      "members": ["snoe"]
+    },
     {
       "name": "Embedding",
       "label": ".Team/Embedding",
@@ -29,12 +38,6 @@
         "crisptrutski"
       ]
     },
-    {
-      "name": "Query Processor",
-      "label": ".Team/QueryProcessor",
-      "projectUrl": "https://github.com/orgs/metabase/projects/83/views/8",
-      "members": ["camsaul", "snoe", "bshepherdson", "metamben", "lbrdnk", "appleby"]
-    },
     {
       "name": "Admin Webapp",
       "label": ".Team/AdminWebapp",
@@ -54,7 +57,6 @@
       "members": [
         "alxnddr",
         "EmmadUsmani",
-        "JesseSDevaney",
         "kulyk",
         "adam-james-v"
       ]
@@ -63,6 +65,7 @@
       "name": "DevEx",
       "label": ".Team/DevEx",
       "members": [
+        "camsaul",
         "uladzimirdev"
       ]
     }