diff --git a/content/company-info-and-process/communication/team_chat.md b/content/company-info-and-process/communication/team_chat.md
index 367234ec861a..0f169bd3f238 100644
--- a/content/company-info-and-process/communication/team_chat.md
+++ b/content/company-info-and-process/communication/team_chat.md
@@ -846,7 +846,7 @@ There’s no one-size-fits-all approach here. Just be mindful of the frequency o
    </td>
   </tr>
   <tr>
-   <td>#discuss-cody-context
+   <td>#discuss-context
    </td>
    <td>Discussion of Cody context
    </td>
@@ -882,9 +882,9 @@ There’s no one-size-fits-all approach here. Just be mindful of the frequency o
    </td>
   </tr>
   <tr>
-   <td>#wg-cody-vs-code
+   <td>#team-cody-clients
    </td>
-   <td>Discussion, questions, bug reports, and feedback specific to the VSC extension. VS Code team collaboration
+   <td>Discussion, questions, bug reports, and feedback about Cody clients.
    </td>
   </tr>
   <tr>
diff --git a/content/team/locations.geojson b/content/team/locations.geojson
index be8784e27c60..d164923f4026 100644
--- a/content/team/locations.geojson
+++ b/content/team/locations.geojson
@@ -793,6 +793,19 @@
           55.595330
         ]
       }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Jan Hartman"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          14.40685,
+          45.95371
+        ]
+      }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/data/team.yml b/data/team.yml
index 329656d5dd97..e01109ddc9c0 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -1840,3 +1840,15 @@ rik_nauta:
   pronouns: He/Him or They/Them
   pronunciation: '[pronounce my name 🔊](https://www.name-coach.com/rik-nauta)'
   description: Originally from the Netherlands, Rik has called Sweden his home over the last 16 years. Although he was on the brink of completing his MSc in Engineering Physics, his fascination with AI (and apathy towards particles) led him to forgo his final course to create a company dedicated to developing an AI-powered contract writing assistant instead. Outside of his professional endeavors Rik is an avid skiier and a regular foster parent to guide-dog puppies and "problem" doggos. Rik's unique superpower is his remarkable ability to nap under any circumstances.
+
+jan_hartman:
+  name: Jan Hartman
+  email: jan.hartman@sourcegraph.com
+  github: janhartman
+  pronouns: he/him
+  role: Machine Learning Engineer
+  reports_to: head_ai
+  location: Ljubljana, Slovenia 🇸🇮
+  links: '[LinkedIn](https://www.linkedin.com/in/jan-hartman)'
+  pronunciation: https://forvo.com/word/jan/
+  description: Jan is a machine learning enthusiast. He has a master's degree in Computer and Data Science from the University of Ljubljana. Before joining Sourcegraph, Jan worked in adtech, building deep learning models for online recommendations and scaling them to over a billion predictions per second. Besides teaching machines to think, Jan enjoys hiking, gaming, DnD, and chilling on the couch with his dog, Rio.