diff --git a/package.json b/package.json
index ead688b5..9e338fc5 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
   },
   "devDependencies": {
     "@0no-co/graphqlsp": "1.12.16",
-    "@atlaskit/avatar": "21.17.6",
+    "@atlaskit/avatar": "21.17.7",
     "@atlaskit/badge": "16.4.3",
     "@atlaskit/button": "20.3.3",
     "@atlaskit/checkbox": "15.2.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 022317c3..b3673e36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,8 +34,8 @@ importers:
         specifier: 1.12.16
         version: 1.12.16(graphql@16.10.0)(typescript@5.7.3)
       '@atlaskit/avatar':
-        specifier: 21.17.6
-        version: 21.17.6(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 21.17.7
+        version: 21.17.7(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@atlaskit/badge':
         specifier: 16.4.3
         version: 16.4.3(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -276,8 +276,8 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@atlaskit/avatar@21.17.6':
-    resolution: {integrity: sha512-3DgWNqb4kspJMuRikyyveUE7QYMcV4ckqOl1YF3RR9/ZaYxAzDlC1vJA9xWTz5I86IYvtzro1Na7KdzvgiBXrg==}
+  '@atlaskit/avatar@21.17.7':
+    resolution: {integrity: sha512-1HyBKgo9jOViUc9XH060w1ENL9cjhCsZUT36Vodn1HXsUZmowe/n4OPqgovQCL7La8RTfQrYhAf1LenSkD3kbw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
 
@@ -451,6 +451,11 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
 
+  '@atlaskit/tokens@3.0.0':
+    resolution: {integrity: sha512-RvZooPRoAx+4YhsKY8UCjKz94WRoOjgM3aJEKMBpYT8TVv8iF7+NPU1mkMgAswxutyhurU6f2EcXGMZUhAnfsg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
   '@atlaskit/tooltip@18.9.4':
     resolution: {integrity: sha512-gIeDO2t7KEQnwUBIAIqu1dPmZJKpN6hgVY/yRHx7sRTGe/SK0EY8Wi1g5TOpkhbbWf1qVKaOSE0TPzOX0wOFPA==}
     peerDependencies:
@@ -5419,7 +5424,7 @@ snapshots:
       - '@types/react'
       - supports-color
 
-  '@atlaskit/avatar@21.17.6(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@atlaskit/avatar@21.17.7(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@atlaskit/analytics-next': 10.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@atlaskit/ds-lib': 3.3.0(@types/react@18.3.18)(react@18.3.1)
@@ -5428,7 +5433,7 @@ snapshots:
       '@atlaskit/platform-feature-flags': 0.3.0
       '@atlaskit/primitives': 13.3.6(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@atlaskit/theme': 14.0.0(@types/react@18.3.18)(react@18.3.1)
-      '@atlaskit/tokens': 2.5.1(@types/react@18.3.18)(react@18.3.1)
+      '@atlaskit/tokens': 3.0.0(@types/react@18.3.18)(react@18.3.1)
       '@babel/runtime': 7.25.7
       '@emotion/react': 11.13.3(@types/react@18.3.18)(react@18.3.1)
       '@emotion/serialize': 1.3.2
@@ -5880,6 +5885,19 @@ snapshots:
       - '@types/react'
       - supports-color
 
+  '@atlaskit/tokens@3.0.0(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      '@atlaskit/ds-lib': 3.3.0(@types/react@18.3.18)(react@18.3.1)
+      '@atlaskit/platform-feature-flags': 0.3.0
+      '@babel/runtime': 7.25.7
+      '@babel/traverse': 7.25.7
+      '@babel/types': 7.25.7
+      bind-event-listener: 3.0.0
+      react: 18.3.1
+    transitivePeerDependencies:
+      - '@types/react'
+      - supports-color
+
   '@atlaskit/tooltip@18.9.4(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@atlaskit/analytics-next': 10.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)