diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 6589f7c77bbdb..0000000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "arrowParens": "avoid",
-  "printWidth": 80,
-  "bracketSpacing": true,
-  "semi": true,
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 0000000000000..02b8b0ba9a1a4
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,39 @@
+const tsConfigBase = require('./tsconfig.json');
+
+const ourPackages = new Set(
+  Object.keys(tsConfigBase.compilerOptions.paths).map(
+    // Remove extra '/*' if present in the package name.
+    packageName => packageName.split('/')[0]
+  )
+);
+const appPackages = ['teleport', 'e-teleport', 'teleterm'].flatMap(pkg => [
+  pkg,
+  `@gravitational/${pkg}`,
+]);
+const libraryPackages = [...ourPackages]
+  .filter(pkg => !appPackages.includes(pkg))
+  .flatMap(pkg => [pkg, `@gravitational/${pkg}`]);
+
+module.exports = {
+  arrowParens: 'avoid',
+  printWidth: 80,
+  bracketSpacing: true,
+  plugins: [require('@ianvs/prettier-plugin-sort-imports')],
+  importOrder: [
+    '<BUILTIN_MODULES>',
+    '',
+    '<THIRD_PARTY_MODULES>',
+    '',
+    `^(${libraryPackages.join('|')})`,
+    '',
+    `^(${appPackages.join('|')})`,
+    '',
+    '^[./]',
+  ],
+  importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
+  importOrderTypeScriptVersion: '5.0.0',
+  semi: true,
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'es5',
+};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d9a3561b44de4..6f79816aa81bc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -202,6 +202,9 @@ importers:
       '@babel/preset-typescript':
         specifier: ^7.24.7
         version: 7.24.7(@babel/core@7.25.2)
+      '@ianvs/prettier-plugin-sort-imports':
+        specifier: ^4.4.0
+        version: 4.4.0(prettier@3.3.3)
       '@swc/core':
         specifier: ^1.7.26
         version: 1.7.26
@@ -226,9 +229,6 @@ importers:
       eslint-plugin-babel:
         specifier: ^5.3.1
         version: 5.3.1(eslint@8.57.0)
-      eslint-plugin-import:
-        specifier: 2.30.0
-        version: 2.30.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
       eslint-plugin-jest:
         specifier: ^28.8.3
         version: 28.8.3(@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(jest@29.7.0(@types/node@22.7.4)(babel-plugin-macros@3.1.0))(typescript@5.7.2)
@@ -517,6 +517,10 @@ packages:
     resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.25.4':
     resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==}
     engines: {node: '>=6.9.0'}
@@ -533,6 +537,10 @@ packages:
     resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.26.3':
+    resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-annotate-as-pure@7.24.7':
     resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==}
     engines: {node: '>=6.9.0'}
@@ -608,10 +616,18 @@ packages:
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.24.7':
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.24.8':
     resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==}
     engines: {node: '>=6.9.0'}
@@ -638,6 +654,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.26.3':
+    resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3':
     resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==}
     engines: {node: '>=6.9.0'}
@@ -1149,6 +1170,10 @@ packages:
     resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.25.9':
+    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.25.4':
     resolution: {integrity: sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==}
     engines: {node: '>=6.9.0'}
@@ -1157,6 +1182,10 @@ packages:
     resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.26.4':
+    resolution: {integrity: sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.25.4':
     resolution: {integrity: sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==}
     engines: {node: '>=6.9.0'}
@@ -1165,6 +1194,10 @@ packages:
     resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.26.3':
+    resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
+    engines: {node: '>=6.9.0'}
+
   '@base2/pretty-print-object@1.0.1':
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
 
@@ -1646,6 +1679,15 @@ packages:
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
     deprecated: Use @eslint/object-schema instead
 
+  '@ianvs/prettier-plugin-sort-imports@4.4.0':
+    resolution: {integrity: sha512-f4/e+/ANGk3tHuwRW0uh2YuBR50I4h1ZjGQ+5uD8sWfinHTivQsnieR5cz24t8M6Vx4rYvZ5v/IEKZhYpzQm9Q==}
+    peerDependencies:
+      '@vue/compiler-sfc': 2.7.x || 3.x
+      prettier: 2 || 3
+    peerDependenciesMeta:
+      '@vue/compiler-sfc':
+        optional: true
+
   '@inquirer/confirm@3.2.0':
     resolution: {integrity: sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==}
     engines: {node: '>=18'}
@@ -5087,6 +5129,11 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
@@ -6975,6 +7022,12 @@ snapshots:
       '@babel/highlight': 7.24.7
       picocolors: 1.0.1
 
+  '@babel/code-frame@7.26.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.0
+
   '@babel/compat-data@7.25.4': {}
 
   '@babel/core@7.25.2':
@@ -6999,7 +7052,7 @@ snapshots:
 
   '@babel/generator@7.25.5':
     dependencies:
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
@@ -7011,9 +7064,17 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
+  '@babel/generator@7.26.3':
+    dependencies:
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.1.0
+
   '@babel/helper-annotate-as-pure@7.24.7':
     dependencies:
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
 
   '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7':
     dependencies:
@@ -7070,8 +7131,8 @@ snapshots:
 
   '@babel/helper-module-imports@7.24.7':
     dependencies:
-      '@babel/traverse': 7.25.4
-      '@babel/types': 7.25.4
+      '@babel/traverse': 7.25.6
+      '@babel/types': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7081,7 +7142,7 @@ snapshots:
       '@babel/helper-module-imports': 7.24.7
       '@babel/helper-simple-access': 7.24.7
       '@babel/helper-validator-identifier': 7.24.7
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7096,7 +7157,7 @@ snapshots:
       '@babel/core': 7.25.2
       '@babel/helper-annotate-as-pure': 7.24.7
       '@babel/helper-wrap-function': 7.25.0
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7105,14 +7166,14 @@ snapshots:
       '@babel/core': 7.25.2
       '@babel/helper-member-expression-to-functions': 7.24.8
       '@babel/helper-optimise-call-expression': 7.24.7
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-simple-access@7.24.7':
     dependencies:
-      '@babel/traverse': 7.25.4
-      '@babel/types': 7.25.4
+      '@babel/traverse': 7.25.6
+      '@babel/types': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7125,14 +7186,18 @@ snapshots:
 
   '@babel/helper-string-parser@7.24.8': {}
 
+  '@babel/helper-string-parser@7.25.9': {}
+
   '@babel/helper-validator-identifier@7.24.7': {}
 
+  '@babel/helper-validator-identifier@7.25.9': {}
+
   '@babel/helper-validator-option@7.24.8': {}
 
   '@babel/helper-wrap-function@7.25.0':
     dependencies:
       '@babel/template': 7.25.0
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
       '@babel/types': 7.25.6
     transitivePeerDependencies:
       - supports-color
@@ -7140,7 +7205,7 @@ snapshots:
   '@babel/helpers@7.25.0':
     dependencies:
       '@babel/template': 7.25.0
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
 
   '@babel/highlight@7.24.7':
     dependencies:
@@ -7151,17 +7216,21 @@ snapshots:
 
   '@babel/parser@7.25.4':
     dependencies:
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
 
   '@babel/parser@7.25.6':
     dependencies:
       '@babel/types': 7.25.6
 
+  '@babel/parser@7.26.3':
+    dependencies:
+      '@babel/types': 7.26.3
+
   '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7188,7 +7257,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7313,7 +7382,7 @@ snapshots:
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/helper-remap-async-to-generator': 7.25.0(@babel/core@7.25.2)
       '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2)
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7360,7 +7429,7 @@ snapshots:
       '@babel/helper-compilation-targets': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2)
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -7426,7 +7495,7 @@ snapshots:
       '@babel/core': 7.25.2
       '@babel/helper-compilation-targets': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7475,7 +7544,7 @@ snapshots:
       '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/helper-validator-identifier': 7.24.7
-      '@babel/traverse': 7.25.4
+      '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7588,7 +7657,7 @@ snapshots:
       '@babel/helper-module-imports': 7.24.7
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
@@ -7763,7 +7832,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
       esutils: 2.0.3
 
   '@babel/preset-react@7.24.7(@babel/core@7.25.2)':
@@ -7802,16 +7871,22 @@ snapshots:
   '@babel/template@7.25.0':
     dependencies:
       '@babel/code-frame': 7.24.7
-      '@babel/parser': 7.25.4
-      '@babel/types': 7.25.4
+      '@babel/parser': 7.25.6
+      '@babel/types': 7.25.6
+
+  '@babel/template@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@babel/traverse@7.25.4':
     dependencies:
       '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.25.5
-      '@babel/parser': 7.25.4
+      '@babel/generator': 7.25.6
+      '@babel/parser': 7.25.6
       '@babel/template': 7.25.0
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
       debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
@@ -7829,6 +7904,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@7.26.4':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/parser': 7.26.3
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
+      debug: 4.3.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/types@7.25.4':
     dependencies:
       '@babel/helper-string-parser': 7.24.8
@@ -7841,6 +7928,11 @@ snapshots:
       '@babel/helper-validator-identifier': 7.24.7
       to-fast-properties: 2.0.0
 
+  '@babel/types@7.26.3':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
   '@base2/pretty-print-object@1.0.1': {}
 
   '@bcoe/v8-coverage@0.2.3': {}
@@ -8302,6 +8394,17 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.2': {}
 
+  '@ianvs/prettier-plugin-sort-imports@4.4.0(prettier@3.3.3)':
+    dependencies:
+      '@babel/generator': 7.26.3
+      '@babel/parser': 7.26.3
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
+      prettier: 3.3.3
+      semver: 7.6.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@inquirer/confirm@3.2.0':
     dependencies:
       '@inquirer/core': 9.2.1
@@ -8992,7 +9095,8 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.23.0':
     optional: true
 
-  '@rtsao/scc@1.1.0': {}
+  '@rtsao/scc@1.1.0':
+    optional: true
 
   '@sideway/address@4.1.5':
     dependencies:
@@ -9357,20 +9461,20 @@ snapshots:
 
   '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.25.4
-      '@babel/types': 7.25.4
+      '@babel/parser': 7.25.6
+      '@babel/types': 7.25.6
       '@types/babel__generator': 7.6.3
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.20.6
 
   '@types/babel__generator@7.6.3':
     dependencies:
-      '@babel/types': 7.25.4
+      '@babel/types': 7.25.6
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.25.4
-      '@babel/types': 7.25.4
+      '@babel/parser': 7.25.6
+      '@babel/types': 7.25.6
 
   '@types/babel__traverse@7.20.6':
     dependencies:
@@ -9494,7 +9598,8 @@ snapshots:
 
   '@types/json-schema@7.0.13': {}
 
-  '@types/json5@0.0.29': {}
+  '@types/json5@0.0.29':
+    optional: true
 
   '@types/keyv@4.2.0':
     dependencies:
@@ -10063,6 +10168,7 @@ snapshots:
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
+    optional: true
 
   array.prototype.flat@1.3.2:
     dependencies:
@@ -10070,6 +10176,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-shim-unscopables: 1.0.2
+    optional: true
 
   array.prototype.flatmap@1.3.2:
     dependencies:
@@ -11231,6 +11338,7 @@ snapshots:
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
   eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.30.0)(eslint@8.57.0):
     dependencies:
@@ -11261,6 +11369,7 @@ snapshots:
       eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.30.0)(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
   eslint-module-utils@2.8.2(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
@@ -11304,6 +11413,7 @@ snapshots:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
+    optional: true
 
   eslint-plugin-jest-dom@5.4.0(@testing-library/dom@10.1.0)(eslint@8.57.0):
     dependencies:
@@ -12634,7 +12744,7 @@ snapshots:
   jest-snapshot@29.7.0:
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/generator': 7.25.5
+      '@babel/generator': 7.25.6
       '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
       '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2)
       '@babel/types': 7.25.6
@@ -12831,6 +12941,8 @@ snapshots:
 
   jsesc@2.5.2: {}
 
+  jsesc@3.1.0: {}
+
   json-buffer@3.0.1: {}
 
   json-parse-even-better-errors@2.3.1: {}
@@ -12845,6 +12957,7 @@ snapshots:
   json5@1.0.2:
     dependencies:
       minimist: 1.2.8
+    optional: true
 
   json5@2.2.3: {}
 
@@ -13266,6 +13379,7 @@ snapshots:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
+    optional: true
 
   object.values@1.2.0:
     dependencies:
@@ -14406,6 +14520,7 @@ snapshots:
       json5: 1.0.2
       minimist: 1.2.8
       strip-bom: 3.0.0
+    optional: true
 
   tsconfig-paths@4.2.0:
     dependencies:
diff --git a/tsconfig.json b/tsconfig.json
index 233b31f68ee13..0bee31f133753 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,8 @@
     "noEmit": true,
     "types": ["node", "@types/wicg-file-system-access"],
     "paths": {
+      "build/*": ["web/packages/build/src/*"],
+      "build": ["web/packages/build/src/"],
       "shared/*": ["web/packages/shared/*"],
       "design/*": ["web/packages/design/src/*"],
       "design": ["web/packages/design/src/"],
@@ -28,7 +30,7 @@
       "teleport": ["web/packages/teleport/src/"],
       "teleterm/*": ["web/packages/teleterm/src/*"],
       "e-teleport/*": ["e/web/teleport/src/*"],
-      "gen-proto-ts/*": ["gen/proto/ts/*"],
+      "gen-proto-ts/*": ["gen/proto/ts/*"]
     }
   },
   "exclude": [
diff --git a/web/.storybook/preview.tsx b/web/.storybook/preview.tsx
index dcf775d5c3d49..405295e381006 100644
--- a/web/.storybook/preview.tsx
+++ b/web/.storybook/preview.tsx
@@ -16,20 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Preview } from '@storybook/react';
+import { initialize, mswLoader } from 'msw-storybook-addon';
 import { ComponentType, PropsWithChildren } from 'react';
+
+import Box from '../packages/design/src/Box';
 import { bblpTheme, darkTheme, lightTheme } from '../packages/design/src/theme';
+import { Theme } from '../packages/design/src/theme/themes/types';
 import { ConfiguredThemeProvider } from '../packages/design/src/ThemeProvider';
-import Box from '../packages/design/src/Box';
+import history from '../packages/teleport/src/services/history/history';
+import { UserContextProvider } from '../packages/teleport/src/User';
 import { StaticThemeProvider as TeletermThemeProvider } from '../packages/teleterm/src/ui/ThemeProvider';
 import {
   darkTheme as teletermDarkTheme,
   lightTheme as teletermLightTheme,
 } from '../packages/teleterm/src/ui/ThemeProvider/theme';
-import history from '../packages/teleport/src/services/history/history';
-import { UserContextProvider } from '../packages/teleport/src/User';
-import { Preview } from '@storybook/react';
-import { Theme } from '../packages/design/src/theme/themes/types';
-import { initialize, mswLoader } from 'msw-storybook-addon';
 
 initialize();
 
diff --git a/web/.storybook/vite.config.mts b/web/.storybook/vite.config.mts
index 7c20b2fb85432..3bd030caba261 100644
--- a/web/.storybook/vite.config.mts
+++ b/web/.storybook/vite.config.mts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
-import { tsconfigPathsPlugin } from '@gravitational/build/vite/tsconfigPaths.mjs';
+
 import { reactPlugin } from '@gravitational/build/vite/react.mjs';
+import { tsconfigPathsPlugin } from '@gravitational/build/vite/tsconfigPaths.mjs';
 
 export default defineConfig(({ mode }) => ({
   plugins: [tsconfigPathsPlugin(), reactPlugin(mode)],
diff --git a/web/@types/styled-components.d.ts b/web/@types/styled-components.d.ts
index 7d98d7fc8d0d3..62714bfd3dceb 100644
--- a/web/@types/styled-components.d.ts
+++ b/web/@types/styled-components.d.ts
@@ -17,6 +17,7 @@
  */
 
 import { CSSProp } from 'styled-components';
+
 import 'react';
 
 import { Theme } from 'design/theme/themes/types';
diff --git a/web/README.md b/web/README.md
index 2c8d892a2898c..7799ee04730bf 100644
--- a/web/README.md
+++ b/web/README.md
@@ -190,7 +190,7 @@ pnpm dlx browserslist 'last 2 chrome version, last 2 edge version, last 2 firefo
     // Set the default
     "editor.formatOnSave": false,
     // absolute config path
-    "prettier.configPath": ".prettierrc",
+    "prettier.configPath": ".prettierrc.js",
     // enable per-language
     "[html]": {
         "editor.formatOnSave": true,
diff --git a/web/packages/build/.eslintrc.js b/web/packages/build/.eslintrc.js
index 8a74e1cd0e80b..2d330b9ab1c98 100644
--- a/web/packages/build/.eslintrc.js
+++ b/web/packages/build/.eslintrc.js
@@ -67,25 +67,6 @@ module.exports = {
     },
   ],
   rules: {
-    'import/order': [
-      'error',
-      {
-        groups: [
-          'builtin',
-          'external',
-          'internal',
-          'parent',
-          'sibling',
-          'index',
-          'object',
-          'type',
-        ],
-        'newlines-between': 'always-and-inside-groups',
-      },
-    ],
-    // typescript-eslint recommends to turn import/no-unresolved off.
-    // https://typescript-eslint.io/troubleshooting/typed-linting/performance/#eslint-plugin-import
-    'import/no-unresolved': 0,
     'no-unused-vars': 'off', // disabled to allow the typescript one to take over and avoid errors in reporting
     '@typescript-eslint/no-unused-vars': ['error'],
 
diff --git a/web/packages/build/jest/jest-environment-patched-jsdom.js b/web/packages/build/jest/jest-environment-patched-jsdom.js
index 642a360b9e395..cbc704768bfb8 100644
--- a/web/packages/build/jest/jest-environment-patched-jsdom.js
+++ b/web/packages/build/jest/jest-environment-patched-jsdom.js
@@ -1,4 +1,4 @@
-import { TextEncoder, TextDecoder } from 'node:util';
+import { TextDecoder, TextEncoder } from 'node:util';
 
 import { TestEnvironment as JSDOMEnvironment } from 'jest-environment-jsdom';
 
diff --git a/web/packages/build/package.json b/web/packages/build/package.json
index f02964680e2b0..4c9acc71e8fee 100644
--- a/web/packages/build/package.json
+++ b/web/packages/build/package.json
@@ -14,6 +14,7 @@
     "@babel/preset-env": "^7.25.4",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
     "@swc/core": "^1.7.26",
     "@swc/plugin-styled-components": "^3.0.2",
     "@types/jsdom": "^21.1.7",
@@ -22,7 +23,6 @@
     "eslint": "^8.56.0",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-import": "2.30.0",
     "eslint-plugin-jest": "^28.8.3",
     "eslint-plugin-jest-dom": "^5.4.0",
     "eslint-plugin-react": "^7.37.0",
diff --git a/web/packages/build/vite/config.ts b/web/packages/build/vite/config.ts
index 58b23d10453e4..0d15db5fe3dbc 100644
--- a/web/packages/build/vite/config.ts
+++ b/web/packages/build/vite/config.ts
@@ -19,17 +19,15 @@
 import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
 
-import { defineConfig } from 'vite';
 import { visualizer } from 'rollup-plugin-visualizer';
+import { defineConfig, type UserConfig } from 'vite';
 import wasm from 'vite-plugin-wasm';
 
-import { htmlPlugin, transformPlugin } from './html';
 import { generateAppHashFile } from './apphash';
+import { htmlPlugin, transformPlugin } from './html';
 import { reactPlugin } from './react.mjs';
 import { tsconfigPathsPlugin } from './tsconfigPaths.mjs';
 
-import type { UserConfig } from 'vite';
-
 const DEFAULT_PROXY_TARGET = '127.0.0.1:3080';
 const ENTRY_FILE_NAME = 'app/app.js';
 
diff --git a/web/packages/build/vite/html.ts b/web/packages/build/vite/html.ts
index eaf802aa34f56..34bfdfe124d68 100644
--- a/web/packages/build/vite/html.ts
+++ b/web/packages/build/vite/html.ts
@@ -17,13 +17,12 @@
  */
 
 import { readFileSync } from 'fs';
+import type { IncomingHttpHeaders } from 'http';
 import { get } from 'https';
 import { resolve } from 'path';
 
 import { JSDOM } from 'jsdom';
-
 import type { Plugin } from 'vite';
-import type { IncomingHttpHeaders } from 'http';
 
 function getHTML(target: string, headers: IncomingHttpHeaders) {
   return new Promise<{ data: string; headers: IncomingHttpHeaders }>(
diff --git a/web/packages/design/src/Alert/Alert.story.tsx b/web/packages/design/src/Alert/Alert.story.tsx
index 422cbec301dee..888fbafb7e9eb 100644
--- a/web/packages/design/src/Alert/Alert.story.tsx
+++ b/web/packages/design/src/Alert/Alert.story.tsx
@@ -19,7 +19,6 @@
 import { Restore } from 'design/Icon';
 
 import { Box } from '..';
-
 import { Alert, AlertProps, Banner } from './Alert';
 
 export default {
diff --git a/web/packages/design/src/Alert/Alert.tsx b/web/packages/design/src/Alert/Alert.tsx
index f8ce4b7269310..bfc58e4610850 100644
--- a/web/packages/design/src/Alert/Alert.tsx
+++ b/web/packages/design/src/Alert/Alert.tsx
@@ -18,20 +18,19 @@
 
 import React, { useState } from 'react';
 import styled, { useTheme } from 'styled-components';
-import { style, color, ColorProps } from 'styled-system';
+import { color, ColorProps, style } from 'styled-system';
 
 import { IconProps } from 'design/Icon/Icon';
-
 import { StatusIcon, StatusKind } from 'design/StatusIcon';
 
-import { space, SpaceProps, width, WidthProps } from '../system';
-import { Theme } from '../theme';
-import * as Icon from '../Icon';
-import Flex from '../Flex';
-import Text from '../Text';
 import Box from '../Box';
-import { ButtonFill, ButtonIntent, Button } from '../Button';
+import { Button, ButtonFill, ButtonIntent } from '../Button';
 import ButtonIcon from '../ButtonIcon';
+import Flex from '../Flex';
+import * as Icon from '../Icon';
+import { space, SpaceProps, width, WidthProps } from '../system';
+import Text from '../Text';
+import { Theme } from '../theme';
 
 const linkColor = style({
   prop: 'linkColor',
diff --git a/web/packages/design/src/Button/Button.test.tsx b/web/packages/design/src/Button/Button.test.tsx
index 8f4528e102baf..034b1f1929b07 100644
--- a/web/packages/design/src/Button/Button.test.tsx
+++ b/web/packages/design/src/Button/Button.test.tsx
@@ -22,14 +22,14 @@ import React, {
   PropsWithChildren,
 } from 'react';
 
-import { render, theme, screen } from 'design/utils/testing';
+import { render, screen, theme } from 'design/utils/testing';
 
 import {
   Button,
   ButtonPrimary,
   ButtonSecondary,
-  ButtonWarning,
   ButtonSize,
+  ButtonWarning,
 } from './index';
 
 describe('design/Button', () => {
diff --git a/web/packages/design/src/Button/Button.tsx b/web/packages/design/src/Button/Button.tsx
index 7aba6caa5e2aa..45d3d11b6cd3a 100644
--- a/web/packages/design/src/Button/Button.tsx
+++ b/web/packages/design/src/Button/Button.tsx
@@ -19,21 +19,20 @@
 import React from 'react';
 import styled, { CSSObject } from 'styled-components';
 
-import { shouldForwardProp as defaultValidatorFn } from 'design/ThemeProvider';
-
 import {
-  space,
-  width,
-  height,
   alignSelf,
+  AlignSelfProps,
   gap,
+  GapProps,
+  height,
+  HeightProps,
+  space,
   SpaceProps,
+  width,
   WidthProps,
-  HeightProps,
-  AlignSelfProps,
-  GapProps,
 } from 'design/system';
 import { Theme } from 'design/theme/themes/types';
+import { shouldForwardProp as defaultValidatorFn } from 'design/ThemeProvider';
 
 export type ButtonProps<E extends React.ElementType> =
   React.ComponentPropsWithoutRef<E> &
diff --git a/web/packages/design/src/Button/buttons.story.tsx b/web/packages/design/src/Button/buttons.story.tsx
index 1ad26d1a361ad..6a88df3397d51 100644
--- a/web/packages/design/src/Button/buttons.story.tsx
+++ b/web/packages/design/src/Button/buttons.story.tsx
@@ -17,28 +17,25 @@
  */
 
 import { Fragment } from 'react';
-
 import styled from 'styled-components';
 
 import { Input, MenuItem } from 'design';
 
-import ButtonLink from '../ButtonLink';
-import ButtonIcon from '../ButtonIcon';
-import * as icons from '../Icon';
-import Flex from '../Flex';
-
-import { ButtonWithMenu } from '../ButtonWithMenu';
-
 import {
   Button,
+  ButtonBorder,
+  ButtonFill,
   ButtonPrimary,
+  ButtonProps,
   ButtonSecondary,
-  ButtonWarning,
-  ButtonBorder,
   ButtonText,
-  ButtonProps,
-  ButtonFill,
+  ButtonWarning,
 } from '.';
+import ButtonIcon from '../ButtonIcon';
+import ButtonLink from '../ButtonLink';
+import { ButtonWithMenu } from '../ButtonWithMenu';
+import Flex from '../Flex';
+import * as icons from '../Icon';
 
 export default {
   title: 'Design/Button',
diff --git a/web/packages/design/src/ButtonIcon/ButtonIcon.jsx b/web/packages/design/src/ButtonIcon/ButtonIcon.jsx
index 7a73900fe8e6d..1659b991719e0 100644
--- a/web/packages/design/src/ButtonIcon/ButtonIcon.jsx
+++ b/web/packages/design/src/ButtonIcon/ButtonIcon.jsx
@@ -18,7 +18,7 @@
 
 import styled from 'styled-components';
 
-import { space, color, alignSelf } from 'design/system';
+import { alignSelf, color, space } from 'design/system';
 
 const sizeMap = {
   0: {
diff --git a/web/packages/design/src/ButtonIcon/index.js b/web/packages/design/src/ButtonIcon/index.js
index 45a5cceadbd6b..d15f77cbf5be3 100644
--- a/web/packages/design/src/ButtonIcon/index.js
+++ b/web/packages/design/src/ButtonIcon/index.js
@@ -17,4 +17,5 @@
  */
 
 import ButtonIcon from './ButtonIcon';
+
 export default ButtonIcon;
diff --git a/web/packages/design/src/ButtonLink/index.ts b/web/packages/design/src/ButtonLink/index.ts
index f439d750b20d5..df0ab3c0ab209 100644
--- a/web/packages/design/src/ButtonLink/index.ts
+++ b/web/packages/design/src/ButtonLink/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ButtonLink from './ButtonLink';
+
 export default ButtonLink;
diff --git a/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.test.tsx b/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.test.tsx
index 899a69ca1f9f9..76f50094345a3 100644
--- a/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.test.tsx
+++ b/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.test.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import { MenuItem } from 'design';
+import { render, screen, userEvent } from 'design/utils/testing';
 
 import { ButtonWithMenu } from './ButtonWithMenu';
 
diff --git a/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.tsx b/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.tsx
index c23de5a1961bc..6d53ae18947f7 100644
--- a/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.tsx
+++ b/web/packages/design/src/ButtonWithMenu/ButtonWithMenu.tsx
@@ -26,9 +26,9 @@ import {
 } from 'react';
 
 import { ButtonBorder, Flex, Menu, MenuItem } from 'design';
+import { ButtonSize } from 'design/Button';
 import * as icons from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
-import { ButtonSize } from 'design/Button';
 
 /**
  * Displays a button with a menu to the right of it. Unlike with a regular <Button>, the text of
diff --git a/web/packages/design/src/Card/Card.story.tsx b/web/packages/design/src/Card/Card.story.tsx
index 32fc41fc11834..8a864519b1b24 100644
--- a/web/packages/design/src/Card/Card.story.tsx
+++ b/web/packages/design/src/Card/Card.story.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, Text } from '..';
-
 import Card from '.';
+import { Flex, Text } from '..';
 
 export default {
   title: 'Design/Card',
diff --git a/web/packages/design/src/Card/index.js b/web/packages/design/src/Card/index.js
index f938a77ff67a4..40dd07877ddba 100644
--- a/web/packages/design/src/Card/index.js
+++ b/web/packages/design/src/Card/index.js
@@ -17,4 +17,5 @@
  */
 
 import Card from './Card';
+
 export default Card;
diff --git a/web/packages/design/src/CardError/index.js b/web/packages/design/src/CardError/index.js
index dfb3d91963b94..c35217bd9a008 100644
--- a/web/packages/design/src/CardError/index.js
+++ b/web/packages/design/src/CardError/index.js
@@ -17,12 +17,12 @@
  */
 
 import CardError, {
+  AccessDenied,
   Failed,
-  Offline,
   LoginFailed,
-  AccessDenied,
-  NotFound,
   LogoutFailed,
+  NotFound,
+  Offline,
 } from './CardError';
 
 export default CardError;
diff --git a/web/packages/design/src/CardIcon/CardIcon.jsx b/web/packages/design/src/CardIcon/CardIcon.jsx
index 3d11845a9a8f6..174c9cf06d754 100644
--- a/web/packages/design/src/CardIcon/CardIcon.jsx
+++ b/web/packages/design/src/CardIcon/CardIcon.jsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Card from 'design/Card';
 import { H1 } from 'design';
+import Card from 'design/Card';
 
 export default function CardIcon({ title, icon, children }) {
   return (
diff --git a/web/packages/design/src/CardIcon/CardIcon.story.jsx b/web/packages/design/src/CardIcon/CardIcon.story.jsx
index a39a5c7addb4a..8e337bd56cadd 100644
--- a/web/packages/design/src/CardIcon/CardIcon.story.jsx
+++ b/web/packages/design/src/CardIcon/CardIcon.story.jsx
@@ -17,7 +17,6 @@
  */
 
 import { Apple } from '../Icon';
-
 import CardIcon from './index';
 
 export default {
diff --git a/web/packages/design/src/CardIcon/index.js b/web/packages/design/src/CardIcon/index.js
index 0bb5aeb6b3cfb..257a21c1d8824 100644
--- a/web/packages/design/src/CardIcon/index.js
+++ b/web/packages/design/src/CardIcon/index.js
@@ -17,4 +17,5 @@
  */
 
 import CardIcon from './CardIcon';
+
 export default CardIcon;
diff --git a/web/packages/design/src/CardSuccess/index.js b/web/packages/design/src/CardSuccess/index.js
index 114f6d82c7256..169391cc16b68 100644
--- a/web/packages/design/src/CardSuccess/index.js
+++ b/web/packages/design/src/CardSuccess/index.js
@@ -17,5 +17,6 @@
  */
 
 import CardSuccess, { CardSuccessLogin } from './CardSuccess';
+
 export default CardSuccess;
 export { CardSuccessLogin };
diff --git a/web/packages/design/src/Checkbox/Checkbox.story.tsx b/web/packages/design/src/Checkbox/Checkbox.story.tsx
index 0072618366112..833520adf2f71 100644
--- a/web/packages/design/src/Checkbox/Checkbox.story.tsx
+++ b/web/packages/design/src/Checkbox/Checkbox.story.tsx
@@ -19,7 +19,6 @@
 import styled from 'styled-components';
 
 import { Flex } from '..';
-
 import { CheckboxInput } from './Checkbox';
 
 export default {
diff --git a/web/packages/design/src/Checkbox/Checkbox.tsx b/web/packages/design/src/Checkbox/Checkbox.tsx
index 93a5f0eef9e85..5616e8689dc1f 100644
--- a/web/packages/design/src/Checkbox/Checkbox.tsx
+++ b/web/packages/design/src/Checkbox/Checkbox.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import styled from 'styled-components';
-
 import React, { forwardRef } from 'react';
+import styled from 'styled-components';
 
 import * as Icon from 'design/Icon';
 
diff --git a/web/packages/design/src/DataTable/Cells.tsx b/web/packages/design/src/DataTable/Cells.tsx
index 2bf170b461e30..ed539043c39e1 100644
--- a/web/packages/design/src/DataTable/Cells.tsx
+++ b/web/packages/design/src/DataTable/Cells.tsx
@@ -20,17 +20,15 @@ import { TdHTMLAttributes } from 'react';
 
 import { Theme } from 'design/theme';
 
-import Label from '../Label';
+import { displayDate } from '../datetime';
 import Flex from '../Flex';
 import * as Icons from '../Icon';
-
-import { displayDate } from '../datetime';
-
+import Label from '../Label';
 import {
+  LabelDescription,
   ServersideProps,
   SortDir,
   TableColumn,
-  LabelDescription,
 } from './types';
 
 export function Cell(props: TdHTMLAttributes<HTMLTableCellElement>) {
diff --git a/web/packages/design/src/DataTable/DataTable.story.tsx b/web/packages/design/src/DataTable/DataTable.story.tsx
index 7921913c631a2..cd68b107d6c96 100644
--- a/web/packages/design/src/DataTable/DataTable.story.tsx
+++ b/web/packages/design/src/DataTable/DataTable.story.tsx
@@ -18,9 +18,9 @@
 
 import { useState } from 'react';
 
-import { TableProps } from './types';
-import Table from './Table';
 import { ClickableLabelCell, DateCell, LabelCell } from './Cells';
+import Table from './Table';
+import { TableProps } from './types';
 
 export default {
   title: 'Design/DataTable',
diff --git a/web/packages/design/src/DataTable/InputSearch/InputSearch.tsx b/web/packages/design/src/DataTable/InputSearch/InputSearch.tsx
index e701adb5c6a62..422e3501848c2 100644
--- a/web/packages/design/src/DataTable/InputSearch/InputSearch.tsx
+++ b/web/packages/design/src/DataTable/InputSearch/InputSearch.tsx
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { JSX, FormEvent } from 'react';
+import { FormEvent, JSX } from 'react';
 import styled from 'styled-components';
 
 import {
+  color,
+  ColorProps,
   height,
   HeightProps,
   space,
   SpaceProps,
-  color,
-  ColorProps,
 } from 'design/system';
 
 const searchInputName = 'searchValue';
diff --git a/web/packages/design/src/DataTable/Pager/ClientSidePager/ClientSidePager.tsx b/web/packages/design/src/DataTable/Pager/ClientSidePager/ClientSidePager.tsx
index 5129ee3bcd2b0..50d860e706476 100644
--- a/web/packages/design/src/DataTable/Pager/ClientSidePager/ClientSidePager.tsx
+++ b/web/packages/design/src/DataTable/Pager/ClientSidePager/ClientSidePager.tsx
@@ -17,11 +17,10 @@
  */
 
 import { Flex } from 'design';
-import { CircleArrowLeft, CircleArrowRight } from 'design/Icon';
 import { PageIndicatorText } from 'design/DataTable/Pager/PageIndicatorText';
+import { CircleArrowLeft, CircleArrowRight } from 'design/Icon';
 
 import { StyledArrowBtn, StyledFetchMoreBtn } from '../StyledPager';
-
 import { Props, useClientSidePager } from './useClientSidePager';
 
 export function ClientSidePager(props: Props) {
diff --git a/web/packages/design/src/DataTable/Table.test.tsx b/web/packages/design/src/DataTable/Table.test.tsx
index eef900310b99d..2c65552bcc3b4 100644
--- a/web/packages/design/src/DataTable/Table.test.tsx
+++ b/web/packages/design/src/DataTable/Table.test.tsx
@@ -19,10 +19,10 @@
 import { within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
-import Table from './Table';
 import { SortIndicator } from './Cells';
+import Table from './Table';
 
 const data = [
   {
diff --git a/web/packages/design/src/DataTable/Table.tsx b/web/packages/design/src/DataTable/Table.tsx
index 62739d25b0951..8cd3cd5574a07 100644
--- a/web/packages/design/src/DataTable/Table.tsx
+++ b/web/packages/design/src/DataTable/Table.tsx
@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { ReactNode, PropsWithChildren } from 'react';
+import React, { PropsWithChildren, ReactNode } from 'react';
 
 import { Box, Flex, Indicator, P1, Text } from 'design';
 import * as Icons from 'design/Icon';
 
-import { StyledTable, StyledPanel } from './StyledTable';
+import { SortHeaderCell, TextCell } from './Cells';
+import InputSearch from './InputSearch';
+import { ClientSidePager, ServerSidePager } from './Pager';
+import { StyledPanel, StyledTable } from './StyledTable';
 import {
   BasicTableProps,
   PagedTableProps,
   PagerPosition,
   SearchableBasicTableProps,
   ServersideTableProps,
-  TableProps,
   SortDir,
+  TableProps,
 } from './types';
-import { SortHeaderCell, TextCell } from './Cells';
-import { ClientSidePager, ServerSidePager } from './Pager';
-import InputSearch from './InputSearch';
 import useTable from './useTable';
 
 export default function Table<T>(props: TableProps<T>) {
diff --git a/web/packages/design/src/DataTable/index.ts b/web/packages/design/src/DataTable/index.ts
index 1cefb036ed1fd..8086b17c85600 100644
--- a/web/packages/design/src/DataTable/index.ts
+++ b/web/packages/design/src/DataTable/index.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Table from './Table';
 import {
   Cell,
-  TextCell,
+  ClickableLabelCell,
   DateCell,
   LabelCell,
-  ClickableLabelCell,
+  TextCell,
 } from './Cells';
 import { StyledPanel } from './StyledTable';
+import Table from './Table';
 
 export { Cell, TextCell, DateCell, LabelCell, ClickableLabelCell, StyledPanel };
 export default Table;
diff --git a/web/packages/design/src/DataTable/useTable.ts b/web/packages/design/src/DataTable/useTable.ts
index e8c70f3bd2dd0..da707ccca7aea 100644
--- a/web/packages/design/src/DataTable/useTable.ts
+++ b/web/packages/design/src/DataTable/useTable.ts
@@ -22,10 +22,10 @@ import isMatch, { MatchCallback } from 'design/utils/match';
 
 import paginateData from './Pager/paginateData';
 import {
-  TableProps,
-  TableColumn,
-  PagerPosition,
   PagedTableProps,
+  PagerPosition,
+  TableColumn,
+  TableProps,
 } from './types';
 
 export default function useTable<T>({
diff --git a/web/packages/design/src/Dialog/Dialog.story.jsx b/web/packages/design/src/Dialog/Dialog.story.jsx
index 8bbde5665b2e3..cd8a619cc6320 100644
--- a/web/packages/design/src/Dialog/Dialog.story.jsx
+++ b/web/packages/design/src/Dialog/Dialog.story.jsx
@@ -17,11 +17,10 @@
  */
 
 import { ButtonPrimary, Input, LabelInput } from './..';
-
 import Dialog, {
-  DialogHeader,
   DialogContent,
   DialogFooter,
+  DialogHeader,
   DialogTitle,
 } from './index';
 
diff --git a/web/packages/design/src/Dialog/DialogContent.jsx b/web/packages/design/src/Dialog/DialogContent.jsx
index 353233a17645a..4b423d63eec8c 100644
--- a/web/packages/design/src/Dialog/DialogContent.jsx
+++ b/web/packages/design/src/Dialog/DialogContent.jsx
@@ -17,7 +17,6 @@
  */
 
 import styled from 'styled-components';
-
 import { flex, space } from 'styled-system';
 
 import { Flex } from 'design';
diff --git a/web/packages/design/src/Dialog/index.js b/web/packages/design/src/Dialog/index.js
index faa9958f6a790..9a7f29bb2f139 100644
--- a/web/packages/design/src/Dialog/index.js
+++ b/web/packages/design/src/Dialog/index.js
@@ -17,10 +17,10 @@
  */
 
 import { Dialog } from './Dialog';
-import DialogTitle from './DialogTitle';
-import DialogHeader from './DialogHeader';
 import DialogContent from './DialogContent';
 import DialogFooter from './DialogFooter';
+import DialogHeader from './DialogHeader';
+import DialogTitle from './DialogTitle';
 
 export default Dialog;
 export { DialogTitle, DialogContent, DialogFooter, DialogHeader };
diff --git a/web/packages/design/src/DialogConfirmation/DialogConfirmation.story.tsx b/web/packages/design/src/DialogConfirmation/DialogConfirmation.story.tsx
index 51e5e25ed7b8a..b5e8ccdfc7f4a 100644
--- a/web/packages/design/src/DialogConfirmation/DialogConfirmation.story.tsx
+++ b/web/packages/design/src/DialogConfirmation/DialogConfirmation.story.tsx
@@ -17,11 +17,10 @@
  */
 
 import { ButtonPrimary } from '../Button';
-
 import DialogConfirmation, {
-  DialogHeader,
   DialogContent,
   DialogFooter,
+  DialogHeader,
   DialogTitle,
 } from './index';
 
diff --git a/web/packages/design/src/DialogConfirmation/DialogConfirmation.test.tsx b/web/packages/design/src/DialogConfirmation/DialogConfirmation.test.tsx
index 4887037fd3974..c2812d05a075e 100644
--- a/web/packages/design/src/DialogConfirmation/DialogConfirmation.test.tsx
+++ b/web/packages/design/src/DialogConfirmation/DialogConfirmation.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent } from 'design/utils/testing';
+import { fireEvent, render } from 'design/utils/testing';
 
 import { DialogConfirmation } from './DialogConfirmation';
 
diff --git a/web/packages/design/src/DialogConfirmation/index.ts b/web/packages/design/src/DialogConfirmation/index.ts
index 62a4d56409401..5a2f348157b78 100644
--- a/web/packages/design/src/DialogConfirmation/index.ts
+++ b/web/packages/design/src/DialogConfirmation/index.ts
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { DialogConfirmation } from './DialogConfirmation';
 import {
-  DialogTitle,
   DialogContent,
   DialogFooter,
   DialogHeader,
+  DialogTitle,
 } from './../Dialog';
+import { DialogConfirmation } from './DialogConfirmation';
 
 export default DialogConfirmation;
 export { DialogTitle, DialogContent, DialogFooter, DialogHeader };
diff --git a/web/packages/design/src/FieldRadio/FieldRadio.test.tsx b/web/packages/design/src/FieldRadio/FieldRadio.test.tsx
index 9800648a56629..d829c434c63fc 100644
--- a/web/packages/design/src/FieldRadio/FieldRadio.test.tsx
+++ b/web/packages/design/src/FieldRadio/FieldRadio.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, ChangeEvent, createRef } from 'react';
+import { ChangeEvent, createRef, useState } from 'react';
 
 import { render, screen, userEvent } from 'design/utils/testing';
 
diff --git a/web/packages/design/src/FieldRadio/FieldRadio.tsx b/web/packages/design/src/FieldRadio/FieldRadio.tsx
index 174ea425b396d..c0ff56ea91b9b 100644
--- a/web/packages/design/src/FieldRadio/FieldRadio.tsx
+++ b/web/packages/design/src/FieldRadio/FieldRadio.tsx
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { forwardRef, ReactNode, ChangeEvent } from 'react';
+import { ChangeEvent, forwardRef, ReactNode } from 'react';
 import styled from 'styled-components';
 
 import Box from 'design/Box';
-import { RadioButtonSize, RadioButton } from 'design/RadioButton';
 import Flex from 'design/Flex';
 import LabelInput from 'design/LabelInput';
-import Text from 'design/Text';
+import { RadioButton, RadioButtonSize } from 'design/RadioButton';
 import { SpaceProps } from 'design/system';
+import Text from 'design/Text';
 
 interface FieldRadioProps extends SpaceProps {
   name?: string;
diff --git a/web/packages/design/src/Flex/Flex.story.jsx b/web/packages/design/src/Flex/Flex.story.jsx
index 8f57b04789139..b8aac08daa8db 100644
--- a/web/packages/design/src/Flex/Flex.story.jsx
+++ b/web/packages/design/src/Flex/Flex.story.jsx
@@ -19,7 +19,6 @@
 import styled from 'styled-components';
 
 import Box from '../Box';
-
 import Flex from './Flex';
 
 export default {
diff --git a/web/packages/design/src/Flex/Flex.tsx b/web/packages/design/src/Flex/Flex.tsx
index df67f985c5e9e..0d7aa1a52bfab 100644
--- a/web/packages/design/src/Flex/Flex.tsx
+++ b/web/packages/design/src/Flex/Flex.tsx
@@ -21,16 +21,16 @@ import styled from 'styled-components';
 import {
   alignItems,
   AlignItemsProps,
-  justifyContent,
-  JustifyContentProps,
   flexBasis,
   FlexBasisProps,
-  flexWrap,
-  FlexWrapProps,
   flexDirection,
   FlexDirectionProps,
+  flexWrap,
+  FlexWrapProps,
   gap,
   GapProps,
+  justifyContent,
+  JustifyContentProps,
 } from 'design/system';
 
 import Box, { BoxProps } from '../Box';
diff --git a/web/packages/design/src/Flex/index.ts b/web/packages/design/src/Flex/index.ts
index e1d92033ff090..12be5512d0a71 100644
--- a/web/packages/design/src/Flex/index.ts
+++ b/web/packages/design/src/Flex/index.ts
@@ -17,6 +17,7 @@
  */
 
 import Flex from './Flex';
+
 export { type FlexProps } from './Flex';
 
 export default Flex;
diff --git a/web/packages/design/src/Icon/Icon.tsx b/web/packages/design/src/Icon/Icon.tsx
index 0b82e242ba840..511bc47e93dc8 100644
--- a/web/packages/design/src/Icon/Icon.tsx
+++ b/web/packages/design/src/Icon/Icon.tsx
@@ -19,7 +19,7 @@
 import React, { PropsWithChildren } from 'react';
 import styled from 'styled-components';
 
-import { space, color, borderRadius, SpaceProps } from 'design/system';
+import { borderRadius, color, space, SpaceProps } from 'design/system';
 
 export function Icon({
   size = 'medium',
diff --git a/web/packages/design/src/Icon/IconCircle.tsx b/web/packages/design/src/Icon/IconCircle.tsx
index 55e94a58355f2..b4c0e917a576a 100644
--- a/web/packages/design/src/Icon/IconCircle.tsx
+++ b/web/packages/design/src/Icon/IconCircle.tsx
@@ -17,7 +17,6 @@
  */
 
 import React from 'react';
-
 import { useTheme } from 'styled-components';
 
 import { Box } from 'design';
diff --git a/web/packages/design/src/Icon/Icons.story.tsx b/web/packages/design/src/Icon/Icons.story.tsx
index b405bec830973..51b33ceb4bd07 100644
--- a/web/packages/design/src/Icon/Icons.story.tsx
+++ b/web/packages/design/src/Icon/Icons.story.tsx
@@ -18,14 +18,11 @@
 
 import { ComponentType } from 'react';
 
+import * as Icon from '.';
 import { Text } from '..';
-
 import Flex from './../Flex';
-
 import { IconProps } from './Icon';
 
-import * as Icon from '.';
-
 export default {
   title: 'Design/Icon',
 };
diff --git a/web/packages/design/src/Image/Image.story.jsx b/web/packages/design/src/Image/Image.story.jsx
index 685c2f6901d42..3004ebd399c72 100644
--- a/web/packages/design/src/Image/Image.story.jsx
+++ b/web/packages/design/src/Image/Image.story.jsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import teleportSvg from './../assets/images/enterprise-dark.svg';
-
 import Image from '.';
+import teleportSvg from './../assets/images/enterprise-dark.svg';
 
 export default {
   title: 'Design/Image',
diff --git a/web/packages/design/src/Image/index.js b/web/packages/design/src/Image/index.js
index 7332e029d75d1..2ac7853fa5017 100644
--- a/web/packages/design/src/Image/index.js
+++ b/web/packages/design/src/Image/index.js
@@ -17,4 +17,5 @@
  */
 
 import Image from './Image';
+
 export default Image;
diff --git a/web/packages/design/src/Indicator/index.ts b/web/packages/design/src/Indicator/index.ts
index bf9a2ef602c17..50eaf9ad68958 100644
--- a/web/packages/design/src/Indicator/index.ts
+++ b/web/packages/design/src/Indicator/index.ts
@@ -17,6 +17,7 @@
  */
 
 import { Indicator } from './Indicator';
+
 export { Indicator };
 
 /**
diff --git a/web/packages/design/src/Input/Input.story.tsx b/web/packages/design/src/Input/Input.story.tsx
index d221e4360a910..dc3c7045d5e15 100644
--- a/web/packages/design/src/Input/Input.story.tsx
+++ b/web/packages/design/src/Input/Input.story.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Box from 'design/Box';
+import Flex from 'design/Flex';
 import * as Icon from 'design/Icon';
 import { H2 } from 'design/Text';
-import Flex from 'design/Flex';
-import Box from 'design/Box';
 
 import Input from '.';
 
diff --git a/web/packages/design/src/Input/Input.tsx b/web/packages/design/src/Input/Input.tsx
index 1bbfccd3c02c0..3cf50e9d1009b 100644
--- a/web/packages/design/src/Input/Input.tsx
+++ b/web/packages/design/src/Input/Input.tsx
@@ -16,28 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, {
+  forwardRef,
+  HTMLAttributes,
+  HTMLInputAutoCompleteAttribute,
+} from 'react';
 import styled, { css, useTheme } from 'styled-components';
 import {
-  space,
-  width,
   color,
-  height,
   ColorProps,
+  height,
+  HeightProps,
+  space,
   SpaceProps,
+  width,
   WidthProps,
-  HeightProps,
 } from 'styled-system';
 
-import React, {
-  forwardRef,
-  HTMLAttributes,
-  HTMLInputAutoCompleteAttribute,
-} from 'react';
-
-import { Theme } from 'design/theme/themes/types';
+import Box from 'design/Box';
 import * as Icon from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
-import Box from 'design/Box';
+import { Theme } from 'design/theme/themes/types';
 
 export type InputSize = 'large' | 'medium' | 'small';
 export type InputType =
diff --git a/web/packages/design/src/Input/index.ts b/web/packages/design/src/Input/index.ts
index 19d91f13072f8..6b776454cbd42 100644
--- a/web/packages/design/src/Input/index.ts
+++ b/web/packages/design/src/Input/index.ts
@@ -17,5 +17,6 @@
  */
 
 import Input from './Input';
+
 export { type InputSize, type InputType, type InputMode } from './Input';
 export default Input;
diff --git a/web/packages/design/src/Label/Label.test.jsx b/web/packages/design/src/Label/Label.test.jsx
index fe745edecadd2..23fa8919abe9e 100644
--- a/web/packages/design/src/Label/Label.test.jsx
+++ b/web/packages/design/src/Label/Label.test.jsx
@@ -18,7 +18,7 @@
 
 import { render, theme } from 'design/utils/testing';
 
-import Label, { Primary, Secondary, Warning, Danger } from './Label';
+import Label, { Danger, Primary, Secondary, Warning } from './Label';
 
 describe('design/Label', () => {
   const colors = [
diff --git a/web/packages/design/src/Label/Label.tsx b/web/packages/design/src/Label/Label.tsx
index 5dd8797d81b2a..a72264116f885 100644
--- a/web/packages/design/src/Label/Label.tsx
+++ b/web/packages/design/src/Label/Label.tsx
@@ -19,8 +19,8 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { Theme } from '../theme';
 import { space, SpaceProps } from '../system';
+import { Theme } from '../theme';
 
 const kind = ({ kind, theme }: { kind?: LabelKind; theme: Theme }) => {
   if (kind === 'secondary') {
diff --git a/web/packages/design/src/LabelInput/LabelInput.story.tsx b/web/packages/design/src/LabelInput/LabelInput.story.tsx
index 8ae16b2eb04d4..4397b370d54d2 100644
--- a/web/packages/design/src/LabelInput/LabelInput.story.tsx
+++ b/web/packages/design/src/LabelInput/LabelInput.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LabelInput } from './LabelInput';
 import InputComp from './../Input';
+import { LabelInput } from './LabelInput';
 
 export default {
   title: 'Design/LabelInput',
diff --git a/web/packages/design/src/LabelInput/index.ts b/web/packages/design/src/LabelInput/index.ts
index f47078f0a6050..e4b0dffd1622d 100644
--- a/web/packages/design/src/LabelInput/index.ts
+++ b/web/packages/design/src/LabelInput/index.ts
@@ -17,6 +17,7 @@
  */
 
 import { LabelInput } from './LabelInput';
+
 export { LabelInput };
 
 /**
diff --git a/web/packages/design/src/LabelState/LabelState.test.jsx b/web/packages/design/src/LabelState/LabelState.test.jsx
index 712700d915879..d4b5bdc210846 100644
--- a/web/packages/design/src/LabelState/LabelState.test.jsx
+++ b/web/packages/design/src/LabelState/LabelState.test.jsx
@@ -21,8 +21,8 @@ import { render, theme } from 'design/utils/testing';
 import LabelState, {
   StateDanger,
   StateInfo,
-  StateWarning,
   StateSuccess,
+  StateWarning,
 } from './LabelState';
 
 const colors = {
diff --git a/web/packages/design/src/LabelState/LabelState.tsx b/web/packages/design/src/LabelState/LabelState.tsx
index 139b528da8a9f..80667986ee0c1 100644
--- a/web/packages/design/src/LabelState/LabelState.tsx
+++ b/web/packages/design/src/LabelState/LabelState.tsx
@@ -19,17 +19,17 @@
 import styled from 'styled-components';
 
 import {
-  fontSize,
-  FontSizeProps,
   color,
   ColorProps,
-  width,
-  WidthProps,
+  fontSize,
+  FontSizeProps,
   space,
   SpaceProps,
+  width,
+  WidthProps,
 } from 'design/system';
-import { fade } from 'design/theme/utils/colorManipulator';
 import { Theme } from 'design/theme/themes/types';
+import { fade } from 'design/theme/utils/colorManipulator';
 
 export type LabelKind =
   | 'primary'
diff --git a/web/packages/design/src/LabelState/index.js b/web/packages/design/src/LabelState/index.js
index 7cebf1608815c..c2bfd9fadb581 100644
--- a/web/packages/design/src/LabelState/index.js
+++ b/web/packages/design/src/LabelState/index.js
@@ -19,9 +19,10 @@
 import LabelState, {
   StateDanger,
   StateInfo,
-  StateWarning,
   StateSuccess,
+  StateWarning,
 } from './LabelState';
+
 export default LabelState;
 
 export { StateDanger, StateInfo, StateWarning, StateSuccess };
diff --git a/web/packages/design/src/Link/Link.jsx b/web/packages/design/src/Link/Link.jsx
index d81be004d5424..772e3fbf8aeb9 100644
--- a/web/packages/design/src/Link/Link.jsx
+++ b/web/packages/design/src/Link/Link.jsx
@@ -18,7 +18,7 @@
 
 import styled from 'styled-components';
 
-import { space, color } from 'design/system';
+import { color, space } from 'design/system';
 
 function Link({ ...props }) {
   return <StyledButtonLink {...props} />;
diff --git a/web/packages/design/src/Link/index.js b/web/packages/design/src/Link/index.js
index 050436180418d..bdccb35999514 100644
--- a/web/packages/design/src/Link/index.js
+++ b/web/packages/design/src/Link/index.js
@@ -17,4 +17,5 @@
  */
 
 import Link from './Link';
+
 export default Link;
diff --git a/web/packages/design/src/Menu/Menu.jsx b/web/packages/design/src/Menu/Menu.jsx
index 05d648a053920..e89b026b52253 100644
--- a/web/packages/design/src/Menu/Menu.jsx
+++ b/web/packages/design/src/Menu/Menu.jsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, createRef } from 'react';
 import PropTypes from 'prop-types';
+import { Component, createRef } from 'react';
 
 import Popover from '../Popover';
-
 import getScrollbarSize from './../utils/scrollbarSize';
 import MenuList from './MenuList';
 
diff --git a/web/packages/design/src/Menu/Menu.story.tsx b/web/packages/design/src/Menu/Menu.story.tsx
index 1615f7774aab4..c7b0726ea414b 100644
--- a/web/packages/design/src/Menu/Menu.story.tsx
+++ b/web/packages/design/src/Menu/Menu.story.tsx
@@ -18,19 +18,18 @@
 
 import { PropsWithChildren, useRef, useState } from 'react';
 
-import { ButtonPrimary } from '../Button';
 import Box from '../Box';
+import { ButtonPrimary } from '../Button';
 import Flex from '../Flex';
 import * as Icons from '../Icon';
-import { H3 } from '../Text';
 import { Origin } from '../Popover';
-
-import MenuItemIcon from './MenuItemIcon';
+import { H3 } from '../Text';
+import Menu from './Menu';
 import MenuItem, {
   MenuItemSectionLabel,
   MenuItemSectionSeparator,
 } from './MenuItem';
-import Menu from './Menu';
+import MenuItemIcon from './MenuItemIcon';
 import MenuList from './MenuList';
 
 export default {
diff --git a/web/packages/design/src/Menu/MenuItem.tsx b/web/packages/design/src/Menu/MenuItem.tsx
index 2346184b1cbd1..5ccbae227c835 100644
--- a/web/packages/design/src/Menu/MenuItem.tsx
+++ b/web/packages/design/src/Menu/MenuItem.tsx
@@ -18,16 +18,16 @@
 
 import styled from 'styled-components';
 import {
-  fontSize,
   color,
-  space,
+  ColorProps,
+  fontSize,
   FontSizeProps,
+  space,
   SpaceProps,
-  ColorProps,
 } from 'styled-system';
 
-import { Theme } from 'design/theme/themes/types';
 import Flex from 'design/Flex';
+import { Theme } from 'design/theme/themes/types';
 
 const defaultValues = {
   fontSize: 1,
diff --git a/web/packages/design/src/Menu/index.js b/web/packages/design/src/Menu/index.js
index 6a606c399365c..a780f468affe3 100644
--- a/web/packages/design/src/Menu/index.js
+++ b/web/packages/design/src/Menu/index.js
@@ -19,5 +19,6 @@
 import Menu from './Menu';
 import MenuItem from './MenuItem';
 import MenuItemIcon from './MenuItemIcon';
+
 export default Menu;
 export { MenuItem, MenuItemIcon };
diff --git a/web/packages/design/src/Modal/Modal.test.tsx b/web/packages/design/src/Modal/Modal.test.tsx
index 09a63cdfc9df3..8ffee5e28e7d5 100644
--- a/web/packages/design/src/Modal/Modal.test.tsx
+++ b/web/packages/design/src/Modal/Modal.test.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState } from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { useState } from 'react';
 
-import { render, fireEvent } from 'design/utils/testing';
+import { fireEvent, render } from 'design/utils/testing';
 
 import Modal, { ModalProps } from './Modal';
 
diff --git a/web/packages/design/src/Modal/Modal.tsx b/web/packages/design/src/Modal/Modal.tsx
index c88cb359ec990..b842bf8a16a23 100644
--- a/web/packages/design/src/Modal/Modal.tsx
+++ b/web/packages/design/src/Modal/Modal.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { createRef, cloneElement, ComponentProps } from 'react';
-import styled, { StyleFunction } from 'styled-components';
+import React, { cloneElement, ComponentProps, createRef } from 'react';
 import { createPortal } from 'react-dom';
+import styled, { StyleFunction } from 'styled-components';
 
 export type ModalProps = {
   /**
diff --git a/web/packages/design/src/Modal/index.ts b/web/packages/design/src/Modal/index.ts
index 5a5c15c19b667..0f78fd9fd1dd2 100644
--- a/web/packages/design/src/Modal/index.ts
+++ b/web/packages/design/src/Modal/index.ts
@@ -17,5 +17,6 @@
  */
 
 import Modal from './Modal';
+
 export { type BackdropProps, type ModalProps } from './Modal';
 export default Modal;
diff --git a/web/packages/design/src/MultiRowBox/MultiRowBox.tsx b/web/packages/design/src/MultiRowBox/MultiRowBox.tsx
index 4b8df2845ff93..df23d21466ef2 100644
--- a/web/packages/design/src/MultiRowBox/MultiRowBox.tsx
+++ b/web/packages/design/src/MultiRowBox/MultiRowBox.tsx
@@ -17,7 +17,6 @@
  */
 
 import { ReactNode } from 'react';
-
 import styled from 'styled-components';
 
 import { Box } from 'design';
diff --git a/web/packages/design/src/Pill/Pill.test.tsx b/web/packages/design/src/Pill/Pill.test.tsx
index 6fb72c4864601..333ba304a45d0 100644
--- a/web/packages/design/src/Pill/Pill.test.tsx
+++ b/web/packages/design/src/Pill/Pill.test.tsx
@@ -18,7 +18,7 @@
 
 import { screen } from '@testing-library/react';
 
-import { render, fireEvent } from 'design/utils/testing';
+import { fireEvent, render } from 'design/utils/testing';
 
 import { Pill } from './Pill';
 
diff --git a/web/packages/design/src/Popover/Popover.story.test.tsx b/web/packages/design/src/Popover/Popover.story.test.tsx
index cf52671acb12c..af7a95eba0c4f 100644
--- a/web/packages/design/src/Popover/Popover.story.test.tsx
+++ b/web/packages/design/src/Popover/Popover.story.test.tsx
@@ -18,7 +18,7 @@
 
 import { screen } from '@testing-library/react';
 
-import { render, fireEvent } from 'design/utils/testing';
+import { fireEvent, render } from 'design/utils/testing';
 
 import { Sample, Tooltip } from './Popover.story';
 
diff --git a/web/packages/design/src/Popover/Popover.story.tsx b/web/packages/design/src/Popover/Popover.story.tsx
index d23f8dc0b7e30..f52c3bc0a818a 100644
--- a/web/packages/design/src/Popover/Popover.story.tsx
+++ b/web/packages/design/src/Popover/Popover.story.tsx
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, useState, MouseEvent } from 'react';
+import { Component, MouseEvent, useState } from 'react';
 import styled from 'styled-components';
 
-import { ButtonPrimary, Box, Flex, Text, H2 } from '..';
-
 import Popover, { GrowDirections, Origin } from '.';
+import { Box, ButtonPrimary, Flex, H2, Text } from '..';
 
 export default {
   title: 'Design/Popover',
diff --git a/web/packages/design/src/Popover/Popover.tsx b/web/packages/design/src/Popover/Popover.tsx
index 0de317099e523..a023a67691ec2 100644
--- a/web/packages/design/src/Popover/Popover.tsx
+++ b/web/packages/design/src/Popover/Popover.tsx
@@ -40,13 +40,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-import React, { createRef, Component } from 'react';
+import React, { Component, createRef } from 'react';
 import styled, { CSSProp } from 'styled-components';
 
 import Flex from 'design/Flex';
 
-import Modal, { BackdropProps, ModalProps as ModalProps } from '../Modal';
-
+import Modal, { BackdropProps, ModalProps } from '../Modal';
 import { Transition } from './Transition';
 
 type Offset = { top: number; left: number };
diff --git a/web/packages/design/src/Popover/index.ts b/web/packages/design/src/Popover/index.ts
index 7a60aaee8b4cf..06a2336649df7 100644
--- a/web/packages/design/src/Popover/index.ts
+++ b/web/packages/design/src/Popover/index.ts
@@ -17,6 +17,7 @@
  */
 
 import Popover from './Popover';
+
 export {
   StyledPopover,
   type Origin,
diff --git a/web/packages/design/src/RadioButton/RadioButton.story.tsx b/web/packages/design/src/RadioButton/RadioButton.story.tsx
index 12f0fa186dcaf..9e609247d5c62 100644
--- a/web/packages/design/src/RadioButton/RadioButton.story.tsx
+++ b/web/packages/design/src/RadioButton/RadioButton.story.tsx
@@ -19,7 +19,6 @@
 import styled from 'styled-components';
 
 import { Flex } from '..';
-
 import { RadioButton } from './RadioButton';
 
 export default {
diff --git a/web/packages/design/src/RadioButton/RadioButton.tsx b/web/packages/design/src/RadioButton/RadioButton.tsx
index e567aa6a2d3d9..a1701409a1b8f 100644
--- a/web/packages/design/src/RadioButton/RadioButton.tsx
+++ b/web/packages/design/src/RadioButton/RadioButton.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import styled from 'styled-components';
-
 import React, { forwardRef } from 'react';
+import styled from 'styled-components';
 
 export type RadioButtonSize = 'large' | 'small';
 
diff --git a/web/packages/design/src/RadioGroup/RadioGroup.tsx b/web/packages/design/src/RadioGroup/RadioGroup.tsx
index 4df14b26650d3..afb7194bc74f8 100644
--- a/web/packages/design/src/RadioGroup/RadioGroup.tsx
+++ b/web/packages/design/src/RadioGroup/RadioGroup.tsx
@@ -18,11 +18,10 @@
 
 import { ReactNode } from 'react';
 
-import { FieldRadio } from 'design/FieldRadio';
-
 import { Flex } from 'design';
-import { RadioButton, RadioButtonSize } from 'design/RadioButton';
+import { FieldRadio } from 'design/FieldRadio';
 import { FlexProps } from 'design/Flex';
+import { RadioButton, RadioButtonSize } from 'design/RadioButton';
 
 interface RadioObjectOption {
   value: string;
diff --git a/web/packages/design/src/ResourceIcon/ResourceIcon.story.tsx b/web/packages/design/src/ResourceIcon/ResourceIcon.story.tsx
index c6fbb88276d2d..811f3ad50e46a 100644
--- a/web/packages/design/src/ResourceIcon/ResourceIcon.story.tsx
+++ b/web/packages/design/src/ResourceIcon/ResourceIcon.story.tsx
@@ -19,8 +19,8 @@
 import React, { PropsWithChildren } from 'react';
 import { useTheme } from 'styled-components';
 
-import { ResourceIcon } from 'design/ResourceIcon';
 import { Flex, Text } from 'design';
+import { ResourceIcon } from 'design/ResourceIcon';
 
 import { iconNames } from './resourceIconSpecs';
 
diff --git a/web/packages/design/src/ResourceIcon/icons.ts b/web/packages/design/src/ResourceIcon/icons.ts
index 88c24d2a33ecb..c214fa383b577 100644
--- a/web/packages/design/src/ResourceIcon/icons.ts
+++ b/web/packages/design/src/ResourceIcon/icons.ts
@@ -17,10 +17,10 @@
  */
 
 import activemq from './assets/activemq.svg';
+import adobe from './assets/adobe.svg';
 import adobecreativecloudDark from './assets/adobecreativecloud-dark.svg';
 import adobecreativecloudLight from './assets/adobecreativecloud-light.svg';
 import adobemarketo from './assets/adobemarketo.svg';
-import adobe from './assets/adobe.svg';
 import airbase from './assets/airbase.svg';
 import airtable from './assets/airtable.svg';
 import algoliaDark from './assets/algolia-dark.svg';
@@ -39,16 +39,16 @@ import argocd from './assets/argocd.svg';
 import asana from './assets/asana.svg';
 import assembleDark from './assets/assemble-dark.svg';
 import assembleLight from './assets/assemble-light.svg';
+import atlassian from './assets/atlassian.svg';
 import atlassianbitbucket from './assets/atlassianbitbucket.svg';
 import atlassianjiraservicemanagement from './assets/atlassianjiraservicemanagement.svg';
 import atlassianstatuspage from './assets/atlassianstatuspage.svg';
-import atlassian from './assets/atlassian.svg';
 import auth0Dark from './assets/auth0-dark.svg';
 import auth0Light from './assets/auth0-light.svg';
 import avalara from './assets/avalara.svg';
+import awsAccount from './assets/aws-account.svg';
 import awsDark from './assets/aws-dark.svg';
 import awsLight from './assets/aws-light.svg';
-import awsAccount from './assets/aws-account.svg';
 import azure from './assets/azure.svg';
 import bill from './assets/bill.svg';
 import bonusly from './assets/bonusly.svg';
@@ -64,6 +64,8 @@ import cartaDark from './assets/carta-dark.svg';
 import cartaLight from './assets/carta-light.svg';
 import checkly from './assets/checkly.svg';
 import checkr from './assets/checkr.svg';
+import ciliumDark from './assets/cilium-dark.svg';
+import ciliumLight from './assets/cilium-light.svg';
 import circleciDark from './assets/circleci-dark.svg';
 import circleciLight from './assets/circleci-light.svg';
 import clari from './assets/clari.svg';
@@ -147,8 +149,6 @@ import hackeroneDark from './assets/hackerone-dark.svg';
 import hackeroneLight from './assets/hackerone-light.svg';
 import headliner from './assets/headliner.svg';
 import hootsuite from './assets/hootsuite.svg';
-import ciliumDark from './assets/cilium-dark.svg';
-import ciliumLight from './assets/cilium-light.svg';
 import ibmDark from './assets/ibm-dark.svg';
 import ibmLight from './assets/ibm-light.svg';
 import inkeep from './assets/inkeep.svg';
@@ -209,9 +209,9 @@ import neverbounceDark from './assets/neverbounce-dark.svg';
 import neverbounceLight from './assets/neverbounce-light.svg';
 import notion from './assets/notion.svg';
 import oasisopen from './assets/oasisopen.svg';
+import oktaAlt from './assets/okta-alt.svg';
 import oktaDark from './assets/okta-dark.svg';
 import oktaLight from './assets/okta-light.svg';
-import oktaAlt from './assets/okta-alt.svg';
 import onehundredonedomain from './assets/onehundredonedomain.svg';
 import oneloginDark from './assets/onelogin-dark.svg';
 import oneloginLight from './assets/onelogin-light.svg';
diff --git a/web/packages/design/src/ResourceIcon/index.tsx b/web/packages/design/src/ResourceIcon/index.tsx
index 79fd4087de0e4..c6c082c8694ed 100644
--- a/web/packages/design/src/ResourceIcon/index.tsx
+++ b/web/packages/design/src/ResourceIcon/index.tsx
@@ -22,9 +22,9 @@ import { useTheme } from 'styled-components';
 import { Image } from 'design';
 
 import {
+  iconNames,
   ResourceIconName,
   resourceIconSpecs,
-  iconNames,
 } from './resourceIconSpecs';
 
 interface ResourceIconProps extends ComponentProps<typeof Image> {
diff --git a/web/packages/design/src/SVGIcon/SVGIcon.tsx b/web/packages/design/src/SVGIcon/SVGIcon.tsx
index c2cdb0ad00337..1260bcb4fa42f 100644
--- a/web/packages/design/src/SVGIcon/SVGIcon.tsx
+++ b/web/packages/design/src/SVGIcon/SVGIcon.tsx
@@ -17,7 +17,6 @@
  */
 
 import React from 'react';
-
 import { useTheme } from 'styled-components';
 
 export function SVGIcon({
diff --git a/web/packages/design/src/SVGIcon/SvgIcon.story.tsx b/web/packages/design/src/SVGIcon/SvgIcon.story.tsx
index bec063a5a656b..4929004984873 100644
--- a/web/packages/design/src/SVGIcon/SvgIcon.story.tsx
+++ b/web/packages/design/src/SVGIcon/SvgIcon.story.tsx
@@ -17,16 +17,14 @@
  */
 
 import { ReactNode } from 'react';
-
 import { useTheme } from 'styled-components';
 
 import { IconCircle } from 'design/Icon/IconCircle';
 
 import Flex from '../Flex';
 import Text from '../Text';
-
-import { TeleportGearIcon } from './TeleportGearIcon';
 import { SVGIconProps } from './common';
+import { TeleportGearIcon } from './TeleportGearIcon';
 
 export default {
   title: 'Design/Icon',
diff --git a/web/packages/design/src/SVGIcon/TeleportGearIcon.tsx b/web/packages/design/src/SVGIcon/TeleportGearIcon.tsx
index 3656a2d105f32..d5e5df6e98f6f 100644
--- a/web/packages/design/src/SVGIcon/TeleportGearIcon.tsx
+++ b/web/packages/design/src/SVGIcon/TeleportGearIcon.tsx
@@ -18,9 +18,8 @@
 
 import { useTheme } from 'styled-components';
 
-import { SVGIcon } from './SVGIcon';
-
 import type { SVGIconProps } from './common';
+import { SVGIcon } from './SVGIcon';
 
 export function TeleportGearIcon({ size = 16 }: Omit<SVGIconProps, 'fill'>) {
   const theme = useTheme();
diff --git a/web/packages/design/src/SlideTabs/SlideTabs.story.tsx b/web/packages/design/src/SlideTabs/SlideTabs.story.tsx
index 8de3315463db9..287061de65a1b 100644
--- a/web/packages/design/src/SlideTabs/SlideTabs.story.tsx
+++ b/web/packages/design/src/SlideTabs/SlideTabs.story.tsx
@@ -18,8 +18,8 @@
 
 import { useState } from 'react';
 
-import * as Icon from 'design/Icon';
 import Flex from 'design/Flex';
+import * as Icon from 'design/Icon';
 
 import { SlideTabs, TabSpec } from './SlideTabs';
 
diff --git a/web/packages/design/src/SlideTabs/SlideTabs.test.tsx b/web/packages/design/src/SlideTabs/SlideTabs.test.tsx
index 75c68780f1cda..707295b002978 100644
--- a/web/packages/design/src/SlideTabs/SlideTabs.test.tsx
+++ b/web/packages/design/src/SlideTabs/SlideTabs.test.tsx
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState } from 'react';
 import { screen } from '@testing-library/react';
-
-import { render, userEvent } from 'design/utils/testing';
+import { useState } from 'react';
 
 import * as Icon from 'design/Icon';
+import { render, userEvent } from 'design/utils/testing';
 
 import { SlideTabs, SlideTabsProps } from './SlideTabs';
 
diff --git a/web/packages/design/src/SlideTabs/SlideTabs.tsx b/web/packages/design/src/SlideTabs/SlideTabs.tsx
index 9a81f79fd99ac..a6a35d629a988 100644
--- a/web/packages/design/src/SlideTabs/SlideTabs.tsx
+++ b/web/packages/design/src/SlideTabs/SlideTabs.tsx
@@ -21,9 +21,9 @@ import styled, { useTheme } from 'styled-components';
 
 import { Flex, Indicator } from 'design';
 import { IconProps } from 'design/Icon/Icon';
-import { HoverTooltip } from 'design/Tooltip';
 import { Position } from 'design/Popover/Popover';
 import { StatusIcon, StatusKind } from 'design/StatusIcon';
+import { HoverTooltip } from 'design/Tooltip';
 
 export function SlideTabs({
   appearance = 'square',
diff --git a/web/packages/design/src/StatusIcon/StatusIcon.tsx b/web/packages/design/src/StatusIcon/StatusIcon.tsx
index 08fe46a020b22..28bb4d132406d 100644
--- a/web/packages/design/src/StatusIcon/StatusIcon.tsx
+++ b/web/packages/design/src/StatusIcon/StatusIcon.tsx
@@ -17,7 +17,6 @@
  */
 
 import React from 'react';
-
 import { useTheme } from 'styled-components';
 
 import * as Icon from 'design/Icon';
diff --git a/web/packages/design/src/StepSlider/StepSlider.story.tsx b/web/packages/design/src/StepSlider/StepSlider.story.tsx
index c488b04bc9e67..19029368f4c46 100644
--- a/web/packages/design/src/StepSlider/StepSlider.story.tsx
+++ b/web/packages/design/src/StepSlider/StepSlider.story.tsx
@@ -19,7 +19,7 @@
 import { useState } from 'react';
 import styled from 'styled-components';
 
-import { Box, ButtonLink, ButtonPrimary, Text, Card, H1, H2 } from 'design';
+import { Box, ButtonLink, ButtonPrimary, Card, H1, H2, Text } from 'design';
 
 import { NewFlow, StepComponentProps, StepSlider } from './StepSlider';
 
diff --git a/web/packages/design/src/StepSlider/StepSlider.test.tsx b/web/packages/design/src/StepSlider/StepSlider.test.tsx
index 6ddd11f33a67e..2f4015835be05 100644
--- a/web/packages/design/src/StepSlider/StepSlider.test.tsx
+++ b/web/packages/design/src/StepSlider/StepSlider.test.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import {
-  SingleFlowInPlaceSlider,
   MultiFlowWheelSlider,
+  SingleFlowInPlaceSlider,
 } from './StepSlider.story';
 
 test('single flow', () => {
diff --git a/web/packages/design/src/StepSlider/StepSlider.tsx b/web/packages/design/src/StepSlider/StepSlider.tsx
index fa5a92f62a5fa..745d19f28909e 100644
--- a/web/packages/design/src/StepSlider/StepSlider.tsx
+++ b/web/packages/design/src/StepSlider/StepSlider.tsx
@@ -17,11 +17,11 @@
  */
 
 import React, {
+  createRef,
   useCallback,
   useEffect,
   useRef,
   useState,
-  createRef,
 } from 'react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import styled from 'styled-components';
diff --git a/web/packages/design/src/Text/Text.tsx b/web/packages/design/src/Text/Text.tsx
index f5401f07e960f..3282635e4a08e 100644
--- a/web/packages/design/src/Text/Text.tsx
+++ b/web/packages/design/src/Text/Text.tsx
@@ -16,27 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Property } from 'csstype';
 import styled from 'styled-components';
-
 import { ResponsiveValue } from 'styled-system';
 
-import { Property } from 'csstype';
-
 import {
-  typography,
-  TypographyProps,
+  color,
+  ColorProps,
   fontSize,
   FontSizeProps,
+  fontWeight,
   space,
   SpaceProps,
-  color,
-  ColorProps,
   textAlign,
   TextAlignProps,
-  fontWeight,
+  typography,
+  TypographyProps,
 } from 'design/system';
-import { fontWeights } from 'design/theme/typography';
 import { shouldForwardTypographyProp } from 'design/system/typography';
+import { fontWeights } from 'design/theme/typography';
 
 interface FontWeightProps {
   fontWeight?: ResponsiveValue<Property.FontWeight | keyof typeof fontWeights>;
diff --git a/web/packages/design/src/Text/index.ts b/web/packages/design/src/Text/index.ts
index d4c1d1a1bbaf6..47a9a5cf65e25 100644
--- a/web/packages/design/src/Text/index.ts
+++ b/web/packages/design/src/Text/index.ts
@@ -17,6 +17,7 @@
  */
 
 import Text from './Text';
+
 export {
   H1,
   H2,
diff --git a/web/packages/design/src/TextArea/TextArea.story.tsx b/web/packages/design/src/TextArea/TextArea.story.tsx
index 7297d8768dd25..11e51f8545a4b 100644
--- a/web/packages/design/src/TextArea/TextArea.story.tsx
+++ b/web/packages/design/src/TextArea/TextArea.story.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { H2 } from 'design/Text/Text';
-import Flex from 'design/Flex';
 import Box from 'design/Box';
+import Flex from 'design/Flex';
+import { H2 } from 'design/Text/Text';
 
 import { TextArea } from './TextArea';
 
diff --git a/web/packages/design/src/TextArea/TextArea.tsx b/web/packages/design/src/TextArea/TextArea.tsx
index 0142233df2c6c..26f3642338329 100644
--- a/web/packages/design/src/TextArea/TextArea.tsx
+++ b/web/packages/design/src/TextArea/TextArea.tsx
@@ -23,14 +23,14 @@ import React, {
 } from 'react';
 import styled, { CSSObject } from 'styled-components';
 import {
-  space,
-  width,
   color,
-  height,
   ColorProps,
+  height,
+  HeightProps,
+  space,
   SpaceProps,
+  width,
   WidthProps,
-  HeightProps,
 } from 'styled-system';
 
 import { Theme } from 'design/theme/themes/types';
diff --git a/web/packages/design/src/ThemeProvider/globals.js b/web/packages/design/src/ThemeProvider/globals.js
index bc62231a3d4ac..71e5d131fca12 100644
--- a/web/packages/design/src/ThemeProvider/globals.js
+++ b/web/packages/design/src/ThemeProvider/globals.js
@@ -17,6 +17,7 @@
  */
 
 import { createGlobalStyle } from 'styled-components';
+
 import './../assets/ubuntu/style.css';
 
 const GlobalStyle = createGlobalStyle`
diff --git a/web/packages/design/src/ThemeProvider/index.tsx b/web/packages/design/src/ThemeProvider/index.tsx
index 8f3a1aa4070da..8276b347ebb2d 100644
--- a/web/packages/design/src/ThemeProvider/index.tsx
+++ b/web/packages/design/src/ThemeProvider/index.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import isPropValid from '@emotion/is-prop-valid';
 import { ReactNode } from 'react';
 import {
-  WebTarget,
-  StyleSheetManager,
   ThemeProvider as StyledThemeProvider,
+  StyleSheetManager,
+  WebTarget,
 } from 'styled-components';
 
-import isPropValid from '@emotion/is-prop-valid';
-
-import { GlobalStyle } from 'design/ThemeProvider/globals';
 import { Theme } from 'design/theme';
+import { GlobalStyle } from 'design/ThemeProvider/globals';
 
 /**
  * This function has been taken from the [styled-components library
diff --git a/web/packages/design/src/Toggle/Toggle.story.tsx b/web/packages/design/src/Toggle/Toggle.story.tsx
index e4a03ec12d25b..40b7a388a475e 100644
--- a/web/packages/design/src/Toggle/Toggle.story.tsx
+++ b/web/packages/design/src/Toggle/Toggle.story.tsx
@@ -18,9 +18,8 @@
 
 import { useState } from 'react';
 
-import Text from '../Text';
 import Flex from '../Flex';
-
+import Text from '../Text';
 import { Toggle } from './Toggle';
 
 export default {
diff --git a/web/packages/design/src/Tooltip/HoverTooltip.tsx b/web/packages/design/src/Tooltip/HoverTooltip.tsx
index 6dbaab58bdf0a..34ffb778469d2 100644
--- a/web/packages/design/src/Tooltip/HoverTooltip.tsx
+++ b/web/packages/design/src/Tooltip/HoverTooltip.tsx
@@ -19,11 +19,10 @@
 import React, { PropsWithChildren, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
 
-import { Popover, Flex, Text } from 'design';
-import { JustifyContentProps, FlexBasisProps } from 'design/system';
-
+import { Flex, Popover, Text } from 'design';
 import { Origin } from 'design/Popover';
 import { Position } from 'design/Popover/Popover';
+import { FlexBasisProps, JustifyContentProps } from 'design/system';
 
 import { anchorOriginForPosition, transformOriginForPosition } from './shared';
 
diff --git a/web/packages/design/src/Tooltip/IconTooltip.story.tsx b/web/packages/design/src/Tooltip/IconTooltip.story.tsx
index 7cb9b2aed622e..90710c5502e06 100644
--- a/web/packages/design/src/Tooltip/IconTooltip.story.tsx
+++ b/web/packages/design/src/Tooltip/IconTooltip.story.tsx
@@ -18,13 +18,13 @@
 
 import styled, { useTheme } from 'styled-components';
 
-import { Text, Flex, ButtonPrimary } from 'design';
-import { P } from 'design/Text/Text';
-import AGPLLogoLight from 'design/assets/images/agpl-light.svg';
+import { ButtonPrimary, Flex, Text } from 'design';
 import AGPLLogoDark from 'design/assets/images/agpl-dark.svg';
+import AGPLLogoLight from 'design/assets/images/agpl-light.svg';
+import { P } from 'design/Text/Text';
 
-import { IconTooltip } from './IconTooltip';
 import { HoverTooltip } from './HoverTooltip';
+import { IconTooltip } from './IconTooltip';
 
 export default {
   title: 'Design/Tooltip',
diff --git a/web/packages/design/src/TopNav/TopNavItem.jsx b/web/packages/design/src/TopNav/TopNavItem.jsx
index b0ec6134bf1ea..c3d5fad7fcbc9 100644
--- a/web/packages/design/src/TopNav/TopNavItem.jsx
+++ b/web/packages/design/src/TopNav/TopNavItem.jsx
@@ -18,7 +18,7 @@
 
 import styled from 'styled-components';
 
-import { space, width, maxWidth, height, maxHeight } from 'design/system';
+import { height, maxHeight, maxWidth, space, width } from 'design/system';
 
 /**
  * TopNavItem
diff --git a/web/packages/design/src/TopNav/index.js b/web/packages/design/src/TopNav/index.js
index 79f60b7a6b13a..565035b27d344 100644
--- a/web/packages/design/src/TopNav/index.js
+++ b/web/packages/design/src/TopNav/index.js
@@ -17,4 +17,5 @@
  */
 
 import TopNav from './TopNav';
+
 export default TopNav;
diff --git a/web/packages/design/src/datetime/format.test.ts b/web/packages/design/src/datetime/format.test.ts
index 9adc835becd1a..971d8c250722a 100644
--- a/web/packages/design/src/datetime/format.test.ts
+++ b/web/packages/design/src/datetime/format.test.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { displayDate, displayDateTime, dateTimeShortFormat } from './format';
+import { dateTimeShortFormat, displayDate, displayDateTime } from './format';
 
 const testDate = new Date('2022-01-28T16:00:44.309Z');
 
diff --git a/web/packages/design/src/datetime/format.ts b/web/packages/design/src/datetime/format.ts
index f81c1dc93abce..45a667f08ff33 100644
--- a/web/packages/design/src/datetime/format.ts
+++ b/web/packages/design/src/datetime/format.ts
@@ -23,8 +23,8 @@ import { Logger } from 'design/logger';
 import {
   DATE_FORMAT,
   DATE_TIME_FORMAT,
-  SHORT_DATE_FORMAT,
   DATE_WITH_PREFIXED_TIME_FORMAT,
+  SHORT_DATE_FORMAT,
 } from './constants';
 
 const DEFAULT_LOCALE = 'en-US';
diff --git a/web/packages/design/src/index.ts b/web/packages/design/src/index.ts
index 89c45fa08a326..6428a7ac4cc75 100644
--- a/web/packages/design/src/index.ts
+++ b/web/packages/design/src/index.ts
@@ -20,17 +20,19 @@ import { Alert, Banner } from './Alert';
 import Box from './Box';
 import {
   Button,
+  ButtonBorder,
   ButtonPrimary,
-  ButtonWarning,
   ButtonSecondary,
-  ButtonBorder,
   ButtonText,
+  ButtonWarning,
 } from './Button';
 import ButtonIcon from './ButtonIcon';
 import ButtonLink from './ButtonLink';
 import { ButtonWithMenu } from './ButtonWithMenu';
 import Card from './Card';
 import CardSuccess, { CardSuccessLogin } from './CardSuccess';
+import Flex from './Flex';
+import Image from './Image';
 import { Indicator } from './Indicator';
 import Input from './Input';
 import Label from './Label';
@@ -38,7 +40,11 @@ import { LabelInput } from './LabelInput';
 import LabelState from './LabelState';
 import Link from './Link';
 import { Mark } from './Mark';
-import Image from './Image';
+import Menu, { MenuItem, MenuItemIcon } from './Menu';
+import { Pill } from './Pill';
+import Popover from './Popover';
+import { ResourceIcon } from './ResourceIcon';
+import { StepSlider } from './StepSlider';
 import Text, {
   H1,
   H2,
@@ -51,15 +57,9 @@ import Text, {
   Subtitle2,
   Subtitle3,
 } from './Text';
-import { StepSlider } from './StepSlider';
-import TopNav from './TopNav';
-import Flex from './Flex';
-import Menu, { MenuItem, MenuItemIcon } from './Menu';
-import { Pill } from './Pill';
-import Popover from './Popover';
 import { TextArea } from './TextArea';
-import { ResourceIcon } from './ResourceIcon';
 import { Toggle } from './Toggle';
+import TopNav from './TopNav';
 
 export { AnimatedProgressBar } from './AnimatedProgressBar';
 export {
diff --git a/web/packages/design/src/labels.story.jsx b/web/packages/design/src/labels.story.jsx
index 37f94216cece5..1ebbb65189dee 100644
--- a/web/packages/design/src/labels.story.jsx
+++ b/web/packages/design/src/labels.story.jsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Flex from './Flex';
 import Label from './Label';
 import LabelState from './LabelState';
-import Flex from './Flex';
 
 export default {
   title: 'Design/Label',
diff --git a/web/packages/design/src/system/index.ts b/web/packages/design/src/system/index.ts
index 72e7b7b3db822..ecab574c03198 100644
--- a/web/packages/design/src/system/index.ts
+++ b/web/packages/design/src/system/index.ts
@@ -16,66 +16,65 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Property } from 'csstype';
 import {
   alignItems,
-  type AlignItemsProps,
   alignSelf,
-  type AlignSelfProps,
   border,
-  type BorderProps,
   borderColor,
-  type BorderColorProps,
   borderRadius,
-  type BorderRadiusProps,
   borders,
-  type BordersProps,
   color,
-  type ColorProps,
   flex,
-  type FlexProps,
   flexBasis,
-  type FlexBasisProps,
   flexDirection,
-  type FlexDirectionProps,
   flexWrap,
-  type FlexWrapProps,
   fontSize,
-  type FontSizeProps,
   fontWeight,
-  type FontWeightProps,
   height,
-  type HeightProps,
   justifyContent,
-  type JustifyContentProps,
   justifySelf,
-  type JustifySelfProps,
   lineHeight,
-  type LineHeightProps,
   maxHeight,
-  type MaxHeightProps,
   maxWidth,
-  type MaxWidthProps,
   minHeight,
-  type MinHeightProps,
   minWidth,
-  type MinWidthProps,
   overflow,
-  type OverflowProps,
+  ResponsiveValue,
   size,
-  type SizeProps,
   space,
-  type SpaceProps,
+  style,
   textAlign,
-  type TextAlignProps,
+  TLengthStyledSystem,
   width,
+  type AlignItemsProps,
+  type AlignSelfProps,
+  type BorderColorProps,
+  type BorderProps,
+  type BorderRadiusProps,
+  type BordersProps,
+  type ColorProps,
+  type FlexBasisProps,
+  type FlexDirectionProps,
+  type FlexProps,
+  type FlexWrapProps,
+  type FontSizeProps,
+  type FontWeightProps,
+  type HeightProps,
+  type JustifyContentProps,
+  type JustifySelfProps,
+  type LineHeightProps,
+  type MaxHeightProps,
+  type MaxWidthProps,
+  type MinHeightProps,
+  type MinWidthProps,
+  type OverflowProps,
+  type SizeProps,
+  type SpaceProps,
+  type TextAlignProps,
   type WidthProps,
-  style,
-  ResponsiveValue,
-  TLengthStyledSystem,
 } from 'styled-system';
 
-import { Property } from 'csstype';
-
 import typography, { type TypographyProps } from './typography';
 
 const gap = style({
diff --git a/web/packages/design/src/system/typography.ts b/web/packages/design/src/system/typography.ts
index b8248f2efc150..1e495c8682e6b 100644
--- a/web/packages/design/src/system/typography.ts
+++ b/web/packages/design/src/system/typography.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { WebTarget } from 'styled-components';
 import { Property } from 'csstype';
+import { WebTarget } from 'styled-components';
 
 import { SharedStyles, Theme } from 'design/theme/themes/types';
 import { shouldForwardProp } from 'design/ThemeProvider';
diff --git a/web/packages/design/src/theme/index.ts b/web/packages/design/src/theme/index.ts
index dbf4fa42fce86..a8815ee364a19 100644
--- a/web/packages/design/src/theme/index.ts
+++ b/web/packages/design/src/theme/index.ts
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import bblpTheme from './themes/bblpTheme';
 import darkTheme from './themes/darkTheme';
 import lightTheme from './themes/lightTheme';
-import bblpTheme from './themes/bblpTheme';
+
 export * from './themes/types';
 
 export { darkTheme, lightTheme, bblpTheme };
diff --git a/web/packages/design/src/theme/palette.story.jsx b/web/packages/design/src/theme/palette.story.jsx
index 4b4aae91b4ca0..e0f022fa46f5c 100644
--- a/web/packages/design/src/theme/palette.story.jsx
+++ b/web/packages/design/src/theme/palette.story.jsx
@@ -18,8 +18,7 @@
 
 /*eslint import/namespace: ['error', { allowComputed: true }]*/
 
-import { Flex, Box } from '..';
-
+import { Box, Flex } from '..';
 import * as colors from './palette';
 import { getContrastText } from './themes/sharedStyles';
 
diff --git a/web/packages/design/src/theme/themeColors.story.tsx b/web/packages/design/src/theme/themeColors.story.tsx
index 37a441bc70bab..c1e0aef0110bc 100644
--- a/web/packages/design/src/theme/themeColors.story.tsx
+++ b/web/packages/design/src/theme/themeColors.story.tsx
@@ -18,11 +18,11 @@
 
 import { useTheme } from 'styled-components';
 
-import Text, { H1, H2 } from '../Text';
-import Flex, { FlexProps } from '../Flex';
 import Box, { BoxProps } from '../Box';
+import Flex, { FlexProps } from '../Flex';
 import Link from '../Link';
-import { ThemeColors, Theme } from '../theme';
+import Text, { H1, H2 } from '../Text';
+import { Theme, ThemeColors } from '../theme';
 
 export default {
   title: 'Design/Theme/Colors',
diff --git a/web/packages/design/src/theme/themes/bblpTheme.ts b/web/packages/design/src/theme/themes/bblpTheme.ts
index bab7835d0c80d..4ffba3f24dca9 100644
--- a/web/packages/design/src/theme/themes/bblpTheme.ts
+++ b/web/packages/design/src/theme/themes/bblpTheme.ts
@@ -29,7 +29,6 @@ import {
 } from 'design/theme/palette';
 
 import { lighten } from '../utils/colorManipulator';
-
 import { sharedColors, sharedStyles } from './sharedStyles';
 import { DataVisualisationColors, Theme, ThemeColors } from './types';
 
diff --git a/web/packages/design/src/theme/themes/darkTheme.ts b/web/packages/design/src/theme/themes/darkTheme.ts
index 1a7ce32ece88c..eb0f044ee51c2 100644
--- a/web/packages/design/src/theme/themes/darkTheme.ts
+++ b/web/packages/design/src/theme/themes/darkTheme.ts
@@ -29,7 +29,6 @@ import {
 } from 'design/theme/palette';
 
 import { lighten } from '../utils/colorManipulator';
-
 import { sharedColors, sharedStyles } from './sharedStyles';
 import { DataVisualisationColors, Theme, ThemeColors } from './types';
 
diff --git a/web/packages/design/src/theme/themes/lightTheme.ts b/web/packages/design/src/theme/themes/lightTheme.ts
index c19ebb8e991cc..7febc92c22395 100644
--- a/web/packages/design/src/theme/themes/lightTheme.ts
+++ b/web/packages/design/src/theme/themes/lightTheme.ts
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { darken, lighten } from '../utils/colorManipulator';
 import {
   blue,
   green,
@@ -28,7 +27,7 @@ import {
   red,
   yellow,
 } from '../palette';
-
+import { darken, lighten } from '../utils/colorManipulator';
 import { sharedColors, sharedStyles } from './sharedStyles';
 import { DataVisualisationColors, Theme, ThemeColors } from './types';
 
diff --git a/web/packages/design/src/theme/themes/sharedStyles.ts b/web/packages/design/src/theme/themes/sharedStyles.ts
index b32290535ee3a..d9de8b29c1082 100644
--- a/web/packages/design/src/theme/themes/sharedStyles.ts
+++ b/web/packages/design/src/theme/themes/sharedStyles.ts
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { getContrastRatio } from '../utils/colorManipulator';
-import { lightBlue, blueGrey, yellow } from '../palette';
-import typography, { fontSizes, fontWeights } from '../typography';
 import { fonts } from '../fonts';
-
+import { blueGrey, lightBlue, yellow } from '../palette';
+import typography, { fontSizes, fontWeights } from '../typography';
+import { getContrastRatio } from '../utils/colorManipulator';
 import { SharedColors, SharedStyles } from './types';
 
 // TODO(bl-nero): use a CSS var for sidebar width and make the breakpoints work
diff --git a/web/packages/design/src/theme/typography.story.jsx b/web/packages/design/src/theme/typography.story.jsx
index 46be53ce4c8a2..656981d7fe9d3 100644
--- a/web/packages/design/src/theme/typography.story.jsx
+++ b/web/packages/design/src/theme/typography.story.jsx
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Box } from '..';
-
+import { Box, Text } from '..';
 import typography from './typography';
 
 export default {
diff --git a/web/packages/design/src/utils/match/matchers.test.ts b/web/packages/design/src/utils/match/matchers.test.ts
index 72de61034f72f..1deb2e371ab55 100644
--- a/web/packages/design/src/utils/match/matchers.test.ts
+++ b/web/packages/design/src/utils/match/matchers.test.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { dateTimeMatcher, dateMatcher } from './matchers';
+import { dateMatcher, dateTimeMatcher } from './matchers';
 
 test('dateTimeMatcher should match date times correctly', () => {
   const searchValue = '23:13';
diff --git a/web/packages/design/src/utils/renderHook.tsx b/web/packages/design/src/utils/renderHook.tsx
index 223d819d742fe..08edc9a3cea74 100644
--- a/web/packages/design/src/utils/renderHook.tsx
+++ b/web/packages/design/src/utils/renderHook.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from 'react';
 import { act, render } from '@testing-library/react';
+import React from 'react';
 
 /**
  * @deprecated Use renderHook provided by @testing-library/react-hooks instead.
diff --git a/web/packages/design/src/utils/testing.tsx b/web/packages/design/src/utils/testing.tsx
index 2158692911414..7676aba5ce40e 100644
--- a/web/packages/design/src/utils/testing.tsx
+++ b/web/packages/design/src/utils/testing.tsx
@@ -16,22 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ReactNode } from 'react';
 import {
-  render as testingRender,
   act,
   fireEvent,
-  waitFor,
-  screen,
-  prettyDOM,
   getByTestId,
+  prettyDOM,
+  screen,
+  render as testingRender,
+  waitFor,
   waitForElementToBeRemoved,
 } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { ReactNode } from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 
-import { ConfiguredThemeProvider } from 'design/ThemeProvider';
 import { darkTheme } from 'design/theme';
+import { ConfiguredThemeProvider } from 'design/ThemeProvider';
+
 import '@testing-library/jest-dom';
 import 'jest-styled-components';
 
diff --git a/web/packages/shared/@types/react-select.d.ts b/web/packages/shared/@types/react-select.d.ts
index 79b65eb4457fa..8755805fdf3ab 100644
--- a/web/packages/shared/@types/react-select.d.ts
+++ b/web/packages/shared/@types/react-select.d.ts
@@ -20,6 +20,7 @@
 // https://react-select.com/typescript#custom-select-props
 
 import type {} from 'react-select/base';
+
 // This import is necessary for module augmentation.
 // It allows us to extend the 'Props' interface in the 'react-select/base' module
 // and add our custom property 'myCustomProp' to it.
diff --git a/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationRequest.tsx b/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationRequest.tsx
index a751566765c27..17f52dd56b42f 100644
--- a/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationRequest.tsx
+++ b/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationRequest.tsx
@@ -17,9 +17,7 @@
  */
 
 import { Flex, LabelInput, Text } from 'design';
-
 import { IconTooltip } from 'design/Tooltip';
-
 import Select, { Option } from 'shared/components/Select';
 
 export function AccessDurationRequest({
diff --git a/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationReview.tsx b/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationReview.tsx
index 39c2c77c0a954..13e49fbe41c10 100644
--- a/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationReview.tsx
+++ b/web/packages/shared/components/AccessRequests/AccessDuration/AccessDurationReview.tsx
@@ -17,9 +17,7 @@
  */
 
 import { Flex, Text } from 'design';
-
 import { IconTooltip } from 'design/Tooltip';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import { getFormattedDurationTxt } from '../Shared/utils';
diff --git a/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.test.ts b/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.test.ts
index d0d3645a76a20..3f246bc32bbb2 100644
--- a/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.test.ts
+++ b/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.test.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { addHours, addWeeks, addDays } from 'date-fns';
+import { addDays, addHours, addWeeks } from 'date-fns';
 
 import {
-  getDurationOptionIndexClosestToOneWeek,
   DurationOption,
+  getDurationOptionIndexClosestToOneWeek,
 } from './durationOptions';
 
 describe('getDurationOptionIndexClosestToOneWeek', () => {
diff --git a/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.ts b/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.ts
index f3460b06c0d37..94acd0fc8c3a8 100644
--- a/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.ts
+++ b/web/packages/shared/components/AccessRequests/AccessDuration/durationOptions.ts
@@ -17,15 +17,14 @@
  */
 
 import {
-  addHours,
   addDays,
-  isAfter,
+  addHours,
   addWeeks,
   differenceInHours,
+  isAfter,
 } from 'date-fns';
 
 import { Option } from 'shared/components/Select';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import { getFormattedDurationTxt } from '../Shared/utils';
diff --git a/web/packages/shared/components/AccessRequests/AccessDuration/getDurationOptionsFromStartTime.test.ts b/web/packages/shared/components/AccessRequests/AccessDuration/getDurationOptionsFromStartTime.test.ts
index 34dada01f42a7..47250ea38706e 100644
--- a/web/packages/shared/components/AccessRequests/AccessDuration/getDurationOptionsFromStartTime.test.ts
+++ b/web/packages/shared/components/AccessRequests/AccessDuration/getDurationOptionsFromStartTime.test.ts
@@ -19,7 +19,6 @@
 import { addDays } from 'date-fns';
 
 import { Option } from 'shared/components/Select';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import {
diff --git a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.story.tsx b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.story.tsx
index d20ea9527bc00..9c98038584c55 100644
--- a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.story.tsx
+++ b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.story.tsx
@@ -19,14 +19,11 @@
 import { useState } from 'react';
 
 import { Box, Text } from 'design';
-
 import { displayDateTime } from 'design/datetime';
-
 import { Option } from 'shared/components/Select';
 
-import { dryRunResponse } from '../fixtures';
 import { AccessDurationRequest, AccessDurationReview } from '../AccessDuration';
-
+import { dryRunResponse } from '../fixtures';
 import { AssumeStartTime } from './AssumeStartTime';
 
 export default {
diff --git a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.test.tsx b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.test.tsx
index fbd96970e018a..0f76dc50aaa3b 100644
--- a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.test.tsx
+++ b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.test.tsx
@@ -16,14 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, fireEvent } from 'design/utils/testing';
-
+import { fireEvent, render, screen } from 'design/utils/testing';
 import { AccessRequest } from 'shared/services/accessRequests';
 
-import { dryRunResponse } from '../fixtures';
 import { AccessDurationRequest, AccessDurationReview } from '../AccessDuration';
+import { dryRunResponse } from '../fixtures';
 import { useSpecifiableFields } from '../NewRequest/useSpecifiableFields';
-
 import { AssumeStartTime } from './AssumeStartTime';
 
 test('assume start time, creating mode', () => {
diff --git a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.tsx b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.tsx
index 4cea641ce8c6c..4f3b69bb0f77f 100644
--- a/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.tsx
+++ b/web/packages/shared/components/AccessRequests/AssumeStartTime/AssumeStartTime.tsx
@@ -17,25 +17,25 @@
  */
 
 import { useState } from 'react';
-import styled from 'styled-components';
 import { DayPicker } from 'react-day-picker';
+import styled from 'styled-components';
+
 import 'react-day-picker/dist/style.css';
+
 import { addMonths } from 'date-fns';
 
-import { Flex, Box, LabelInput, ButtonIcon } from 'design';
-import { Calendar as CalendarIcon, Refresh as RefreshIcon } from 'design/Icon';
-import { StyledDateRange } from 'teleport/components/DayPicker/Shared';
+import { Box, ButtonIcon, Flex, LabelInput } from 'design';
 import { ButtonSecondary } from 'design/Button';
 import { displayShortDate } from 'design/datetime';
-
-import Validation from 'shared/components/Validation';
+import { Calendar as CalendarIcon, Refresh as RefreshIcon } from 'design/Icon';
 import FieldSelect from 'shared/components/FieldSelect';
+import Validation from 'shared/components/Validation';
 import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
-import { TimeOption } from '../Shared/types';
+import { StyledDateRange } from 'teleport/components/DayPicker/Shared';
 
+import { TimeOption } from '../Shared/types';
 import {
   convertStartToTimeOption,
   getMaxAssumableDate,
diff --git a/web/packages/shared/components/AccessRequests/AssumeStartTime/timeOptions.tsx b/web/packages/shared/components/AccessRequests/AssumeStartTime/timeOptions.tsx
index 1ddb66f12e4a8..ab0bd3426f04b 100644
--- a/web/packages/shared/components/AccessRequests/AssumeStartTime/timeOptions.tsx
+++ b/web/packages/shared/components/AccessRequests/AssumeStartTime/timeOptions.tsx
@@ -19,7 +19,6 @@
 import { addDays, isSameDay } from 'date-fns';
 
 import { dateTimeShortFormat } from 'design/datetime';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import { TimeOption } from '../Shared/types';
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/CheckableOption.tsx b/web/packages/shared/components/AccessRequests/NewRequest/CheckableOption.tsx
index 46b29b8333b26..2ad4fa9532c15 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/CheckableOption.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/CheckableOption.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, Text } from 'design';
 import { components, OptionProps } from 'react-select';
 
+import { Flex, Text } from 'design';
 import { Option as BaseOption } from 'shared/components/Select';
 
 export type Option = BaseOption & {
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/AdditionalOptions.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/AdditionalOptions.tsx
index 2d6f89e019c02..466ad13ad8106 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/AdditionalOptions.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/AdditionalOptions.tsx
@@ -17,13 +17,11 @@
  */
 
 import { useState } from 'react';
-import { Flex, Text, ButtonIcon, Box, LabelInput } from 'design';
-import * as Icon from 'design/Icon';
 
+import { Box, ButtonIcon, Flex, LabelInput, Text } from 'design';
+import * as Icon from 'design/Icon';
 import { IconTooltip } from 'design/Tooltip';
-
 import Select, { Option } from 'shared/components/Select';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import { getFormattedDurationTxt } from '../../Shared/utils';
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/CrossIcon.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/CrossIcon.tsx
index c65c54bf5d2d9..21ddb3da3bbbc 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/CrossIcon.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/CrossIcon.tsx
@@ -17,7 +17,6 @@
  */
 
 import { Cross } from 'design/Icon';
-
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
 export function CrossIcon<T>({
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/KubeNamespaceSelector.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/KubeNamespaceSelector.tsx
index 7fa953ace8dd4..d497bb6d77740 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/KubeNamespaceSelector.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/KubeNamespaceSelector.tsx
@@ -17,16 +17,15 @@
  */
 
 import { useState } from 'react';
-import styled from 'styled-components';
-import { Box } from 'design';
 import { ActionMeta } from 'react-select';
+import styled from 'styled-components';
 
-import { Option } from 'shared/components/Select';
+import { Box } from 'design';
 import { FieldSelectAsync } from 'shared/components/FieldSelect';
+import { Option } from 'shared/components/Select';
 
 import { CheckableOptionComponent } from '../CheckableOption';
-
-import { PendingListItem, PendingKubeResourceItem } from './RequestCheckout';
+import { PendingKubeResourceItem, PendingListItem } from './RequestCheckout';
 
 export function KubeNamespaceSelector({
   kubeClusterItem,
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx
index 55ef62d05b61a..5af448f441c3c 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.story.tsx
@@ -17,15 +17,13 @@
  */
 
 import { useState } from 'react';
-import { MemoryRouter, Link } from 'react-router-dom';
+import { Link, MemoryRouter } from 'react-router-dom';
 
 import { Box, ButtonPrimary, ButtonText } from 'design';
-
 import { Option } from 'shared/components/Select';
 
 import { dryRunResponse } from '../../fixtures';
 import { useSpecifiableFields } from '../useSpecifiableFields';
-
 import {
   RequestCheckoutWithSlider,
   RequestCheckoutWithSliderProps,
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.test.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.test.tsx
index 23599a83f6964..da3b4e2467785 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.test.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.test.tsx
@@ -16,13 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent, fireEvent } from 'design/utils/testing';
-
+import { fireEvent, render, screen, userEvent } from 'design/utils/testing';
 import { RequestState } from 'shared/services/accessRequests';
 
 import { dryRunResponse } from '../../fixtures';
 import { useSpecifiableFields } from '../useSpecifiableFields';
-
 import {
   RequestCheckoutWithSlider as RequestCheckoutComp,
   RequestCheckoutWithSliderProps,
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx
index 6f13bb99657d4..3fc6a366e1f09 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/RequestCheckout.tsx
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { forwardRef, useRef, useState, useEffect } from 'react';
+import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import type { TransitionStatus } from 'react-transition-group';
 import styled from 'styled-components';
+
 import {
   Alert,
   Box,
@@ -25,48 +27,43 @@ import {
   ButtonIcon,
   ButtonPrimary,
   ButtonSecondary,
+  Link as ExternalLink,
   Flex,
   H2,
   Image,
   Indicator,
   LabelInput,
-  Link as ExternalLink,
   P3,
   Subtitle2,
   Text,
 } from 'design';
-import { ArrowBack, ChevronDown, ChevronRight, Warning } from 'design/Icon';
-import Table, { Cell } from 'design/DataTable';
 import { Danger } from 'design/Alert';
-
+import Table, { Cell } from 'design/DataTable';
+import { ArrowBack, ChevronDown, ChevronRight, Warning } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
-
+import { RequestableResourceKind } from 'shared/components/AccessRequests/NewRequest/resource';
+import { FieldCheckbox } from 'shared/components/FieldCheckbox';
+import { Option } from 'shared/components/Select';
+import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
 import Validation, { useRule, Validator } from 'shared/components/Validation';
 import { Attempt } from 'shared/hooks/useAttemptNext';
-import { pluralize } from 'shared/utils/text';
-import { Option } from 'shared/components/Select';
-import { FieldCheckbox } from 'shared/components/FieldCheckbox';
 import { mergeRefs } from 'shared/libs/mergeRefs';
-import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
-import { RequestableResourceKind } from 'shared/components/AccessRequests/NewRequest/resource';
+import type { AccessRequest } from 'shared/services/accessRequests';
+import { pluralize } from 'shared/utils/text';
 
-import { CreateRequest } from '../../Shared/types';
-import { AssumeStartTime } from '../../AssumeStartTime/AssumeStartTime';
 import { AccessDurationRequest } from '../../AccessDuration';
+import { AssumeStartTime } from '../../AssumeStartTime/AssumeStartTime';
+import { CreateRequest } from '../../Shared/types';
 import {
   checkSupportForKubeResources,
   isKubeClusterWithNamespaces,
 } from '../kube';
-
-import { ReviewerOption } from './types';
-import shieldCheck from './shield-check.png';
-import { SelectReviewers } from './SelectReviewers';
 import { AdditionalOptions } from './AdditionalOptions';
-import { KubeNamespaceSelector } from './KubeNamespaceSelector';
 import { CrossIcon } from './CrossIcon';
-
-import type { TransitionStatus } from 'react-transition-group';
-import type { AccessRequest } from 'shared/services/accessRequests';
+import { KubeNamespaceSelector } from './KubeNamespaceSelector';
+import { SelectReviewers } from './SelectReviewers';
+import shieldCheck from './shield-check.png';
+import { ReviewerOption } from './types';
 
 export const RequestCheckoutWithSlider = forwardRef<
   HTMLDivElement,
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/SelectReviewers.tsx b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/SelectReviewers.tsx
index b1ea398954d48..544218d4ba735 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/SelectReviewers.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/SelectReviewers.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { components } from 'react-select';
 import ReactSelectCreatable from 'react-select/creatable';
 import styled from 'styled-components';
-import { ButtonBorder, Box, Text, Flex, ButtonIcon } from 'design';
+
+import { Box, ButtonBorder, ButtonIcon, Flex, Text } from 'design';
 import * as Icon from 'design/Icon';
 
 import { ReviewerOption } from './types';
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/utils.ts b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/utils.ts
index 226813ca9356c..09a30db233abb 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/utils.ts
+++ b/web/packages/shared/components/AccessRequests/NewRequest/RequestCheckout/utils.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { addHours, addDays, isAfter } from 'date-fns';
+import { addDays, addHours, isAfter } from 'date-fns';
 
 import { Option } from 'shared/components/Select';
 
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.test.tsx b/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.test.tsx
index a49da62b82ed4..c1d9aea0dfe12 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.test.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.test.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { within, screen } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
+
 import { render } from 'design/utils/testing';
 
 import { Roles } from './Roles';
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.tsx b/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.tsx
index 69b56fda3ce93..de1b6ef4b3e8b 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.tsx
+++ b/web/packages/shared/components/AccessRequests/NewRequest/Roles/Roles.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonBorder, ButtonPrimary } from 'design/Button';
 import Table, { Cell } from 'design/DataTable';
-import { ButtonPrimary, ButtonBorder } from 'design/Button';
 
 export function Roles(props: {
   requestable: string[];
diff --git a/web/packages/shared/components/AccessRequests/NewRequest/useSpecifiableFields.ts b/web/packages/shared/components/AccessRequests/NewRequest/useSpecifiableFields.ts
index 3f7f7d6edd826..3be43d7f8b949 100644
--- a/web/packages/shared/components/AccessRequests/NewRequest/useSpecifiableFields.ts
+++ b/web/packages/shared/components/AccessRequests/NewRequest/useSpecifiableFields.ts
@@ -18,11 +18,11 @@
 
 import { useState } from 'react';
 
-import { Option } from 'shared/components/Select';
 import {
   getPendingRequestDurationOptions,
   ReviewerOption,
 } from 'shared/components/AccessRequests/NewRequest';
+import { Option } from 'shared/components/Select';
 import { AccessRequest } from 'shared/services/accessRequests';
 
 import {
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestList/RequestList.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestList/RequestList.tsx
index 8899db5256f33..3d892c2954ece 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestList/RequestList.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestList/RequestList.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, LabelState, Flex } from 'design';
+import { Flex, LabelState, Text } from 'design';
 import { Cell } from 'design/DataTable';
 import { ArrowFatLinesUp } from 'design/Icon';
 import { LabelKind } from 'design/LabelState/LabelState';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 export const renderUserCell = ({ user }: AccessRequest) => {
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.story.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.story.tsx
index 2e947ab2b8dfd..e34c11846c358 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.story.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.story.tsx
@@ -18,8 +18,8 @@
 
 import {
   makeEmptyAttempt,
-  makeProcessingAttempt,
   makeErrorAttempt,
+  makeProcessingAttempt,
 } from 'shared/hooks/useAsync';
 
 import { RequestDelete } from './RequestDelete';
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.tsx
index 8870401c429c6..d79fd4d33cfa3 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestDelete/RequestDelete.tsx
@@ -16,23 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonWarning, ButtonSecondary, Flex, Alert } from 'design';
-import TextSelectCopy from 'teleport/components/TextSelectCopy';
-
+import { Alert, ButtonSecondary, ButtonWarning, Flex } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
-
 import { P } from 'design/Text/Text';
-
 import { Attempt } from 'shared/hooks/useAsync';
+import type { RequestState } from 'shared/services/accessRequests';
 
-import RolesRequested from '../RolesRequested';
+import TextSelectCopy from 'teleport/components/TextSelectCopy';
 
-import type { RequestState } from 'shared/services/accessRequests';
+import RolesRequested from '../RolesRequested';
 
 export interface RequestDeleteProps {
   requestId: string;
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.story.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.story.tsx
index f755aa1106e31..f8c0d260a8c42 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.story.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.story.tsx
@@ -17,14 +17,13 @@
  */
 
 import {
-  makeSuccessAttempt,
   makeEmptyAttempt,
-  makeProcessingAttempt,
   makeErrorAttempt,
+  makeProcessingAttempt,
+  makeSuccessAttempt,
 } from 'shared/hooks/useAsync';
 
 import { requestRolePending } from '../../../fixtures';
-
 import RequestReview, { RequestReviewProps } from './RequestReview';
 
 export default {
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.tsx
index c21e4295c3afc..1c89ab35669ae 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestReview/RequestReview.tsx
@@ -18,25 +18,22 @@
 
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { ButtonPrimary, Text, Box, Alert, Flex, Label, H3 } from 'design';
+
+import { Alert, Box, ButtonPrimary, Flex, H3, Label, Text } from 'design';
 import { Warning } from 'design/Icon';
 import { Radio } from 'design/RadioGroup';
-
 import { HoverTooltip } from 'design/Tooltip';
-
-import Validation, { Validator } from 'shared/components/Validation';
 import { FieldSelect } from 'shared/components/FieldSelect';
+import { FieldTextArea } from 'shared/components/FieldTextArea';
 import { Option } from 'shared/components/Select';
-import { Attempt } from 'shared/hooks/useAsync';
+import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import { FieldTextArea } from 'shared/components/FieldTextArea';
-
+import { Attempt } from 'shared/hooks/useAsync';
 import { AccessRequest, RequestState } from 'shared/services/accessRequests';
 
-import { AssumeStartTime } from '../../../AssumeStartTime/AssumeStartTime';
 import { AccessDurationReview } from '../../../AccessDuration';
-
-import { SuggestedAccessList, SubmitReview } from '../types';
+import { AssumeStartTime } from '../../../AssumeStartTime/AssumeStartTime';
+import { SubmitReview, SuggestedAccessList } from '../types';
 
 type ReviewStateOption = Option<RequestState, React.ReactElement> & {
   disabled?: boolean;
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.story.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.story.tsx
index 3feab1d9a952c..8462704cb6a74 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.story.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.story.tsx
@@ -17,22 +17,21 @@
  */
 
 import {
-  makeSuccessAttempt,
   makeEmptyAttempt,
-  makeProcessingAttempt,
   makeErrorAttempt,
+  makeProcessingAttempt,
+  makeSuccessAttempt,
 } from 'shared/hooks/useAsync';
 
 import {
   requestRoleApproved,
+  requestRoleApprovedWithStartTime,
   requestRoleDenied,
-  requestRolePending,
-  requestSearchPending,
   requestRoleEmpty,
+  requestRolePending,
   requestRolePromoted,
-  requestRoleApprovedWithStartTime,
+  requestSearchPending,
 } from '../../fixtures';
-
 import { RequestView, RequestViewProps } from './RequestView';
 import { RequestFlags, SuggestedAccessList } from './types';
 
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.test.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.test.tsx
index 1ee774c4d75ae..ce950454b44c9 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.test.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.test.tsx
@@ -17,11 +17,9 @@
  */
 
 import { render, screen } from 'design/utils/testing';
-
 import { makeEmptyAttempt, makeSuccessAttempt } from 'shared/hooks/useAsync';
 
 import { requestRolePending } from '../../fixtures';
-
 import { RequestView, RequestViewProps } from './RequestView';
 import { RequestFlags } from './types';
 
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.tsx b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.tsx
index e6655f64668ac..7e8435e819e29 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.tsx
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/RequestView.tsx
@@ -18,60 +18,54 @@
 
 import { Fragment } from 'react';
 import styled from 'styled-components';
+
 import {
   Alert,
   Box,
   ButtonBorder,
   ButtonPrimary,
   Flex,
+  H3,
   Indicator,
+  Label,
   LabelState,
   Text,
-  Label,
-  H3,
 } from 'design';
+import Table from 'design/DataTable';
+import { displayDateWithPrefixedTime } from 'design/datetime';
 import {
+  ArrowFatLinesUp,
   ChevronCircleDown,
   CircleCheck,
   CircleCross,
-  ArrowFatLinesUp,
 } from 'design/Icon';
-import { TeleportGearIcon } from 'design/SVGIcon';
-import Table from 'design/DataTable';
-import { displayDateWithPrefixedTime } from 'design/datetime';
-
 import { LabelKind } from 'design/LabelState/LabelState';
-
+import { TeleportGearIcon } from 'design/SVGIcon';
 import { HoverTooltip } from 'design/Tooltip';
-
-import { hasFinished, Attempt } from 'shared/hooks/useAsync';
-
+import { Attempt, hasFinished } from 'shared/hooks/useAsync';
 import {
-  canAssumeNow,
+  AccessRequest,
   AccessRequestReview,
   AccessRequestReviewer,
+  canAssumeNow,
   RequestState,
   Resource,
-  AccessRequest,
 } from 'shared/services/accessRequests';
 
+import type {
+  RequestFlags,
+  SubmitReview,
+} from '../../ReviewRequests/RequestView/types';
 import {
-  PromotedMessage,
   getAssumeStartTimeTooltipText,
+  PromotedMessage,
 } from '../../Shared/Shared';
 import { getFormattedDurationTxt } from '../../Shared/utils';
-
 import { formattedName } from '../formattedName';
-
+import { RequestDelete } from './RequestDelete';
 import RequestReview from './RequestReview';
 import RolesRequested from './RolesRequested';
 import { SuggestedAccessList } from './types';
-import { RequestDelete } from './RequestDelete';
-
-import type {
-  RequestFlags,
-  SubmitReview,
-} from '../../ReviewRequests/RequestView/types';
 
 export interface RequestViewProps {
   user: string;
diff --git a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/types.ts b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/types.ts
index 5a016cec9a723..2fc16e1b307c8 100644
--- a/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/types.ts
+++ b/web/packages/shared/components/AccessRequests/ReviewRequests/RequestView/types.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AllUserTraits } from 'teleport/services/user';
-
 import { RequestState } from 'shared/services/accessRequests';
 
+import { AllUserTraits } from 'teleport/services/user';
+
 export type RequestFlags = {
   /** Describes request is own request and request is approved */
   canAssume: boolean;
diff --git a/web/packages/shared/components/AccessRequests/Shared/Shared.tsx b/web/packages/shared/components/AccessRequests/Shared/Shared.tsx
index eb8b9ef0bf86a..e6b86a18834e6 100644
--- a/web/packages/shared/components/AccessRequests/Shared/Shared.tsx
+++ b/web/packages/shared/components/AccessRequests/Shared/Shared.tsx
@@ -17,12 +17,11 @@
  */
 
 import { useState } from 'react';
-import { ButtonPrimary, Text, Box, ButtonIcon, Menu } from 'design';
-import { Info } from 'design/Icon';
-import { displayDateWithPrefixedTime } from 'design/datetime';
 
+import { Box, ButtonIcon, ButtonPrimary, Menu, Text } from 'design';
+import { displayDateWithPrefixedTime } from 'design/datetime';
+import { Info } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
-
 import { AccessRequest } from 'shared/services/accessRequests';
 
 export function PromotedMessage({
diff --git a/web/packages/shared/components/AdvancedSearchToggle/AdvancedSearchToggle.tsx b/web/packages/shared/components/AdvancedSearchToggle/AdvancedSearchToggle.tsx
index 36a607dbbc5ea..cf5dff34f5d84 100644
--- a/web/packages/shared/components/AdvancedSearchToggle/AdvancedSearchToggle.tsx
+++ b/web/packages/shared/components/AdvancedSearchToggle/AdvancedSearchToggle.tsx
@@ -16,10 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Toggle, Link, Flex, H2 } from 'design';
-
+import { Flex, H2, Link, Text, Toggle } from 'design';
 import { P } from 'design/Text/Text';
-
 import { IconTooltip } from 'design/Tooltip';
 
 const GUIDE_URL =
diff --git a/web/packages/shared/components/AnimatedTerminal/AnimatedTerminal.tsx b/web/packages/shared/components/AnimatedTerminal/AnimatedTerminal.tsx
index 3a320d93dc248..dda1fbc22a7e7 100644
--- a/web/packages/shared/components/AnimatedTerminal/AnimatedTerminal.tsx
+++ b/web/packages/shared/components/AnimatedTerminal/AnimatedTerminal.tsx
@@ -23,7 +23,6 @@ import {
   SelectedLines,
   TerminalContent,
 } from 'shared/components/AnimatedTerminal/TerminalContent';
-
 import { Window } from 'shared/components/Window';
 
 import { BufferEntry, createTerminalContent, TerminalLine } from './content';
diff --git a/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.story.tsx b/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.story.tsx
index e66eeddd95c77..25d825a56f205 100644
--- a/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.story.tsx
+++ b/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.story.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { getPlatform } from 'design/platform';
 import { MemoryRouter } from 'react-router';
 
-import { getConnectDownloadLinks } from '../DownloadConnect/DownloadConnect';
+import { getPlatform } from 'design/platform';
 
+import { getConnectDownloadLinks } from '../DownloadConnect/DownloadConnect';
 import { DeviceTrustConnectPassthrough } from './AuthorizeDeviceWeb';
 
 export default {
diff --git a/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.tsx b/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.tsx
index 3a17a0141392b..753f8d8f34bcf 100644
--- a/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.tsx
+++ b/web/packages/shared/components/AuthorizeDeviceWeb/AuthorizeDeviceWeb.tsx
@@ -17,23 +17,23 @@
  */
 
 import { useEffect } from 'react';
-import styled from 'styled-components';
-import { Box, Flex, ButtonPrimary, Text, ButtonLink } from 'design';
+import { useLocation, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
-import { useParams, useLocation } from 'react-router';
+import styled from 'styled-components';
 
-import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
+import { Box, ButtonLink, ButtonPrimary, Flex, Text } from 'design';
 import { getPlatform } from 'design/platform';
-import history from 'teleport/services/history/history';
-
 import {
   DownloadConnect,
   DownloadLink,
   getConnectDownloadLinks,
 } from 'shared/components/DownloadConnect/DownloadConnect';
-import { processRedirectUri } from 'shared/redirects';
 import { makeDeepLinkWithSafeInput } from 'shared/deepLinks';
+import { processRedirectUri } from 'shared/redirects';
+
+import cfg from 'teleport/config';
+import history from 'teleport/services/history/history';
+import useTeleport from 'teleport/useTeleport';
 
 export const PassthroughPage = () => {
   const ctx = useTeleport();
diff --git a/web/packages/shared/components/AwsLaunchButton/AwsLaunchButton.tsx b/web/packages/shared/components/AwsLaunchButton/AwsLaunchButton.tsx
index c49eacbca3850..b9ba9def28ab8 100644
--- a/web/packages/shared/components/AwsLaunchButton/AwsLaunchButton.tsx
+++ b/web/packages/shared/components/AwsLaunchButton/AwsLaunchButton.tsx
@@ -18,11 +18,11 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { space, SpaceProps } from 'design/system';
-import { ButtonBorder, Flex, Text, Box } from 'design';
-import Menu, { MenuItem } from 'design/Menu';
-import { ChevronDown } from 'design/Icon';
 
+import { Box, ButtonBorder, Flex, Text } from 'design';
+import { ChevronDown } from 'design/Icon';
+import Menu, { MenuItem } from 'design/Menu';
+import { space, SpaceProps } from 'design/system';
 import { AwsRole } from 'shared/services/apps';
 
 export class AwsLaunchButton extends React.Component<Props> {
diff --git a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.story.tsx b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.story.tsx
index f9a29546dcaeb..2966ca354cb65 100644
--- a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.story.tsx
+++ b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.story.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
 import { Box } from 'design';
 
 import { ButtonFileUpload as ButtonFileUploadComponent } from './ButtonFileUpload';
diff --git a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.test.tsx b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.test.tsx
index 1c452417a2439..67f00c363454a 100644
--- a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.test.tsx
+++ b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { ButtonFileUpload } from './ButtonFileUpload';
 
diff --git a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.tsx b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.tsx
index cf741cfc07bb4..71b7a24e7f6cd 100644
--- a/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.tsx
+++ b/web/packages/shared/components/ButtonFileUpload/ButtonFileUpload.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
-import { Upload } from 'design/Icon';
-import { ButtonBorder, Flex, LabelInput } from 'design';
 
+import { ButtonBorder, Flex, LabelInput } from 'design';
 import type { ButtonSize } from 'design/Button';
+import { Upload } from 'design/Icon';
 import type { IconSize } from 'design/Icon/Icon';
 
 /**
diff --git a/web/packages/shared/components/ButtonSso/ButtonSso.tsx b/web/packages/shared/components/ButtonSso/ButtonSso.tsx
index 349128a9a1c95..d6deb8b9ba14f 100644
--- a/web/packages/shared/components/ButtonSso/ButtonSso.tsx
+++ b/web/packages/shared/components/ButtonSso/ButtonSso.tsx
@@ -17,12 +17,10 @@
  */
 
 import { forwardRef } from 'react';
-import * as Icons from 'design/Icon';
 
 import { ButtonProps, ButtonSecondary } from 'design/Button';
-
+import * as Icons from 'design/Icon';
 import { ResourceIcon } from 'design/ResourceIcon';
-
 import { AuthProviderType, SSOType } from 'shared/services';
 
 const ButtonSso = forwardRef<HTMLButtonElement, Props>((props: Props, ref) => {
diff --git a/web/packages/shared/components/ButtonSso/index.ts b/web/packages/shared/components/ButtonSso/index.ts
index 87363a3dc5d6e..1f2c073bf5da8 100644
--- a/web/packages/shared/components/ButtonSso/index.ts
+++ b/web/packages/shared/components/ButtonSso/index.ts
@@ -17,5 +17,6 @@
  */
 
 import ButtonSso, { guessProviderType } from './ButtonSso';
+
 export default ButtonSso;
 export { guessProviderType };
diff --git a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.story.tsx b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.story.tsx
index 6036e570303b3..b9d0a8fff56fc 100644
--- a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.story.tsx
+++ b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useState } from 'react';
+
 import Flex from 'design/Flex';
 
 import { ButtonTextWithAddIcon } from './ButtonTextWithAddIcon';
diff --git a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.test.tsx b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.test.tsx
index 06d24ef84b182..60bdede4a7f0a 100644
--- a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.test.tsx
+++ b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { ButtonTextWithAddIcon } from './ButtonTextWithAddIcon';
 
diff --git a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.tsx b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.tsx
index e33a9849b37b4..13adb4bee6115 100644
--- a/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.tsx
+++ b/web/packages/shared/components/ButtonTextWithAddIcon/ButtonTextWithAddIcon.tsx
@@ -18,7 +18,6 @@
 
 import { ButtonText } from 'design';
 import { Add as AddIcon } from 'design/Icon';
-
 import type { IconSize } from 'design/Icon/Icon';
 
 export const ButtonTextWithAddIcon = ({
diff --git a/web/packages/shared/components/ClusterDropdown/ClusterDropdown.story.tsx b/web/packages/shared/components/ClusterDropdown/ClusterDropdown.story.tsx
index b982926874c1d..ede049be3f050 100644
--- a/web/packages/shared/components/ClusterDropdown/ClusterDropdown.story.tsx
+++ b/web/packages/shared/components/ClusterDropdown/ClusterDropdown.story.tsx
@@ -18,10 +18,11 @@
 
 import { MemoryRouter } from 'react-router';
 
-import { Cluster } from 'teleport/services/clusters';
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { Box, Text } from 'design';
+
 import { ContextProvider } from 'teleport/index';
-import { Text, Box } from 'design';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import { Cluster } from 'teleport/services/clusters';
 
 import { ClusterDropdown } from './ClusterDropdown';
 
diff --git a/web/packages/shared/components/ClusterDropdown/ClusterDropdown.tsx b/web/packages/shared/components/ClusterDropdown/ClusterDropdown.tsx
index 60846510fe90d..0c63b1f499e68 100644
--- a/web/packages/shared/components/ClusterDropdown/ClusterDropdown.tsx
+++ b/web/packages/shared/components/ClusterDropdown/ClusterDropdown.tsx
@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
-import styled from 'styled-components';
+import React, { useEffect, useState } from 'react';
 import { useHistory } from 'react-router';
+import styled from 'styled-components';
+
 import { Box, ButtonSecondary, Flex, Menu, MenuItem, Text } from 'design';
 import { ChevronDown } from 'design/Icon';
+import { HoverTooltip } from 'design/Tooltip';
+
 import cfg from 'teleport/config';
 import { Cluster } from 'teleport/services/clusters';
 
-import { HoverTooltip } from 'design/Tooltip';
-
 export interface ClusterDropdownProps {
   clusterLoader: ClusterLoader;
   clusterId: string;
diff --git a/web/packages/shared/components/Controls/MultiselectMenu.story.tsx b/web/packages/shared/components/Controls/MultiselectMenu.story.tsx
index 3016d892c64a5..d1d9d7f320fcb 100644
--- a/web/packages/shared/components/Controls/MultiselectMenu.story.tsx
+++ b/web/packages/shared/components/Controls/MultiselectMenu.story.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { Meta, StoryFn, StoryObj } from '@storybook/react';
 import React, { useState } from 'react';
+
 import { Flex } from 'design';
 
 import { MultiselectMenu } from './MultiselectMenu';
 
-import type { Meta, StoryFn, StoryObj } from '@storybook/react';
-
 type OptionValue = `option-${number}`;
 
 const options: {
diff --git a/web/packages/shared/components/Controls/MultiselectMenu.tsx b/web/packages/shared/components/Controls/MultiselectMenu.tsx
index f252cf7aa21be..473e10db5f688 100644
--- a/web/packages/shared/components/Controls/MultiselectMenu.tsx
+++ b/web/packages/shared/components/Controls/MultiselectMenu.tsx
@@ -18,6 +18,7 @@
 
 import React, { ReactNode, useState } from 'react';
 import styled from 'styled-components';
+
 import {
   ButtonPrimary,
   ButtonSecondary,
@@ -26,9 +27,8 @@ import {
   MenuItem,
   Text,
 } from 'design';
-import { ChevronDown } from 'design/Icon';
 import { CheckboxInput } from 'design/Checkbox';
-
+import { ChevronDown } from 'design/Icon';
 import { HoverTooltip } from 'shared/components/ToolTip';
 
 type MultiselectMenuProps<T> = {
diff --git a/web/packages/shared/components/Controls/SortMenu.story.tsx b/web/packages/shared/components/Controls/SortMenu.story.tsx
index 56158b8a8d228..f304ed00f7b3a 100644
--- a/web/packages/shared/components/Controls/SortMenu.story.tsx
+++ b/web/packages/shared/components/Controls/SortMenu.story.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { Meta, StoryFn, StoryObj } from '@storybook/react';
 import React, { useState } from 'react';
+
 import { Flex } from 'design';
 
 import { SortMenu } from './SortMenu';
 
-import type { Meta, StoryFn, StoryObj } from '@storybook/react';
-
 export default {
   title: 'Shared/Controls/SortMenu',
   component: SortMenu<any>,
diff --git a/web/packages/shared/components/Controls/SortMenu.tsx b/web/packages/shared/components/Controls/SortMenu.tsx
index d6bbc5cdf0d2d..e24c14c1a9e57 100644
--- a/web/packages/shared/components/Controls/SortMenu.tsx
+++ b/web/packages/shared/components/Controls/SortMenu.tsx
@@ -17,9 +17,9 @@
  */
 
 import React, { useState } from 'react';
+
 import { ButtonBorder, Flex, Menu, MenuItem } from 'design';
 import { ArrowDown, ArrowUp } from 'design/Icon';
-
 import { HoverTooltip } from 'shared/components/ToolTip';
 
 type SortMenuSort<T extends object> = {
diff --git a/web/packages/shared/components/Controls/ViewModeSwitch.story.tsx b/web/packages/shared/components/Controls/ViewModeSwitch.story.tsx
index adc77e1975715..0d84fd6798596 100644
--- a/web/packages/shared/components/Controls/ViewModeSwitch.story.tsx
+++ b/web/packages/shared/components/Controls/ViewModeSwitch.story.tsx
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { Meta, StoryFn, StoryObj } from '@storybook/react';
 import React, { useState } from 'react';
-import { Flex } from 'design';
 
+import { Flex } from 'design';
 import { ViewMode } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 
 import { ViewModeSwitch } from './ViewModeSwitch';
 
-import type { Meta, StoryFn, StoryObj } from '@storybook/react';
-
 export default {
   title: 'Shared/Controls/ViewModeSwitch',
   component: ViewModeSwitch,
diff --git a/web/packages/shared/components/Controls/ViewModeSwitch.tsx b/web/packages/shared/components/Controls/ViewModeSwitch.tsx
index 7997f2de29f66..7661d92db7d46 100644
--- a/web/packages/shared/components/Controls/ViewModeSwitch.tsx
+++ b/web/packages/shared/components/Controls/ViewModeSwitch.tsx
@@ -18,10 +18,9 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { Rows, SquaresFour } from 'design/Icon';
 
+import { Rows, SquaresFour } from 'design/Icon';
 import { ViewMode } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
 import { HoverTooltip } from 'shared/components/ToolTip';
 
 export const ViewModeSwitch = ({
diff --git a/web/packages/shared/components/DownloadConnect/DownloadConnect.tsx b/web/packages/shared/components/DownloadConnect/DownloadConnect.tsx
index bb32350f19b08..92b195e858a21 100644
--- a/web/packages/shared/components/DownloadConnect/DownloadConnect.tsx
+++ b/web/packages/shared/components/DownloadConnect/DownloadConnect.tsx
@@ -18,7 +18,6 @@
 
 import { ButtonSecondary } from 'design/Button';
 import { Platform } from 'design/platform';
-
 import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 
 export type DownloadLink = { text: string; url: string };
diff --git a/web/packages/shared/components/Editor/Editor.tsx b/web/packages/shared/components/Editor/Editor.tsx
index 455728dfd6b95..486940173cbb7 100644
--- a/web/packages/shared/components/Editor/Editor.tsx
+++ b/web/packages/shared/components/Editor/Editor.tsx
@@ -19,19 +19,18 @@
 import React, { useState } from 'react';
 import styled, { keyframes } from 'styled-components';
 
+import {
+  KeywordHighlight,
+  TerminalColor,
+} from 'shared/components/AnimatedTerminal/TerminalContent';
+import { Language } from 'shared/components/Editor/Language';
+import { Tabs } from 'shared/components/Editor/Tabs';
 import {
   WindowCode,
   WindowContainer,
   WindowContentContainer,
   WindowTitleBar,
 } from 'shared/components/Window';
-import { Tabs } from 'shared/components/Editor/Tabs';
-import { Language } from 'shared/components/Editor/Language';
-
-import {
-  KeywordHighlight,
-  TerminalColor,
-} from 'shared/components/AnimatedTerminal/TerminalContent';
 
 import { File, FileProps } from './File';
 
diff --git a/web/packages/shared/components/EmptyState/EmptyState.tsx b/web/packages/shared/components/EmptyState/EmptyState.tsx
index 802e81b23c25f..b95bd8819eab8 100644
--- a/web/packages/shared/components/EmptyState/EmptyState.tsx
+++ b/web/packages/shared/components/EmptyState/EmptyState.tsx
@@ -17,7 +17,8 @@
  */
 
 import styled from 'styled-components';
-import { Flex, Text, Box } from 'design';
+
+import { Box, Flex, Text } from 'design';
 
 export const FeatureContainer = styled(Flex)`
   @media (min-width: 1662px) {
diff --git a/web/packages/shared/components/FieldCheckbox/FieldCheckbox.test.tsx b/web/packages/shared/components/FieldCheckbox/FieldCheckbox.test.tsx
index 603db29bb0961..0f6ffad573b11 100644
--- a/web/packages/shared/components/FieldCheckbox/FieldCheckbox.test.tsx
+++ b/web/packages/shared/components/FieldCheckbox/FieldCheckbox.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import React, { useRef, useState } from 'react';
 
+import { render, screen, userEvent } from 'design/utils/testing';
+
 import { FieldCheckbox } from './FieldCheckbox';
 
 test('controlled flow', async () => {
diff --git a/web/packages/shared/components/FieldCheckbox/FieldCheckbox.tsx b/web/packages/shared/components/FieldCheckbox/FieldCheckbox.tsx
index 48532a015cd68..69b7e45ed0ea0 100644
--- a/web/packages/shared/components/FieldCheckbox/FieldCheckbox.tsx
+++ b/web/packages/shared/components/FieldCheckbox/FieldCheckbox.tsx
@@ -16,14 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { forwardRef } from 'react';
+import styled from 'styled-components';
+
 import Box from 'design/Box';
-import { CheckboxSize, CheckboxInput } from 'design/Checkbox';
+import { CheckboxInput, CheckboxSize } from 'design/Checkbox';
 import Flex from 'design/Flex';
 import LabelInput from 'design/LabelInput';
-import Text from 'design/Text';
 import { SpaceProps } from 'design/system';
-import React, { forwardRef } from 'react';
-import styled from 'styled-components';
+import Text from 'design/Text';
 
 interface FieldCheckboxProps extends SpaceProps {
   name?: string;
diff --git a/web/packages/shared/components/FieldInput/FieldInput.story.tsx b/web/packages/shared/components/FieldInput/FieldInput.story.tsx
index 8de1116cf6f31..fdb4cdfc3ca90 100644
--- a/web/packages/shared/components/FieldInput/FieldInput.story.tsx
+++ b/web/packages/shared/components/FieldInput/FieldInput.story.tsx
@@ -17,13 +17,10 @@
  */
 
 import { ButtonPrimary, Text } from 'design';
-
 import { EmailSolid } from 'design/Icon';
 
 import Validation from '../../components/Validation';
-
 import { requiredEmailLike, requiredField } from '../Validation/rules';
-
 import FieldInput from './FieldInput';
 
 export default {
diff --git a/web/packages/shared/components/FieldInput/FieldInput.test.tsx b/web/packages/shared/components/FieldInput/FieldInput.test.tsx
index 2440f5587659a..74990bbfa93c9 100644
--- a/web/packages/shared/components/FieldInput/FieldInput.test.tsx
+++ b/web/packages/shared/components/FieldInput/FieldInput.test.tsx
@@ -18,12 +18,10 @@
 
 import { screen } from '@testing-library/react';
 
-import { render, fireEvent } from 'design/utils/testing';
-
 import { darkTheme } from 'design/theme';
+import { fireEvent, render } from 'design/utils/testing';
 
 import * as useRule from '../Validation/useRule';
-
 import FieldInput from './FieldInput';
 
 test('valid values, autofocus, onChange, onKeyPress', () => {
diff --git a/web/packages/shared/components/FieldInput/FieldInput.tsx b/web/packages/shared/components/FieldInput/FieldInput.tsx
index 1ea08bf39ed8f..2ac28f54e810c 100644
--- a/web/packages/shared/components/FieldInput/FieldInput.tsx
+++ b/web/packages/shared/components/FieldInput/FieldInput.tsx
@@ -21,15 +21,13 @@ import React, {
   HTMLInputAutoCompleteAttribute,
   useId,
 } from 'react';
-import { Box, Input, LabelInput, Text } from 'design';
+import styled, { useTheme } from 'styled-components';
 
+import { Box, Input, LabelInput, Text } from 'design';
 import { BoxProps } from 'design/Box';
-import styled, { useTheme } from 'styled-components';
 import { IconProps } from 'design/Icon/Icon';
 import { InputMode, InputSize, InputType } from 'design/Input';
-
 import { IconTooltip } from 'design/Tooltip';
-
 import { useRule } from 'shared/components/Validation';
 
 const FieldInput = forwardRef<HTMLInputElement, FieldInputProps>(
diff --git a/web/packages/shared/components/FieldInput/index.ts b/web/packages/shared/components/FieldInput/index.ts
index c5b9e121d8882..9f0c8b4533f26 100644
--- a/web/packages/shared/components/FieldInput/index.ts
+++ b/web/packages/shared/components/FieldInput/index.ts
@@ -17,5 +17,6 @@
  */
 
 import FieldInput from './FieldInput';
+
 export default FieldInput;
 export type { FieldInputProps } from './FieldInput';
diff --git a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.story.tsx b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.story.tsx
index 565f1769ace84..04e23bdcee201 100644
--- a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.story.tsx
+++ b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.story.tsx
@@ -19,13 +19,10 @@
 import { useState } from 'react';
 
 import Box from 'design/Box';
-
 import { Button } from 'design/Button';
-
 import Validation from 'shared/components/Validation';
 
 import { arrayOf, requiredField } from '../Validation/rules';
-
 import { FieldMultiInput } from './FieldMultiInput';
 
 export default {
diff --git a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.test.tsx b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.test.tsx
index 4d10c34449f26..22ec3da74fda1 100644
--- a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.test.tsx
+++ b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.test.tsx
@@ -20,11 +20,9 @@ import userEvent from '@testing-library/user-event';
 import { useState } from 'react';
 
 import { act, render, screen } from 'design/utils/testing';
-
 import Validation, { Validator } from 'shared/components/Validation';
 
 import { arrayOf, requiredField } from '../Validation/rules';
-
 import { FieldMultiInput, FieldMultiInputProps } from './FieldMultiInput';
 
 const TestFieldMultiInput = ({
diff --git a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.tsx b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.tsx
index 48a12d403f313..edb22425f8c91 100644
--- a/web/packages/shared/components/FieldMultiInput/FieldMultiInput.tsx
+++ b/web/packages/shared/components/FieldMultiInput/FieldMultiInput.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { useRef } from 'react';
+import styled, { useTheme } from 'styled-components';
+
 import Box from 'design/Box';
 import { ButtonSecondary } from 'design/Button';
 import ButtonIcon from 'design/ButtonIcon';
 import Flex from 'design/Flex';
 import * as Icon from 'design/Icon';
-import { useRef } from 'react';
-import styled, { useTheme } from 'styled-components';
-
+import { useRule } from 'shared/components/Validation';
 import {
   precomputed,
   Rule,
   ValidationResult,
 } from 'shared/components/Validation/rules';
-import { useRule } from 'shared/components/Validation';
 
 import FieldInput from '../FieldInput';
 
diff --git a/web/packages/shared/components/FieldSelect/FieldSelect.story.tsx b/web/packages/shared/components/FieldSelect/FieldSelect.story.tsx
index dde0dc2b97dce..47f82f912d9b0 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelect.story.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelect.story.tsx
@@ -17,11 +17,11 @@
  */
 
 import { useState } from 'react';
-import { Flex } from 'design';
 
-import { wait } from 'shared/utils/wait';
-import Validation from 'shared/components/Validation';
+import { Flex } from 'design';
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
+import { wait } from 'shared/utils/wait';
 
 import { FieldSelect, FieldSelectAsync } from './FieldSelect';
 import {
diff --git a/web/packages/shared/components/FieldSelect/FieldSelect.test.tsx b/web/packages/shared/components/FieldSelect/FieldSelect.test.tsx
index 2c3f1cd829fbd..77c5cb906bd1f 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelect.test.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelect.test.tsx
@@ -17,15 +17,12 @@
  */
 
 import { screen } from '@testing-library/react';
-
-import { render, fireEvent } from 'design/utils/testing';
+import selectEvent from 'react-select-event';
 
 import { darkTheme } from 'design/theme';
-
-import selectEvent from 'react-select-event';
+import { fireEvent, render } from 'design/utils/testing';
 
 import useRule from '../Validation/useRule';
-
 import { FieldSelect, FieldSelectAsync } from './FieldSelect';
 
 jest.mock('../Validation/useRule');
diff --git a/web/packages/shared/components/FieldSelect/FieldSelect.tsx b/web/packages/shared/components/FieldSelect/FieldSelect.tsx
index 66007b24f18fc..a9790626652f6 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelect.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelect.tsx
@@ -21,12 +21,11 @@ import { GroupBase, OptionsOrGroups } from 'react-select';
 import { useAsync } from 'shared/hooks/useAsync';
 
 import Select, {
-  Props as SelectProps,
-  SelectAsync,
   AsyncProps as AsyncSelectProps,
   Option,
+  SelectAsync,
+  Props as SelectProps,
 } from '../Select';
-
 import {
   FieldProps,
   FieldSelectWrapper,
diff --git a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.story.tsx b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.story.tsx
index 4ecdc2cef9e65..4c5cf6d320f00 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.story.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.story.tsx
@@ -17,11 +17,11 @@
  */
 
 import { useState } from 'react';
-import { Flex } from 'design';
 
-import { wait } from 'shared/utils/wait';
-import Validation from 'shared/components/Validation';
+import { Flex } from 'design';
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
+import { wait } from 'shared/utils/wait';
 
 import {
   FieldSelectCreatable,
diff --git a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.test.tsx b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.test.tsx
index a2f013ad13254..8355976552ca2 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.test.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.test.tsx
@@ -17,13 +17,11 @@
  */
 
 import { screen } from '@testing-library/react';
+import selectEvent from 'react-select-event';
 
 import { render } from 'design/utils/testing';
 
-import selectEvent from 'react-select-event';
-
 import useRule from '../Validation/useRule';
-
 import { FieldSelectCreatableAsync } from './FieldSelectCreatable';
 
 jest.mock('../Validation/useRule');
diff --git a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.tsx b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.tsx
index 25cebbf4b0136..97c3e6766f878 100644
--- a/web/packages/shared/components/FieldSelect/FieldSelectCreatable.tsx
+++ b/web/packages/shared/components/FieldSelect/FieldSelectCreatable.tsx
@@ -17,11 +17,9 @@
  */
 
 import React from 'react';
-
 import { GroupBase, OnChangeValue } from 'react-select';
 
 import { BoxProps } from 'design/Box';
-
 import { useAsync } from 'shared/hooks/useAsync';
 
 import {
@@ -31,10 +29,12 @@ import {
   CreatableProps as SelectCreatableProps,
 } from '../Select';
 import { SelectCreatableAsync } from '../Select/Select';
-
-import { FieldProps, FieldSelectWrapper, splitSelectProps } from './shared';
-
-import { resolveUndefinedOptions } from './shared';
+import {
+  FieldProps,
+  FieldSelectWrapper,
+  resolveUndefinedOptions,
+  splitSelectProps,
+} from './shared';
 
 /**
  * Returns a styled SelectCreatable with label, input validation rule and error handling.
diff --git a/web/packages/shared/components/FieldSelect/index.ts b/web/packages/shared/components/FieldSelect/index.ts
index 8c03c141d32c8..284fced23c01b 100644
--- a/web/packages/shared/components/FieldSelect/index.ts
+++ b/web/packages/shared/components/FieldSelect/index.ts
@@ -17,6 +17,7 @@
  */
 
 import FieldSelect from './FieldSelect';
+
 export default FieldSelect;
 export { FieldSelect, FieldSelectAsync } from './FieldSelect';
 export { resolveUndefinedOptions } from './shared';
diff --git a/web/packages/shared/components/FieldSelect/shared.tsx b/web/packages/shared/components/FieldSelect/shared.tsx
index 35086cc5c3842..1d181486babe7 100644
--- a/web/packages/shared/components/FieldSelect/shared.tsx
+++ b/web/packages/shared/components/FieldSelect/shared.tsx
@@ -16,23 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { useId } from 'react';
 import { GroupBase, OnChangeValue, OptionsOrGroups } from 'react-select';
 
 import Box, { BoxProps } from 'design/Box';
-
-import React, { useId } from 'react';
-import LabelInput from 'design/LabelInput';
-
 import Flex from 'design/Flex';
-
+import LabelInput from 'design/LabelInput';
 import { IconTooltip } from 'design/Tooltip';
 
 import { HelperTextLine } from '../FieldInput/FieldInput';
-import { useRule } from '../Validation';
 import {
   AsyncProps as AsyncSelectProps,
   Props as SelectProps,
 } from '../Select';
+import { useRule } from '../Validation';
 
 export const defaultRule = () => () => ({ valid: true });
 
diff --git a/web/packages/shared/components/FieldTextArea/FieldTextArea.story.tsx b/web/packages/shared/components/FieldTextArea/FieldTextArea.story.tsx
index ac63d6eee4373..51746333a3f32 100644
--- a/web/packages/shared/components/FieldTextArea/FieldTextArea.story.tsx
+++ b/web/packages/shared/components/FieldTextArea/FieldTextArea.story.tsx
@@ -19,9 +19,7 @@
 import { ButtonPrimary, Text } from 'design';
 
 import Validation from '../../components/Validation';
-
 import { requiredField } from '../Validation/rules';
-
 import { FieldTextArea } from './FieldTextArea';
 
 export default {
diff --git a/web/packages/shared/components/FieldTextArea/FieldTextArea.tsx b/web/packages/shared/components/FieldTextArea/FieldTextArea.tsx
index c8bd7a1e0439d..a6a457c62a99d 100644
--- a/web/packages/shared/components/FieldTextArea/FieldTextArea.tsx
+++ b/web/packages/shared/components/FieldTextArea/FieldTextArea.tsx
@@ -21,14 +21,11 @@ import React, {
   HTMLInputAutoCompleteAttribute,
   useId,
 } from 'react';
-import { Box, LabelInput, TextArea } from 'design';
-
-import { TextAreaSize } from 'design/TextArea';
 
+import { Box, LabelInput, TextArea } from 'design';
 import { BoxProps } from 'design/Box';
-
+import { TextAreaSize } from 'design/TextArea';
 import { IconTooltip } from 'design/Tooltip';
-
 import { useRule } from 'shared/components/Validation';
 
 import { HelperTextLine } from '../FieldInput/FieldInput';
diff --git a/web/packages/shared/components/FileTransfer/FileTransfer.test.tsx b/web/packages/shared/components/FileTransfer/FileTransfer.test.tsx
index fbc7caaed47a4..aa75ecaabc522 100644
--- a/web/packages/shared/components/FileTransfer/FileTransfer.test.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransfer.test.tsx
@@ -24,10 +24,10 @@ import {
   waitForElementToBeRemoved,
 } from 'design/utils/testing';
 
+import { createFileTransferEventsEmitter } from './createFileTransferEventsEmitter';
 import { FileTransfer, TransferHandlers } from './FileTransfer';
 import { FileTransferContextProvider } from './FileTransferContextProvider';
 import { FileTransferDialogDirection } from './FileTransferStateless';
-import { createFileTransferEventsEmitter } from './createFileTransferEventsEmitter';
 
 function FileTransferTestWrapper(props: {
   beforeClose?: () => boolean | Promise<boolean>;
diff --git a/web/packages/shared/components/FileTransfer/FileTransfer.tsx b/web/packages/shared/components/FileTransfer/FileTransfer.tsx
index 72d88a8dcc0fc..8034e3ea05be8 100644
--- a/web/packages/shared/components/FileTransfer/FileTransfer.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransfer.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { FileTransferContainer } from './FileTransferContainer';
 import { useFileTransferContext } from './FileTransferContextProvider';
 import {
   FileTransferDialogDirection,
   FileTransferListeners,
   FileTransferStateless,
 } from './FileTransferStateless';
-import { FileTransferContainer } from './FileTransferContainer';
 
 interface FileTransferProps {
   transferHandlers: TransferHandlers;
diff --git a/web/packages/shared/components/FileTransfer/FileTransferActionBar.tsx b/web/packages/shared/components/FileTransfer/FileTransferActionBar.tsx
index ccb61201fca83..c7fbfaa761e53 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferActionBar.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferActionBar.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, ButtonIcon, Text } from 'design';
+import { ButtonIcon, Flex, Text } from 'design';
 import * as Icons from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
 
diff --git a/web/packages/shared/components/FileTransfer/FileTransferContextProvider.tsx b/web/packages/shared/components/FileTransfer/FileTransferContextProvider.tsx
index bf804472cc17d..10d1155cc8c39 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferContextProvider.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferContextProvider.tsx
@@ -17,11 +17,11 @@
  */
 
 import {
-  useContext,
-  useState,
-  FC,
   createContext,
+  FC,
   PropsWithChildren,
+  useContext,
+  useState,
 } from 'react';
 
 import { FileTransferDialogDirection } from './FileTransferStateless';
diff --git a/web/packages/shared/components/FileTransfer/FileTransferRequests.story.tsx b/web/packages/shared/components/FileTransfer/FileTransferRequests.story.tsx
index d36e79d7ea9f0..ef8fa6073c117 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferRequests.story.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferRequests.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import ConsoleContextProvider from 'teleport/Console/consoleContextProvider';
 import ConsoleContext from 'teleport/Console/consoleContext';
+import ConsoleContextProvider from 'teleport/Console/consoleContextProvider';
 import { FileTransferRequest } from 'teleport/Console/DocumentSsh/useFileTransfer';
 
 import { FileTransferRequests } from './';
diff --git a/web/packages/shared/components/FileTransfer/FileTransferRequests.tsx b/web/packages/shared/components/FileTransfer/FileTransferRequests.tsx
index e526e7c945c44..999519915a689 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferRequests.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferRequests.tsx
@@ -17,13 +17,15 @@
  */
 
 import styled from 'styled-components';
-import { ButtonBorder, Box, Flex, Text, Button } from 'design';
+
+import { Box, Button, ButtonBorder, Flex, Text } from 'design';
 import * as Icons from 'design/Icon';
+
+import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
 import {
   FileTransferRequest,
   isOwnRequest,
 } from 'teleport/Console/DocumentSsh/useFileTransfer';
-import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
 import { UserContext } from 'teleport/services/user';
 
 type FileTransferRequestsProps = {
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/CommonElements.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/CommonElements.tsx
index e42788caf4994..cc0961cc8ebab 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/CommonElements.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/CommonElements.tsx
@@ -20,8 +20,8 @@ import React, { forwardRef } from 'react';
 import styled from 'styled-components';
 
 import FieldInput, { FieldInputProps } from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import Validation from 'shared/components/Validation';
+import { requiredField } from 'shared/components/Validation/rules';
 
 export const Form = styled.form.attrs(() => ({
   'aria-label': 'form',
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/DownloadForm/DownloadForm.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/DownloadForm/DownloadForm.tsx
index d428d76f4d09d..63019bc12f006 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/DownloadForm/DownloadForm.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/DownloadForm/DownloadForm.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useId, useState } from 'react';
+
 import { Flex, LabelInput } from 'design';
 import { ButtonPrimary } from 'design/Button';
 
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.test.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.test.tsx
index ebc4d8fc620cc..eb62781251480 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.test.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.test.tsx
@@ -19,7 +19,6 @@
 import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { TransferredFile } from '../types';
-
 import { FileList } from './FileList';
 
 const files: TransferredFile[] = [
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.tsx
index 305be469d9bc4..563a3ff43fff9 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileList.tsx
@@ -19,7 +19,6 @@
 import styled from 'styled-components';
 
 import { TransferredFile } from '../types';
-
 import { FileListItem } from './FileListItem';
 
 interface FileListProps {
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileListItem.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileListItem.tsx
index 9c048535de51a..359b84b6ff84b 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileListItem.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileList/FileListItem.tsx
@@ -18,6 +18,7 @@
 
 import { FC, PropsWithChildren, useEffect } from 'react';
 import styled from 'styled-components';
+
 import { ButtonIcon, Flex, Text } from 'design';
 import { CircleCheck, Cross, Warning } from 'design/Icon';
 
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.story.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.story.tsx
index b7ae036ad3070..7fb1c2214cb3d 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.story.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.story.tsx
@@ -17,7 +17,6 @@
  */
 
 import { FileTransferContainer } from '../FileTransferContainer';
-
 import {
   FileTransferStateless,
   FileTransferStatelessProps,
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.tsx
index 1d9eea8d995f7..3fa4d61c78b48 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/FileTransferStateless.tsx
@@ -17,13 +17,14 @@
  */
 
 import styled from 'styled-components';
+
 import { ButtonIcon, Flex, Text } from 'design';
 import { Cross as CloseIcon } from 'design/Icon';
 
-import { FileTransferDialogDirection, TransferredFile } from './types';
 import { DownloadForm } from './DownloadForm';
-import { UploadForm } from './UploadForm';
 import { FileList } from './FileList';
+import { FileTransferDialogDirection, TransferredFile } from './types';
+import { UploadForm } from './UploadForm';
 
 export interface FileTransferStatelessProps {
   openedDialog: FileTransferDialogDirection;
diff --git a/web/packages/shared/components/FileTransfer/FileTransferStateless/UploadForm/UploadForm.tsx b/web/packages/shared/components/FileTransfer/FileTransferStateless/UploadForm/UploadForm.tsx
index b93b62294f890..379dcfd10bacf 100644
--- a/web/packages/shared/components/FileTransfer/FileTransferStateless/UploadForm/UploadForm.tsx
+++ b/web/packages/shared/components/FileTransfer/FileTransferStateless/UploadForm/UploadForm.tsx
@@ -18,10 +18,11 @@
 
 import React, { useRef, useState } from 'react';
 import styled from 'styled-components';
+
 import { Text } from 'design';
 import { NoteAdded } from 'design/Icon';
 
-import { PathInput, Form } from '../CommonElements';
+import { Form, PathInput } from '../CommonElements';
 
 interface UploadFormProps {
   onAddUpload(destinationPath: string, file: File): void;
diff --git a/web/packages/shared/components/Highlight/Highlight.story.tsx b/web/packages/shared/components/Highlight/Highlight.story.tsx
index 46a1817087d88..56d797d266bf6 100644
--- a/web/packages/shared/components/Highlight/Highlight.story.tsx
+++ b/web/packages/shared/components/Highlight/Highlight.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Flex, Text } from 'design';
 
 import { Highlight } from './Highlight';
diff --git a/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.test.tsx b/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.test.tsx
index c2eb82684dfef..afe67c57d5b19 100644
--- a/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.test.tsx
+++ b/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.test.tsx
@@ -17,9 +17,9 @@
  */
 
 import {
-  latencyColors,
   ERROR_THRESHOLD,
   LatencyColor,
+  latencyColors,
   WARN_THRESHOLD,
 } from 'shared/components/LatencyDiagnostic/LatencyDiagnostic';
 
diff --git a/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.tsx b/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.tsx
index b4fbd53542551..0d2256dd935ba 100644
--- a/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.tsx
+++ b/web/packages/shared/components/LatencyDiagnostic/LatencyDiagnostic.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import styled from 'styled-components';
 import React from 'react';
+import styled from 'styled-components';
 
-import * as Icons from 'design/Icon';
 import { Flex, H2, Text } from 'design';
+import * as Icons from 'design/Icon';
 import { TeleportGearIcon } from 'design/SVGIcon';
+import { MenuIcon } from 'shared/components/MenuAction';
 
 import { DocumentSsh } from 'teleport/Console/stores';
 
-import { MenuIcon } from 'shared/components/MenuAction';
-
 export const WARN_THRESHOLD = 150;
 export const ERROR_THRESHOLD = 400;
 
diff --git a/web/packages/shared/components/MenuAction/MenuAction.story.tsx b/web/packages/shared/components/MenuAction/MenuAction.story.tsx
index 4b5bbc4a5ed1e..f851eadf4abcd 100644
--- a/web/packages/shared/components/MenuAction/MenuAction.story.tsx
+++ b/web/packages/shared/components/MenuAction/MenuAction.story.tsx
@@ -19,7 +19,7 @@
 import { Flex } from 'design';
 import { Cog } from 'design/Icon';
 
-import { MenuIcon, MenuButton, MenuItem } from '.';
+import { MenuButton, MenuIcon, MenuItem } from '.';
 
 export default {
   title: 'Shared/MenuAction',
diff --git a/web/packages/shared/components/MenuAction/MenuAction.test.tsx b/web/packages/shared/components/MenuAction/MenuAction.test.tsx
index e376c2ecf98dc..cb74598dafb2e 100644
--- a/web/packages/shared/components/MenuAction/MenuAction.test.tsx
+++ b/web/packages/shared/components/MenuAction/MenuAction.test.tsx
@@ -18,7 +18,7 @@
 
 import { screen } from '@testing-library/react';
 
-import { render, fireEvent } from 'design/utils/testing';
+import { fireEvent, render } from 'design/utils/testing';
 
 import { MenuIcon, MenuItem } from '.';
 
diff --git a/web/packages/shared/components/MenuAction/MenuActionButton.tsx b/web/packages/shared/components/MenuAction/MenuActionButton.tsx
index 6e965eb943658..06d9ff5fbfa7d 100644
--- a/web/packages/shared/components/MenuAction/MenuActionButton.tsx
+++ b/web/packages/shared/components/MenuAction/MenuActionButton.tsx
@@ -17,11 +17,12 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import Menu from 'design/Menu';
+
 import { ButtonBorder } from 'design';
 import { ChevronDown } from 'design/Icon';
+import Menu from 'design/Menu';
 
-import { MenuProps, AnchorProps } from './types';
+import { AnchorProps, MenuProps } from './types';
 
 type Props = MenuProps & {
   defaultOpen?: boolean;
diff --git a/web/packages/shared/components/MenuAction/MenuActionIcon.tsx b/web/packages/shared/components/MenuAction/MenuActionIcon.tsx
index d8cbb17841414..679d09e05b287 100644
--- a/web/packages/shared/components/MenuAction/MenuActionIcon.tsx
+++ b/web/packages/shared/components/MenuAction/MenuActionIcon.tsx
@@ -17,12 +17,13 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import Menu from 'design/Menu';
+
 import { ButtonIcon } from 'design';
 import { MoreHoriz } from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
+import Menu from 'design/Menu';
 
-import { MenuProps, AnchorProps } from './types';
+import { AnchorProps, MenuProps } from './types';
 
 export default class MenuActionIcon extends React.Component<
   PropsWithChildren<Props>
diff --git a/web/packages/shared/components/MenuAction/index.ts b/web/packages/shared/components/MenuAction/index.ts
index 34b1b64e880fe..24b94a7278a9f 100644
--- a/web/packages/shared/components/MenuAction/index.ts
+++ b/web/packages/shared/components/MenuAction/index.ts
@@ -18,7 +18,7 @@
 
 import { MenuItem, MenuItemIcon } from 'design/Menu';
 
-import MenuIcon from './MenuActionIcon';
 import MenuButton from './MenuActionButton';
+import MenuIcon from './MenuActionIcon';
 
 export { MenuIcon, MenuButton, MenuItem, MenuItemIcon };
diff --git a/web/packages/shared/components/MenuLogin/MenuLogin.story.tsx b/web/packages/shared/components/MenuLogin/MenuLogin.story.tsx
index 224fa80ae365f..fcefad768ded9 100644
--- a/web/packages/shared/components/MenuLogin/MenuLogin.story.tsx
+++ b/web/packages/shared/components/MenuLogin/MenuLogin.story.tsx
@@ -17,9 +17,10 @@
  */
 
 import { useEffect, useRef } from 'react';
-import { Flex, H3 } from 'design';
 import styled from 'styled-components';
 
+import { Flex, H3 } from 'design';
+
 import { MenuLogin } from './MenuLogin';
 import { LoginItem, MenuLoginHandle } from './types';
 
diff --git a/web/packages/shared/components/MenuLogin/MenuLogin.test.tsx b/web/packages/shared/components/MenuLogin/MenuLogin.test.tsx
index fec647363bb23..40ea808cc2369 100644
--- a/web/packages/shared/components/MenuLogin/MenuLogin.test.tsx
+++ b/web/packages/shared/components/MenuLogin/MenuLogin.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen, waitFor } from 'design/utils/testing';
+import { fireEvent, render, screen, waitFor } from 'design/utils/testing';
 
 import { MenuLogin } from './MenuLogin';
 import { MenuInputType } from './types';
diff --git a/web/packages/shared/components/MenuLogin/MenuLogin.tsx b/web/packages/shared/components/MenuLogin/MenuLogin.tsx
index d45aa593ea36e..10038eb1e4605 100644
--- a/web/packages/shared/components/MenuLogin/MenuLogin.tsx
+++ b/web/packages/shared/components/MenuLogin/MenuLogin.tsx
@@ -22,21 +22,20 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import styled from 'styled-components';
 import { NavLink } from 'react-router-dom';
-import Menu, { MenuItem } from 'design/Menu';
-import { space, SpaceProps } from 'design/system';
+import styled from 'styled-components';
 
 import { ButtonBorder, Flex, Indicator } from 'design';
 import { ChevronDown } from 'design/Icon';
-
-import { useAsync, Attempt } from 'shared/hooks/useAsync';
+import Menu, { MenuItem } from 'design/Menu';
+import { space, SpaceProps } from 'design/system';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
 
 import {
-  MenuLoginProps,
   LoginItem,
-  MenuLoginHandle,
   MenuInputType,
+  MenuLoginHandle,
+  MenuLoginProps,
 } from './types';
 
 export const MenuLogin = React.forwardRef<MenuLoginHandle, MenuLoginProps>(
diff --git a/web/packages/shared/components/MissingPermissionsTooltip/MissingPermissionsTooltip.tsx b/web/packages/shared/components/MissingPermissionsTooltip/MissingPermissionsTooltip.tsx
index f414c2526318f..b0e4fd5f943fd 100644
--- a/web/packages/shared/components/MissingPermissionsTooltip/MissingPermissionsTooltip.tsx
+++ b/web/packages/shared/components/MissingPermissionsTooltip/MissingPermissionsTooltip.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, Text, Flex } from 'design';
+import { Box, Flex, Text } from 'design';
 
 export const MissingPermissionsTooltip = ({
   missingPermissions,
diff --git a/web/packages/shared/components/Notification/Notification.story.tsx b/web/packages/shared/components/Notification/Notification.story.tsx
index b3b2b1b9fe5ad..9f30ae5af81a4 100644
--- a/web/packages/shared/components/Notification/Notification.story.tsx
+++ b/web/packages/shared/components/Notification/Notification.story.tsx
@@ -17,8 +17,9 @@
  */
 
 import { useState } from 'react';
-import { Bots } from 'design/Icon';
+
 import Flex from 'design/Flex';
+import { Bots } from 'design/Icon';
 
 import { Notification } from './Notification';
 
diff --git a/web/packages/shared/components/Notification/Notification.test.tsx b/web/packages/shared/components/Notification/Notification.test.tsx
index f5c8ee823d6b2..62d0eb9a8af2f 100644
--- a/web/packages/shared/components/Notification/Notification.test.tsx
+++ b/web/packages/shared/components/Notification/Notification.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render } from 'design/utils/testing';
 import { fireEvent, screen } from '@testing-library/react';
 
+import { render } from 'design/utils/testing';
+
 import { Notification } from './Notification';
 
 test('click on action button does not expand or collapse notification', async () => {
diff --git a/web/packages/shared/components/Notification/Notification.tsx b/web/packages/shared/components/Notification/Notification.tsx
index 17788e1063533..c3333ad2e8caa 100644
--- a/web/packages/shared/components/Notification/Notification.tsx
+++ b/web/packages/shared/components/Notification/Notification.tsx
@@ -18,15 +18,15 @@
 
 import React, { useEffect, useRef, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
+
 import { Box, ButtonIcon, Flex, Text } from 'design';
+import { ActionButton } from 'design/Alert';
+import { BoxProps } from 'design/Box';
 import { Cross } from 'design/Icon';
-
 import * as Icon from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
-import { Theme } from 'design/theme/themes/types';
 import { borderColor } from 'design/system';
-import { ActionButton } from 'design/Alert';
-import { BoxProps } from 'design/Box';
+import { Theme } from 'design/theme/themes/types';
 
 import type {
   NotificationItem,
diff --git a/web/packages/shared/components/Notification/types.ts b/web/packages/shared/components/Notification/types.ts
index da1bd8f95ab75..ced2272193ebd 100644
--- a/web/packages/shared/components/Notification/types.ts
+++ b/web/packages/shared/components/Notification/types.ts
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React from 'react';
+
 import { Action } from 'design/Alert';
 import { IconProps } from 'design/Icon/Icon';
-import React from 'react';
 
 export type NotificationSeverity =
   | 'info'
diff --git a/web/packages/shared/components/Search/SearchPagination.tsx b/web/packages/shared/components/Search/SearchPagination.tsx
index f2cdbe89ec7e6..09467aa087377 100644
--- a/web/packages/shared/components/Search/SearchPagination.tsx
+++ b/web/packages/shared/components/Search/SearchPagination.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Flex } from 'design';
-import { StyledPanel } from 'design/DataTable/StyledTable';
 import { StyledArrowBtn } from 'design/DataTable/Pager/StyledPager';
+import { StyledPanel } from 'design/DataTable/StyledTable';
 import { CircleArrowLeft, CircleArrowRight } from 'design/Icon';
 
 export function SearchPagination({ prevPage, nextPage }: Props) {
diff --git a/web/packages/shared/components/Search/SearchPanel.tsx b/web/packages/shared/components/Search/SearchPanel.tsx
index 4c470b6b790b9..dabd4f4722652 100644
--- a/web/packages/shared/components/Search/SearchPanel.tsx
+++ b/web/packages/shared/components/Search/SearchPanel.tsx
@@ -18,13 +18,14 @@
 
 import { useEffect, useState } from 'react';
 import styled from 'styled-components';
+
 import { Flex } from 'design';
 import InputSearch from 'design/DataTable/InputSearch';
 import { PageIndicatorText } from 'design/DataTable/Pager/PageIndicatorText';
-import { ResourceFilter } from 'teleport/services/agents';
-
 import { AdvancedSearchToggle } from 'shared/components/AdvancedSearchToggle';
 
+import { ResourceFilter } from 'teleport/services/agents';
+
 export function SearchPanel({
   updateQuery,
   updateSearch,
diff --git a/web/packages/shared/components/Select/Select.story.tsx b/web/packages/shared/components/Select/Select.story.tsx
index a5ae58852ef9c..872cf36df6d64 100644
--- a/web/packages/shared/components/Select/Select.story.tsx
+++ b/web/packages/shared/components/Select/Select.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useState } from 'react';
+
 import { Box, Flex, H3, H4 } from 'design';
 
 import Select, { Option } from '../Select';
diff --git a/web/packages/shared/components/Select/Select.tsx b/web/packages/shared/components/Select/Select.tsx
index 1beaab055b905..ea4566a1501b6 100644
--- a/web/packages/shared/components/Select/Select.tsx
+++ b/web/packages/shared/components/Select/Select.tsx
@@ -18,26 +18,26 @@
 
 import ReactSelect, {
   ClearIndicatorProps,
+  components,
   DropdownIndicatorProps,
   GroupBase,
   MultiValueRemoveProps,
-  components,
 } from 'react-select';
 import ReactSelectAsync from 'react-select/async';
-import CreatableSelect from 'react-select/creatable';
 import ReactSelectCreatableAsync from 'react-select/async-creatable';
+import CreatableSelect from 'react-select/creatable';
 import styled from 'styled-components';
-import { width, space } from 'design/system';
 
-import { Theme } from 'design/theme/themes/types';
 import { ChevronDown, Cross } from 'design/Icon';
+import { space, width } from 'design/system';
+import { Theme } from 'design/theme/themes/types';
 
 import {
-  Props,
+  AsyncCreatableProps,
   AsyncProps,
   CreatableProps,
   Option,
-  AsyncCreatableProps,
+  Props,
   SelectSize,
 } from './types';
 
diff --git a/web/packages/shared/components/Select/SelectCreatable.story.tsx b/web/packages/shared/components/Select/SelectCreatable.story.tsx
index e813e6f4496cd..ca7ca1d158af9 100644
--- a/web/packages/shared/components/Select/SelectCreatable.story.tsx
+++ b/web/packages/shared/components/Select/SelectCreatable.story.tsx
@@ -17,9 +17,10 @@
  */
 
 import { useState } from 'react';
-import { Flex, Box } from 'design';
 
-import { SelectCreatable, Option } from '../Select';
+import { Box, Flex } from 'design';
+
+import { Option, SelectCreatable } from '../Select';
 
 export default {
   title: 'Shared/SelectCreatable',
diff --git a/web/packages/shared/components/Select/types.ts b/web/packages/shared/components/Select/types.ts
index b1b11292a16b0..094bf9bc96852 100644
--- a/web/packages/shared/components/Select/types.ts
+++ b/web/packages/shared/components/Select/types.ts
@@ -17,15 +17,15 @@
  */
 
 import {
-  StylesConfig,
-  Props as ReactSelectProps,
   GroupBase,
-  OptionProps,
   OnChangeValue,
+  OptionProps,
+  Props as ReactSelectProps,
+  StylesConfig,
 } from 'react-select';
 import { AsyncProps as ReactSelectAsyncProps } from 'react-select/async';
-import { CreatableProps as ReactSelectCreatableProps } from 'react-select/creatable';
 import { AsyncCreatableProps as ReactSelectAsyncCreatableProps } from 'react-select/async-creatable';
+import { CreatableProps as ReactSelectCreatableProps } from 'react-select/creatable';
 
 export type SelectSize = 'large' | 'medium' | 'small';
 
diff --git a/web/packages/shared/components/TerminalSearch/TerminalSearch.test.tsx b/web/packages/shared/components/TerminalSearch/TerminalSearch.test.tsx
index a2429a53119e8..0c205955b68d7 100644
--- a/web/packages/shared/components/TerminalSearch/TerminalSearch.test.tsx
+++ b/web/packages/shared/components/TerminalSearch/TerminalSearch.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, act, screen } from 'design/utils/testing';
 import { SearchAddon } from '@xterm/addon-search';
 
+import { act, render, screen } from 'design/utils/testing';
+
 import { TerminalSearch } from './TerminalSearch';
 
 let searchCallback: SearchCallbackType;
diff --git a/web/packages/shared/components/TerminalSearch/TerminalSearch.tsx b/web/packages/shared/components/TerminalSearch/TerminalSearch.tsx
index 212547eb273b2..f9ab6f947220e 100644
--- a/web/packages/shared/components/TerminalSearch/TerminalSearch.tsx
+++ b/web/packages/shared/components/TerminalSearch/TerminalSearch.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useRef, useCallback } from 'react';
+import { SearchAddon } from '@xterm/addon-search';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
-import { Flex, ButtonIcon, Box, P2, Input } from 'design';
+
+import { Box, ButtonIcon, Flex, Input, P2 } from 'design';
 import { ChevronDown, ChevronUp, Cross } from 'design/Icon';
-import { SearchAddon } from '@xterm/addon-search';
 
 export interface TerminalSearcher {
   getSearchAddon(): SearchAddon;
diff --git a/web/packages/shared/components/TextEditor/StyledTextEditor.jsx b/web/packages/shared/components/TextEditor/StyledTextEditor.jsx
index e57cec71263cb..b1395fcfce080 100644
--- a/web/packages/shared/components/TextEditor/StyledTextEditor.jsx
+++ b/web/packages/shared/components/TextEditor/StyledTextEditor.jsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { color } from 'design/system';
 
 const StyledTextEditor = styled.div`
diff --git a/web/packages/shared/components/TextEditor/TextEditor.jsx b/web/packages/shared/components/TextEditor/TextEditor.jsx
index cbfd4081a5a88..590dab85c636b 100644
--- a/web/packages/shared/components/TextEditor/TextEditor.jsx
+++ b/web/packages/shared/components/TextEditor/TextEditor.jsx
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import ace from 'ace-builds/src-min-noconflict/ace';
 import { Component } from 'react';
 import styled from 'styled-components';
-import ace from 'ace-builds/src-min-noconflict/ace';
 
 import 'ace-builds/src-noconflict/mode-json';
 import 'ace-builds/src-noconflict/mode-yaml';
 import 'ace-builds/src-noconflict/ext-searchbox';
+
 import { ButtonSecondary } from 'design/Button';
 import Flex from 'design/Flex';
 import { Copy, Download } from 'design/Icon';
 import { copyToClipboard } from 'design/utils/copyToClipboard';
-
 import { downloadObject } from 'shared/utils/download';
 
 import StyledTextEditor from './StyledTextEditor';
diff --git a/web/packages/shared/components/TextEditor/TextEditor.test.tsx b/web/packages/shared/components/TextEditor/TextEditor.test.tsx
index f54c31cfb7d2c..78064812697ba 100644
--- a/web/packages/shared/components/TextEditor/TextEditor.test.tsx
+++ b/web/packages/shared/components/TextEditor/TextEditor.test.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, userEvent, screen } from 'design/utils/testing';
 import * as copyModule from 'design/utils/copyToClipboard';
-
+import { render, screen, userEvent } from 'design/utils/testing';
 import * as downloadsModule from 'shared/utils/download';
 
 import TextEditor from '.';
diff --git a/web/packages/shared/components/TextEditor/index.js b/web/packages/shared/components/TextEditor/index.js
index 8df430111cd68..cc25131452b00 100644
--- a/web/packages/shared/components/TextEditor/index.js
+++ b/web/packages/shared/components/TextEditor/index.js
@@ -17,4 +17,5 @@
  */
 
 import TextEditor from './TextEditor';
+
 export default TextEditor;
diff --git a/web/packages/shared/components/TextSelectCopy/TextSelectCopy.tsx b/web/packages/shared/components/TextSelectCopy/TextSelectCopy.tsx
index 7164e09aa4fc4..d5d8d5e240a44 100644
--- a/web/packages/shared/components/TextSelectCopy/TextSelectCopy.tsx
+++ b/web/packages/shared/components/TextSelectCopy/TextSelectCopy.tsx
@@ -19,10 +19,9 @@
 import { useRef, useState } from 'react';
 import { useTheme } from 'styled-components';
 
+import { Box, ButtonPrimary, Flex } from 'design';
 import { copyToClipboard } from 'design/utils/copyToClipboard';
 import selectElementContent from 'design/utils/selectElementContent';
-import { ButtonPrimary, Box, Flex } from 'design';
-
 import { wait } from 'shared/utils/wait';
 
 export function TextSelectCopy({
diff --git a/web/packages/shared/components/TextSelectCopy/TextSelectCopyMulti.tsx b/web/packages/shared/components/TextSelectCopy/TextSelectCopyMulti.tsx
index 0710fb6c91866..30556d3ce4214 100644
--- a/web/packages/shared/components/TextSelectCopy/TextSelectCopyMulti.tsx
+++ b/web/packages/shared/components/TextSelectCopy/TextSelectCopyMulti.tsx
@@ -19,11 +19,10 @@
 import { useRef } from 'react';
 import styled from 'styled-components';
 
+import { Box, ButtonSecondary, Flex } from 'design';
+import { Check, Copy, Download } from 'design/Icon';
 import { copyToClipboard } from 'design/utils/copyToClipboard';
 import selectElementContent from 'design/utils/selectElementContent';
-import { ButtonSecondary, Box, Flex } from 'design';
-import { Copy, Check, Download } from 'design/Icon';
-
 import { saveOnDisk } from 'shared/utils/saveOnDisk';
 
 const ONE_SECOND_IN_MS = 1000;
diff --git a/web/packages/shared/components/UnifiedResources/CardsView/CardsView.tsx b/web/packages/shared/components/UnifiedResources/CardsView/CardsView.tsx
index 8629738278c07..7cef9f11940b9 100644
--- a/web/packages/shared/components/UnifiedResources/CardsView/CardsView.tsx
+++ b/web/packages/shared/components/UnifiedResources/CardsView/CardsView.tsx
@@ -20,14 +20,10 @@ import styled from 'styled-components';
 
 import { Flex } from 'design';
 
-import { FETCH_MORE_SIZE } from '../UnifiedResources';
-
-import { ResourceViewProps } from '../types';
-
 import { LoadingSkeleton } from '../shared/LoadingSkeleton';
-
+import { ResourceViewProps } from '../types';
+import { FETCH_MORE_SIZE } from '../UnifiedResources';
 import { LoadingCard } from './LoadingCard';
-
 import { ResourceCard } from './ResourceCard';
 
 export function CardsView({
diff --git a/web/packages/shared/components/UnifiedResources/CardsView/LoadingCard.tsx b/web/packages/shared/components/UnifiedResources/CardsView/LoadingCard.tsx
index 7a1db26e0a2e8..784308d13f820 100644
--- a/web/packages/shared/components/UnifiedResources/CardsView/LoadingCard.tsx
+++ b/web/packages/shared/components/UnifiedResources/CardsView/LoadingCard.tsx
@@ -17,7 +17,8 @@
  */
 
 import { useState } from 'react';
-import { Flex, Box } from 'design';
+
+import { Box, Flex } from 'design';
 import { ShimmerBox } from 'design/ShimmerBox';
 
 export function LoadingCard() {
diff --git a/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.story.tsx b/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.story.tsx
index 23ccaebeb0081..2973f0f5855b8 100644
--- a/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.story.tsx
+++ b/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.story.tsx
@@ -17,7 +17,6 @@
  */
 
 import { Meta, StoryObj } from '@storybook/react';
-
 import styled from 'styled-components';
 
 import { ButtonBorder } from 'design';
@@ -25,25 +24,21 @@ import { gap, GapProps } from 'design/system';
 
 import { apps } from 'teleport/Apps/fixtures';
 import { databases } from 'teleport/Databases/fixtures';
-
-import { kubes } from 'teleport/Kubes/fixtures';
 import { desktops } from 'teleport/Desktops/fixtures';
+import { kubes } from 'teleport/Kubes/fixtures';
 import { nodes } from 'teleport/Nodes/fixtures';
-
+import { SamlAppActionProvider } from 'teleport/SamlApplications/useSamlAppActions';
 import makeApp from 'teleport/services/apps/makeApps';
 import { ResourceActionButton } from 'teleport/UnifiedResources/ResourceActionButton';
-import { SamlAppActionProvider } from 'teleport/SamlApplications/useSamlAppActions';
 
 import {
   makeUnifiedResourceViewItemApp,
   makeUnifiedResourceViewItemDatabase,
+  makeUnifiedResourceViewItemDesktop,
   makeUnifiedResourceViewItemKube,
   makeUnifiedResourceViewItemNode,
-  makeUnifiedResourceViewItemDesktop,
 } from '../shared/viewItemsFactory';
-
 import { PinningSupport } from '../types';
-
 import { ResourceCard } from './ResourceCard';
 
 const additionalResources = [
diff --git a/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.tsx b/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.tsx
index 8750f37f4716a..3d80b685daa8a 100644
--- a/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.tsx
+++ b/web/packages/shared/components/UnifiedResources/CardsView/ResourceCard.tsx
@@ -16,25 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useLayoutEffect, useRef } from 'react';
+import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import styled, { css } from 'styled-components';
 
 import { Box, ButtonLink, Flex, Label, Text } from 'design';
 import { CheckboxInput } from 'design/Checkbox';
-
 import { ResourceIcon } from 'design/ResourceIcon';
+import { HoverTooltip } from 'design/Tooltip';
 
 import { makeLabelTag } from 'teleport/components/formatters';
 
-import { HoverTooltip } from 'design/Tooltip';
-
-import { ResourceItemProps } from '../types';
-import { PinButton } from '../shared/PinButton';
 import { CopyButton } from '../shared/CopyButton';
 import {
   BackgroundColorProps,
   getBackgroundColor,
 } from '../shared/getBackgroundColor';
+import { PinButton } from '../shared/PinButton';
+import { ResourceItemProps } from '../types';
 
 // Since we do a lot of manual resizing and some absolute positioning, we have
 // to put some layout constants in place here.
diff --git a/web/packages/shared/components/UnifiedResources/FilterPanel.tsx b/web/packages/shared/components/UnifiedResources/FilterPanel.tsx
index 6e62a50a3d4c9..405f2af350e02 100644
--- a/web/packages/shared/components/UnifiedResources/FilterPanel.tsx
+++ b/web/packages/shared/components/UnifiedResources/FilterPanel.tsx
@@ -18,26 +18,24 @@
 
 import React, { useState } from 'react';
 import styled from 'styled-components';
+
+import { Flex, Text, Toggle } from 'design';
 import { ButtonBorder, ButtonSecondary } from 'design/Button';
-import { Text, Flex, Toggle } from 'design';
-import Menu from 'design/Menu';
 import { CheckboxInput } from 'design/Checkbox';
-import { ChevronDown, ArrowsIn, ArrowsOut, Refresh } from 'design/Icon';
-
+import { ArrowsIn, ArrowsOut, ChevronDown, Refresh } from 'design/Icon';
+import Menu from 'design/Menu';
 import { ViewMode } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
-import { HoverTooltip } from 'shared/components/ToolTip';
+import { MultiselectMenu } from 'shared/components/Controls/MultiselectMenu';
 import { SortMenu } from 'shared/components/Controls/SortMenu';
 import { ViewModeSwitch } from 'shared/components/Controls/ViewModeSwitch';
+import { HoverTooltip } from 'shared/components/ToolTip';
 
-import { MultiselectMenu } from 'shared/components/Controls/MultiselectMenu';
-
-import { ResourceAvailabilityFilter, FilterKind } from './UnifiedResources';
 import {
   IncludedResourceMode,
   SharedUnifiedResource,
   UnifiedResourcesQueryParams,
 } from './types';
+import { FilterKind, ResourceAvailabilityFilter } from './UnifiedResources';
 
 const kindToLabel: Record<SharedUnifiedResource['resource']['kind'], string> = {
   app: 'Application',
diff --git a/web/packages/shared/components/UnifiedResources/ListView/ListView.tsx b/web/packages/shared/components/UnifiedResources/ListView/ListView.tsx
index 615fddf2c1159..d8fad169035d7 100644
--- a/web/packages/shared/components/UnifiedResources/ListView/ListView.tsx
+++ b/web/packages/shared/components/UnifiedResources/ListView/ListView.tsx
@@ -18,13 +18,11 @@
 
 import { Flex } from 'design';
 
+import { LoadingSkeleton } from '../shared/LoadingSkeleton';
 import { ResourceViewProps } from '../types';
 import { FETCH_MORE_SIZE } from '../UnifiedResources';
-
-import { LoadingSkeleton } from '../shared/LoadingSkeleton';
-
-import { ResourceListItem } from './ResourceListItem';
 import { LoadingListItem } from './LoadingListItem';
+import { ResourceListItem } from './ResourceListItem';
 
 export function ListView({
   mappedResources,
diff --git a/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.story.tsx b/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.story.tsx
index 69d6764298561..d6442e533d6cb 100644
--- a/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.story.tsx
+++ b/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.story.tsx
@@ -22,23 +22,19 @@ import { ButtonBorder, Flex } from 'design';
 
 import { apps } from 'teleport/Apps/fixtures';
 import { databases } from 'teleport/Databases/fixtures';
-
-import { kubes } from 'teleport/Kubes/fixtures';
 import { desktops } from 'teleport/Desktops/fixtures';
+import { kubes } from 'teleport/Kubes/fixtures';
 import { nodes } from 'teleport/Nodes/fixtures';
-
 import makeApp from 'teleport/services/apps/makeApps';
 
 import {
   makeUnifiedResourceViewItemApp,
   makeUnifiedResourceViewItemDatabase,
+  makeUnifiedResourceViewItemDesktop,
   makeUnifiedResourceViewItemKube,
   makeUnifiedResourceViewItemNode,
-  makeUnifiedResourceViewItemDesktop,
 } from '../shared/viewItemsFactory';
-
 import { PinningSupport } from '../types';
-
 import { ResourceListItem } from './ResourceListItem';
 
 const additionalResources = [
diff --git a/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.tsx b/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.tsx
index f5062990ac511..bd421e5de821e 100644
--- a/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.tsx
+++ b/web/packages/shared/components/UnifiedResources/ListView/ResourceListItem.tsx
@@ -23,18 +23,17 @@ import { Box, ButtonIcon, Flex, Label, Text } from 'design';
 import { CheckboxInput } from 'design/Checkbox';
 import { Tags } from 'design/Icon';
 import { ResourceIcon } from 'design/ResourceIcon';
+import { HoverTooltip } from 'design/Tooltip';
 
 import { makeLabelTag } from 'teleport/components/formatters';
 
-import { HoverTooltip } from 'design/Tooltip';
-
-import { ResourceItemProps } from '../types';
-import { PinButton } from '../shared/PinButton';
 import { CopyButton } from '../shared/CopyButton';
 import {
   BackgroundColorProps,
   getBackgroundColor,
 } from '../shared/getBackgroundColor';
+import { PinButton } from '../shared/PinButton';
+import { ResourceItemProps } from '../types';
 
 export function ResourceListItem({
   name,
diff --git a/web/packages/shared/components/UnifiedResources/ResourceTab.tsx b/web/packages/shared/components/UnifiedResources/ResourceTab.tsx
index 653b4c5010d6d..c306abf830b92 100644
--- a/web/packages/shared/components/UnifiedResources/ResourceTab.tsx
+++ b/web/packages/shared/components/UnifiedResources/ResourceTab.tsx
@@ -17,8 +17,8 @@
  */
 
 import styled from 'styled-components';
-import { Box, Text } from 'design';
 
+import { Box, Text } from 'design';
 import { HoverTooltip } from 'design/Tooltip';
 
 import { PINNING_NOT_SUPPORTED_MESSAGE } from './UnifiedResources';
diff --git a/web/packages/shared/components/UnifiedResources/UnifiedResources.story.tsx b/web/packages/shared/components/UnifiedResources/UnifiedResources.story.tsx
index 0689d75c2e505..a475378681988 100644
--- a/web/packages/shared/components/UnifiedResources/UnifiedResources.story.tsx
+++ b/web/packages/shared/components/UnifiedResources/UnifiedResources.story.tsx
@@ -19,16 +19,6 @@
 import { useState } from 'react';
 
 import { ButtonBorder } from 'design';
-
-import { apps, moreApps } from 'teleport/Apps/fixtures';
-import { databases, moreDatabases } from 'teleport/Databases/fixtures';
-import { kubes, moreKubes } from 'teleport/Kubes/fixtures';
-import { desktops, moreDesktops } from 'teleport/Desktops/fixtures';
-import { moreNodes, nodes } from 'teleport/Nodes/fixtures';
-
-import { UrlResourcesParams } from 'teleport/config';
-import { ResourcesResponse } from 'teleport/services/agents';
-
 import {
   AvailableResourceMode,
   DefaultTab,
@@ -36,15 +26,22 @@ import {
   UnifiedResourcePreferences,
   ViewMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
 import { makeErrorAttempt, makeProcessingAttempt } from 'shared/hooks/useAsync';
 
+import { apps, moreApps } from 'teleport/Apps/fixtures';
+import { UrlResourcesParams } from 'teleport/config';
+import { databases, moreDatabases } from 'teleport/Databases/fixtures';
+import { desktops, moreDesktops } from 'teleport/Desktops/fixtures';
+import { kubes, moreKubes } from 'teleport/Kubes/fixtures';
+import { moreNodes, nodes } from 'teleport/Nodes/fixtures';
+import { ResourcesResponse } from 'teleport/services/agents';
+
+import { SharedUnifiedResource, UnifiedResourcesQueryParams } from './types';
 import {
   UnifiedResources,
-  useUnifiedResourcesFetch,
   UnifiedResourcesProps,
+  useUnifiedResourcesFetch,
 } from './UnifiedResources';
-import { SharedUnifiedResource, UnifiedResourcesQueryParams } from './types';
 
 export default {
   title: 'Shared/UnifiedResources',
diff --git a/web/packages/shared/components/UnifiedResources/UnifiedResources.tsx b/web/packages/shared/components/UnifiedResources/UnifiedResources.tsx
index d7608ee6c4cf2..ec4b705a72f93 100644
--- a/web/packages/shared/components/UnifiedResources/UnifiedResources.tsx
+++ b/web/packages/shared/components/UnifiedResources/UnifiedResources.tsx
@@ -17,62 +17,59 @@
  */
 
 import React, {
-  useEffect,
-  useLayoutEffect,
-  useState,
-  useCallback,
   Children,
   PropsWithChildren,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
   useRef,
+  useState,
 } from 'react';
-
 import styled from 'styled-components';
-import { Box, Flex, ButtonSecondary, Text, ButtonBorder } from 'design';
-import { Icon, Magnifier, PushPin } from 'design/Icon';
+
+import { Box, ButtonBorder, ButtonSecondary, Flex, Text } from 'design';
 import { Danger } from 'design/Alert';
+import { Icon, Magnifier, PushPin } from 'design/Icon';
 
 import './unifiedStyles.css';
 
-import { ResourcesResponse } from 'teleport/services/agents';
-
+import { HoverTooltip } from 'design/Tooltip';
 import {
+  AvailableResourceMode,
   DefaultTab,
   LabelsViewMode,
   UnifiedResourcePreferences,
   ViewMode,
-  AvailableResourceMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
-import { HoverTooltip } from 'design/Tooltip';
-
 import {
+  Attempt as AsyncAttempt,
+  hasFinished,
   makeEmptyAttempt,
   makeSuccessAttempt,
   useAsync,
-  Attempt as AsyncAttempt,
-  hasFinished,
 } from 'shared/hooks/useAsync';
+import { Attempt } from 'shared/hooks/useAttemptNext';
 import {
-  useKeyBasedPagination,
   useInfiniteScroll,
+  useKeyBasedPagination,
 } from 'shared/hooks/useInfiniteScroll';
-import { Attempt } from 'shared/hooks/useAttemptNext';
 import { makeAdvancedSearchQueryForLabel } from 'shared/utils/advancedSearchLabelQuery';
 
+import { ResourcesResponse } from 'teleport/services/agents';
+
+import { CardsView } from './CardsView/CardsView';
+import { FilterPanel } from './FilterPanel';
+import { ListView } from './ListView/ListView';
+import { ResourceTab } from './ResourceTab';
+import { mapResourceToViewItem } from './shared/viewItemsFactory';
 import {
-  SharedUnifiedResource,
+  IncludedResourceMode,
   PinningSupport,
+  SharedUnifiedResource,
   UnifiedResourcesPinning,
   UnifiedResourcesQueryParams,
-  IncludedResourceMode,
 } from './types';
 
-import { ResourceTab } from './ResourceTab';
-import { FilterPanel } from './FilterPanel';
-import { CardsView } from './CardsView/CardsView';
-import { ListView } from './ListView/ListView';
-import { mapResourceToViewItem } from './shared/viewItemsFactory';
-
 // get 48 resources to start
 const INITIAL_FETCH_SIZE = 48;
 // increment by 24 every fetch
diff --git a/web/packages/shared/components/UnifiedResources/shared/CopyButton.tsx b/web/packages/shared/components/UnifiedResources/shared/CopyButton.tsx
index 590d4a954162f..a4f8853b5029b 100644
--- a/web/packages/shared/components/UnifiedResources/shared/CopyButton.tsx
+++ b/web/packages/shared/components/UnifiedResources/shared/CopyButton.tsx
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useRef, useEffect } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import ButtonIcon from 'design/ButtonIcon';
 import { Check, Copy } from 'design/Icon';
-import { copyToClipboard } from 'design/utils/copyToClipboard';
-
 import { HoverTooltip } from 'design/Tooltip';
+import { copyToClipboard } from 'design/utils/copyToClipboard';
 
 export function CopyButton({
   name,
diff --git a/web/packages/shared/components/UnifiedResources/shared/LoadingSkeleton.tsx b/web/packages/shared/components/UnifiedResources/shared/LoadingSkeleton.tsx
index ca05681e6d9e2..240cca1ab88dc 100644
--- a/web/packages/shared/components/UnifiedResources/shared/LoadingSkeleton.tsx
+++ b/web/packages/shared/components/UnifiedResources/shared/LoadingSkeleton.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, Fragment, ReactElement } from 'react';
+import { Fragment, ReactElement, useEffect, useState } from 'react';
 
 const DISPLAY_SKELETON_AFTER_MS = 150;
 
diff --git a/web/packages/shared/components/UnifiedResources/shared/PinButton.tsx b/web/packages/shared/components/UnifiedResources/shared/PinButton.tsx
index 05f67a214a4f4..ecaadd42b21f8 100644
--- a/web/packages/shared/components/UnifiedResources/shared/PinButton.tsx
+++ b/web/packages/shared/components/UnifiedResources/shared/PinButton.tsx
@@ -18,13 +18,11 @@
 
 import { useRef } from 'react';
 
-import { PushPinFilled, PushPin } from 'design/Icon';
 import ButtonIcon from 'design/ButtonIcon';
-
+import { PushPin, PushPinFilled } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
 
 import { PinningSupport } from '../types';
-
 import { PINNING_NOT_SUPPORTED_MESSAGE } from '../UnifiedResources';
 
 export function PinButton({
diff --git a/web/packages/shared/components/UnifiedResources/shared/guessAppIcon.ts b/web/packages/shared/components/UnifiedResources/shared/guessAppIcon.ts
index 6124b7edc67ed..cfe8ba95f4d96 100644
--- a/web/packages/shared/components/UnifiedResources/shared/guessAppIcon.ts
+++ b/web/packages/shared/components/UnifiedResources/shared/guessAppIcon.ts
@@ -17,9 +17,9 @@
  */
 
 import {
+  iconNames,
   ResourceIconName,
   resourceIconSpecs,
-  iconNames,
 } from 'design/ResourceIcon';
 
 import { AppSubKind } from 'teleport/services/apps';
diff --git a/web/packages/shared/components/UnifiedResources/shared/viewItemsFactory.ts b/web/packages/shared/components/UnifiedResources/shared/viewItemsFactory.ts
index 9a70b5951a329..3eaf6082b4de8 100644
--- a/web/packages/shared/components/UnifiedResources/shared/viewItemsFactory.ts
+++ b/web/packages/shared/components/UnifiedResources/shared/viewItemsFactory.ts
@@ -19,27 +19,25 @@
 import {
   Application as ApplicationIcon,
   Database as DatabaseIcon,
+  Desktop as DesktopIcon,
   Kubernetes as KubernetesIcon,
   Server as ServerIcon,
-  Desktop as DesktopIcon,
 } from 'design/Icon';
 import { ResourceIconName } from 'design/ResourceIcon';
-
-import { DbProtocol } from 'shared/services/databases';
 import { NodeSubKind } from 'shared/services';
+import { DbProtocol } from 'shared/services/databases';
 
 import {
-  UnifiedResourceViewItem,
-  UnifiedResourceUi,
-  UnifiedResourceNode,
+  SharedUnifiedResource,
   UnifiedResourceApp,
   UnifiedResourceDatabase,
   UnifiedResourceDesktop,
   UnifiedResourceKube,
+  UnifiedResourceNode,
+  UnifiedResourceUi,
   UnifiedResourceUserGroup,
-  SharedUnifiedResource,
+  UnifiedResourceViewItem,
 } from '../types';
-
 import { guessAppIcon } from './guessAppIcon';
 
 export function makeUnifiedResourceViewItemNode(
diff --git a/web/packages/shared/components/UnifiedResources/types.ts b/web/packages/shared/components/UnifiedResources/types.ts
index 500c57f423795..9c47a0dc64bfd 100644
--- a/web/packages/shared/components/UnifiedResources/types.ts
+++ b/web/packages/shared/components/UnifiedResources/types.ts
@@ -18,14 +18,13 @@
 
 import React from 'react';
 
-import { ResourceLabel } from 'teleport/services/agents';
-
-import { ResourceIconName } from 'design/ResourceIcon';
 import { Icon } from 'design/Icon';
-import { AppSubKind, PermissionSet } from 'teleport/services/apps';
-
-import { DbProtocol } from 'shared/services/databases';
+import { ResourceIconName } from 'design/ResourceIcon';
 import { NodeSubKind } from 'shared/services';
+import { DbProtocol } from 'shared/services/databases';
+
+import { ResourceLabel } from 'teleport/services/agents';
+import { AppSubKind, PermissionSet } from 'teleport/services/apps';
 
 export type UnifiedResourceApp = {
   kind: 'app';
diff --git a/web/packages/shared/components/Validation/Validation.test.tsx b/web/packages/shared/components/Validation/Validation.test.tsx
index 454ebbef60b16..95f6233d18009 100644
--- a/web/packages/shared/components/Validation/Validation.test.tsx
+++ b/web/packages/shared/components/Validation/Validation.test.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen, act } from 'design/utils/testing';
+import { act, fireEvent, render, screen } from 'design/utils/testing';
 
-import Validator, { Result, Validation, useValidation } from './Validation';
+import Validator, { Result, useValidation, Validation } from './Validation';
 
 afterEach(() => {
   jest.restoreAllMocks();
diff --git a/web/packages/shared/components/Validation/Validation.tsx b/web/packages/shared/components/Validation/Validation.tsx
index 6450c2915a61d..952428fa42363 100644
--- a/web/packages/shared/components/Validation/Validation.tsx
+++ b/web/packages/shared/components/Validation/Validation.tsx
@@ -19,9 +19,8 @@
 import React from 'react';
 
 import { Logger } from 'design/logger';
-
-import { isObject } from 'shared/utils/highbar';
 import { Store, useStore } from 'shared/libs/stores';
+import { isObject } from 'shared/utils/highbar';
 
 import { ValidationResult } from './rules';
 
diff --git a/web/packages/shared/components/Validation/index.ts b/web/packages/shared/components/Validation/index.ts
index e94dd2bf13a88..956b9d15eaed7 100644
--- a/web/packages/shared/components/Validation/index.ts
+++ b/web/packages/shared/components/Validation/index.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Validator, { Validation, useValidation } from './Validation';
 import useRule from './useRule';
+import Validator, { useValidation, Validation } from './Validation';
 
 export default Validation;
 
diff --git a/web/packages/shared/components/Validation/rules.test.ts b/web/packages/shared/components/Validation/rules.test.ts
index 07ee1bf434d01..827264949d559 100644
--- a/web/packages/shared/components/Validation/rules.test.ts
+++ b/web/packages/shared/components/Validation/rules.test.ts
@@ -17,16 +17,16 @@
  */
 
 import {
-  requiredToken,
-  requiredPassword,
+  arrayOf,
   requiredConfirmedPassword,
-  requiredField,
-  requiredRoleArn,
   requiredEmailLike,
+  requiredField,
   requiredIamRoleName,
+  requiredPassword,
   requiredPort,
+  requiredRoleArn,
+  requiredToken,
   runRules,
-  arrayOf,
 } from './rules';
 
 describe('requiredField', () => {
diff --git a/web/packages/shared/components/Validation/useRule.js b/web/packages/shared/components/Validation/useRule.js
index 189862741968b..67fcb7b56ee3d 100644
--- a/web/packages/shared/components/Validation/useRule.js
+++ b/web/packages/shared/components/Validation/useRule.js
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 import Logger from '../../libs/logger';
-
 import { useValidation } from './Validation';
 
 const logger = Logger.create('validation');
diff --git a/web/packages/shared/components/Validation/useRule.test.js b/web/packages/shared/components/Validation/useRule.test.js
index 6aa5dfc889277..56dfadbc6e11d 100644
--- a/web/packages/shared/components/Validation/useRule.test.js
+++ b/web/packages/shared/components/Validation/useRule.test.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import Validation, { useRule } from '.';
 
diff --git a/web/packages/shared/components/Window/Window.tsx b/web/packages/shared/components/Window/Window.tsx
index b91069c729112..afdbf05702320 100644
--- a/web/packages/shared/components/Window/Window.tsx
+++ b/web/packages/shared/components/Window/Window.tsx
@@ -18,8 +18,8 @@
 
 import React from 'react';
 
-import { WindowTitleBar } from './WindowTitleBar';
 import { WindowContainer, WindowContentContainer } from './WindowComponents';
+import { WindowTitleBar } from './WindowTitleBar';
 
 interface WindowProps {
   title: string;
diff --git a/web/packages/shared/hooks/index.ts b/web/packages/shared/hooks/index.ts
index 0297e9ffb4b65..08865e722d859 100644
--- a/web/packages/shared/hooks/index.ts
+++ b/web/packages/shared/hooks/index.ts
@@ -18,9 +18,9 @@
 
 import useAttempt from './useAttempt';
 import useAttemptNext from './useAttemptNext';
-import { useRefAutoFocus } from './useRefAutoFocus';
-import { useInterval } from './useInterval';
 import { useInfiniteScroll } from './useInfiniteScroll';
+import { useInterval } from './useInterval';
+import { useRefAutoFocus } from './useRefAutoFocus';
 
 export {
   useAttempt,
diff --git a/web/packages/shared/hooks/useAsync.test.ts b/web/packages/shared/hooks/useAsync.test.ts
index 881268e302d19..f3da5fccb0465 100644
--- a/web/packages/shared/hooks/useAsync.test.ts
+++ b/web/packages/shared/hooks/useAsync.test.ts
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, act, waitFor } from '@testing-library/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
 
 import { wait } from 'shared/utils/wait';
 
 import {
-  useAsync,
-  CanceledError,
   Attempt,
+  CanceledError,
+  useAsync,
   useDelayedRepeatedAttempt,
 } from './useAsync';
 
diff --git a/web/packages/shared/hooks/useAsync.ts b/web/packages/shared/hooks/useAsync.ts
index 5452a9510faf2..be8267775374b 100644
--- a/web/packages/shared/hooks/useAsync.ts
+++ b/web/packages/shared/hooks/useAsync.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useCallback, useState, useRef, useEffect } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
 /**
  * `useAsync` lets you represent the state of an async operation as data. It accepts an async function
diff --git a/web/packages/shared/hooks/useAttempt.ts b/web/packages/shared/hooks/useAttempt.ts
index f9c5cc4897070..5d6df6d4db088 100644
--- a/web/packages/shared/hooks/useAttempt.ts
+++ b/web/packages/shared/hooks/useAttempt.ts
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useMemo } from 'react';
+import { useMemo, useState } from 'react';
 
 import Logger from 'shared/libs/logger';
+
 const logger = Logger.create('shared/hooks/useAttempt');
 
 const defaultState = {
diff --git a/web/packages/shared/hooks/useAttemptNext.ts b/web/packages/shared/hooks/useAttemptNext.ts
index e101510a15e37..badcd470298e4 100644
--- a/web/packages/shared/hooks/useAttemptNext.ts
+++ b/web/packages/shared/hooks/useAttemptNext.ts
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from 'react';
 
 import Logger from 'shared/libs/logger';
+
 const logger = Logger.create('shared/hooks/useAttempt');
 
 // This is the next version of existing useAttempt hook
diff --git a/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.test.tsx b/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.test.tsx
index bbe982ee01904..cf43cf2683e05 100644
--- a/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.test.tsx
+++ b/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.test.tsx
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, act } from '@testing-library/react';
-import { render, screen } from 'design/utils/testing';
+import { act, renderHook } from '@testing-library/react';
 import { mockIntersectionObserver } from 'jsdom-testing-mocks';
 
+import { render, screen } from 'design/utils/testing';
+
 import { useInfiniteScroll } from './useInfiniteScroll';
 
 const mio = mockIntersectionObserver();
diff --git a/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.ts b/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.ts
index 2e90f6153339d..c8f9376849fdd 100644
--- a/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.ts
+++ b/web/packages/shared/hooks/useInfiniteScroll/useInfiniteScroll.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useLayoutEffect, useRef, useCallback } from 'react';
+import { useCallback, useLayoutEffect, useRef } from 'react';
 
 /**
  * Calls fetch function whenever the `trigger` element intersects the
diff --git a/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.test.ts b/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.test.ts
index c7a72f8c9e944..92dbca79b95f0 100644
--- a/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.test.ts
+++ b/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.test.ts
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, act } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react';
 
 import { ApiError } from 'teleport/services/api/parseError';
-
 import { Node } from 'teleport/services/nodes';
 
+import { newFetchFunc, resourceClusterIds, resourceNames } from './testUtils';
 import {
-  useKeyBasedPagination,
   KeyBasedPaginationOptions,
+  useKeyBasedPagination,
 } from './useKeyBasedPagination';
-import { newFetchFunc, resourceClusterIds, resourceNames } from './testUtils';
 
 function hookProps(overrides: Partial<KeyBasedPaginationOptions<Node>> = {}) {
   return {
diff --git a/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.ts b/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.ts
index 440bc7cc5cbb1..be15d3a2a3077 100644
--- a/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.ts
+++ b/web/packages/shared/hooks/useInfiniteScroll/useKeyBasedPagination.ts
@@ -17,19 +17,19 @@
  */
 
 import {
-  useState,
-  useRef,
-  useCallback,
   MutableRefObject,
+  useCallback,
   useEffect,
+  useRef,
+  useState,
 } from 'react';
 
-import { ResourcesResponse } from 'teleport/services/agents';
-import { ApiError } from 'teleport/services/api/parseError';
-
 import { Attempt } from 'shared/hooks/useAttemptNext';
 import { isAbortError } from 'shared/utils/abortError';
 
+import { ResourcesResponse } from 'teleport/services/agents';
+import { ApiError } from 'teleport/services/api/parseError';
+
 /**
  * Supports fetching more data from the server when more data is available. Pass
  * a `fetchFunc` that retrieves a single batch of data. After the initial
diff --git a/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.test.tsx b/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.test.tsx
index 738f89619a14d..471e9958927a4 100644
--- a/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.test.tsx
+++ b/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.test.tsx
@@ -18,7 +18,7 @@
 
 import { useState } from 'react';
 
-import { render, screen, fireEvent } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { useRefClickOutside } from './useRefClickOutside';
 
diff --git a/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.ts b/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.ts
index 7e2d2b1afc31a..386e9c29c2e83 100644
--- a/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.ts
+++ b/web/packages/shared/hooks/useRefClickOutside/useRefClickOutside.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MutableRefObject, useEffect, useRef, useCallback } from 'react';
+import { MutableRefObject, useCallback, useEffect, useRef } from 'react';
 
 // IGNORE_CLICK_CLASSNAME is the className that should be on elements which shouldn't trigger setOpen(false).
 export const IGNORE_CLICK_CLASSNAME = 'ignore-click';
diff --git a/web/packages/shared/libs/mergeRefs.test.tsx b/web/packages/shared/libs/mergeRefs.test.tsx
index ce71e0e13228c..f6436723b795b 100644
--- a/web/packages/shared/libs/mergeRefs.test.tsx
+++ b/web/packages/shared/libs/mergeRefs.test.tsx
@@ -20,8 +20,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. */
 
-import React, { useImperativeHandle, forwardRef } from 'react';
 import { render } from '@testing-library/react';
+import React, { forwardRef, useImperativeHandle } from 'react';
 
 import { mergeRefs } from './mergeRefs';
 
diff --git a/web/packages/shared/libs/stores/useStore.test.tsx b/web/packages/shared/libs/stores/useStore.test.tsx
index 1abb48744cd5c..37d5033fb5ff1 100644
--- a/web/packages/shared/libs/stores/useStore.test.tsx
+++ b/web/packages/shared/libs/stores/useStore.test.tsx
@@ -18,8 +18,8 @@
 
 import { act, render } from 'design/utils/testing';
 
-import useStore from './useStore';
 import Store from './store';
+import useStore from './useStore';
 
 test('components subscribes to store changes and unsubscribes on unmount', async () => {
   const store = new Store();
diff --git a/web/packages/shared/libs/stores/useStore.ts b/web/packages/shared/libs/stores/useStore.ts
index bf6aa9cbe0451..56be41406c2e6 100644
--- a/web/packages/shared/libs/stores/useStore.ts
+++ b/web/packages/shared/libs/stores/useStore.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useMemo, useEffect } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import Store from './store';
 
diff --git a/web/packages/shared/utils/base64/index.ts b/web/packages/shared/utils/base64/index.ts
index 9ab93b8d5f4e3..9446195bcc34b 100644
--- a/web/packages/shared/utils/base64/index.ts
+++ b/web/packages/shared/utils/base64/index.ts
@@ -18,6 +18,7 @@
 
 import { arrayBufferToBase64, base64ToArrayBuffer } from './base64-arraybuffer';
 import { base64urlToBuffer, bufferToBase64url } from './base64url-arraybuffer';
+
 export {
   arrayBufferToBase64,
   base64ToArrayBuffer,
diff --git a/web/packages/shared/utils/text.test.ts b/web/packages/shared/utils/text.test.ts
index a76bb90fbb594..97ba838862aaa 100644
--- a/web/packages/shared/utils/text.test.ts
+++ b/web/packages/shared/utils/text.test.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { pluralize, capitalizeFirstLetter, listToSentence } from './text';
+import { capitalizeFirstLetter, listToSentence, pluralize } from './text';
 
 test('pluralize', () => {
   expect(pluralize(0, 'apple')).toBe('apples');
diff --git a/web/packages/shared/utils/wait.ts b/web/packages/shared/utils/wait.ts
index 3f64695227310..477f855bf12f2 100644
--- a/web/packages/shared/utils/wait.ts
+++ b/web/packages/shared/utils/wait.ts
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { useRef, useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 
 /** Resolves after a given duration. */
 export function wait(ms: number, abortSignal?: AbortSignal): Promise<void> {
diff --git a/web/packages/teleport/src/AccessRequests/AccessRequests.story.tsx b/web/packages/teleport/src/AccessRequests/AccessRequests.story.tsx
index f67b6bae97437..deeb784468a9f 100644
--- a/web/packages/teleport/src/AccessRequests/AccessRequests.story.tsx
+++ b/web/packages/teleport/src/AccessRequests/AccessRequests.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LockedAccessRequests } from 'teleport/AccessRequests/LockedAccessRequests/LockedAccessRequests';
 import { ContextProvider } from 'teleport';
+import { LockedAccessRequests } from 'teleport/AccessRequests/LockedAccessRequests/LockedAccessRequests';
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 export default {
diff --git a/web/packages/teleport/src/AccessRequests/LockedAccessRequests/LockedAccessRequests.tsx b/web/packages/teleport/src/AccessRequests/LockedAccessRequests/LockedAccessRequests.tsx
index 741f3ee5de5b3..ee55129bdcde2 100644
--- a/web/packages/teleport/src/AccessRequests/LockedAccessRequests/LockedAccessRequests.tsx
+++ b/web/packages/teleport/src/AccessRequests/LockedAccessRequests/LockedAccessRequests.tsx
@@ -18,15 +18,15 @@
 
 import React from 'react';
 import styled from 'styled-components';
+
 import { Box, Card, Flex, H2, Image, Link, Subtitle2, Text } from 'design';
 
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
-
 import { CtaEvent } from 'teleport/services/userEvent';
 
 import step1 from './assets/step1.png';
diff --git a/web/packages/teleport/src/AccessRequests/service.ts b/web/packages/teleport/src/AccessRequests/service.ts
index 03b7e158d3f3b..b221d6ddaa51a 100644
--- a/web/packages/teleport/src/AccessRequests/service.ts
+++ b/web/packages/teleport/src/AccessRequests/service.ts
@@ -20,8 +20,6 @@ import { formatDuration } from 'date-fns';
 
 import { RequestableResourceKind } from 'shared/components/AccessRequests/NewRequest/resource';
 
-import api from 'teleport/services/api';
-import cfg from 'teleport/config';
 import {
   AccessRequest,
   AccessRequestResource,
@@ -29,6 +27,8 @@ import {
   DurationOption,
 } from 'teleport/AccessRequests/types';
 import { middleValues } from 'teleport/AccessRequests/utils';
+import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 export async function createAccessRequest(
   clusterId: string,
diff --git a/web/packages/teleport/src/AccessRequests/types.ts b/web/packages/teleport/src/AccessRequests/types.ts
index de08d61605961..7d06636b86e64 100644
--- a/web/packages/teleport/src/AccessRequests/types.ts
+++ b/web/packages/teleport/src/AccessRequests/types.ts
@@ -17,7 +17,6 @@
  */
 
 import { RequestableResourceKind } from 'shared/components/AccessRequests/NewRequest/resource';
-
 import type { Option } from 'shared/components/Select';
 
 export type DurationOption = Option<number>;
diff --git a/web/packages/teleport/src/Account/Account.story.tsx b/web/packages/teleport/src/Account/Account.story.tsx
index 2710c711d1741..4d364bc2d31f3 100644
--- a/web/packages/teleport/src/Account/Account.story.tsx
+++ b/web/packages/teleport/src/Account/Account.story.tsx
@@ -18,9 +18,8 @@
 
 import { useEffect } from 'react';
 
-import { PasswordState } from 'teleport/services/user';
-
 import cfg from 'teleport/config';
+import { PasswordState } from 'teleport/services/user';
 
 import { Account, AccountProps } from './Account';
 
diff --git a/web/packages/teleport/src/Account/Account.test.tsx b/web/packages/teleport/src/Account/Account.test.tsx
index e8e3ae37b9ea0..24ba0c22eec98 100644
--- a/web/packages/teleport/src/Account/Account.test.tsx
+++ b/web/packages/teleport/src/Account/Account.test.tsx
@@ -17,19 +17,18 @@
  */
 
 import { within } from '@testing-library/react';
-import { render, screen, waitFor } from 'design/utils/testing';
-
 import userEvent from '@testing-library/user-event';
 
-import { ContextProvider } from 'teleport';
-import TeleportContext from 'teleport/teleportContext';
+import { render, screen, waitFor } from 'design/utils/testing';
 
+import { ContextProvider } from 'teleport';
 import { AccountPage as Account } from 'teleport/Account/Account';
 import cfg from 'teleport/config';
 import { createTeleportContext } from 'teleport/mocks/contexts';
 import auth from 'teleport/services/auth/auth';
 import MfaService, { MfaDevice } from 'teleport/services/mfa';
 import { PasswordState } from 'teleport/services/user';
+import TeleportContext from 'teleport/teleportContext';
 
 const defaultAuthType = cfg.auth.second_factor;
 const defaultPasswordless = cfg.auth.allowPasswordless;
diff --git a/web/packages/teleport/src/Account/Account.tsx b/web/packages/teleport/src/Account/Account.tsx
index db0fbff3d46a6..4b3bac9508a27 100644
--- a/web/packages/teleport/src/Account/Account.tsx
+++ b/web/packages/teleport/src/Account/Account.tsx
@@ -17,41 +17,38 @@
  */
 
 import React, { useState } from 'react';
-import { Box, Flex, H2, Indicator, Subtitle2 } from 'design';
 import styled, { useTheme } from 'styled-components';
-import { Attempt } from 'shared/hooks/useAttemptNext';
+
+import { Box, Flex, H2, Indicator, Subtitle2 } from 'design';
 import * as Icon from 'design/Icon';
 import {
   Notification,
   NotificationItem,
   NotificationSeverity,
 } from 'shared/components/Notification';
-
+import { Attempt } from 'shared/hooks/useAttemptNext';
 import { useStore } from 'shared/libs/stores';
 
-import useTeleport from 'teleport/useTeleport';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-
 import cfg from 'teleport/config';
-
-import { PasswordState } from 'teleport/services/user';
-
 import { DeviceUsage } from 'teleport/services/mfa';
+import { PasswordState } from 'teleport/services/user';
+import useTeleport from 'teleport/useTeleport';
 
+import { ActionButtonPrimary, ActionButtonSecondary, Header } from './Header';
 import { AuthDeviceList } from './ManageDevices/AuthDeviceList/AuthDeviceList';
 import useManageDevices, {
   State as ManageDevicesState,
 } from './ManageDevices/useManageDevices';
-import { ActionButtonPrimary, ActionButtonSecondary, Header } from './Header';
-import { PasswordBox } from './PasswordBox';
 import {
   AddAuthDeviceWizard,
   DeleteAuthDeviceWizard,
 } from './ManageDevices/wizards';
+import { PasswordBox } from './PasswordBox';
 import { StatePill } from './StatePill';
 
 export interface EnterpriseComponentProps {
diff --git a/web/packages/teleport/src/Account/AccountNew.ts b/web/packages/teleport/src/Account/AccountNew.ts
index f7700447856ef..cac7a19d7fb0d 100644
--- a/web/packages/teleport/src/Account/AccountNew.ts
+++ b/web/packages/teleport/src/Account/AccountNew.ts
@@ -19,6 +19,7 @@
 // Compatibility aliases to prevent e/ from breaking.
 // TODO(bl-nero): Remove these once e/ stops referring to them.
 import { Account } from './Account';
+
 export type { EnterpriseComponentProps } from './Account';
 
 export default Account;
diff --git a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.story.tsx b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.story.tsx
index f1e75a42b6e31..fa209f4295c19 100644
--- a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.story.tsx
+++ b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.story.tsx
@@ -20,8 +20,8 @@ import Dialog from 'design/Dialog';
 import { makeEmptyAttempt } from 'shared/hooks/useAsync';
 
 import { ContextProvider } from 'teleport';
+import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
 import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import {
   MFA_OPTION_SSO_DEFAULT,
   MFA_OPTION_TOTP,
@@ -29,8 +29,6 @@ import {
   WebauthnAssertionResponse,
 } from 'teleport/services/mfa';
 
-import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
-
 import {
   ChangePasswordStep,
   ChangePasswordWizardStepProps,
diff --git a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.test.tsx b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.test.tsx
index e7212af322784..93fb7c4be6f0b 100644
--- a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.test.tsx
+++ b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.test.tsx
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
-
 import { waitFor, within } from '@testing-library/react';
 import { userEvent, UserEvent } from '@testing-library/user-event';
 
-import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
+import { render, screen } from 'design/utils/testing';
 
+import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
 import {
   MFA_OPTION_TOTP,
   MFA_OPTION_WEBAUTHN,
   MfaChallengeResponse,
 } from 'teleport/services/mfa';
 
+import { ChangePasswordWizard } from '.';
 import {
   ChangePasswordWizardProps,
   getReauthOptions,
@@ -36,8 +36,6 @@ import {
   REAUTH_OPTION_WEBAUTHN,
 } from './ChangePasswordWizard';
 
-import { ChangePasswordWizard } from '.';
-
 const dummyChallengeResponse: MfaChallengeResponse = {
   webauthn_response: {
     id: 'cred-id',
diff --git a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.tsx b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.tsx
index 4d4f40a4f49c4..738b88890b2dd 100644
--- a/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.tsx
+++ b/web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.tsx
@@ -16,13 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { useCallback, useEffect, useState } from 'react';
+import styled from 'styled-components';
+
 import { Alert, OutlineDanger } from 'design/Alert/Alert';
+import Box from 'design/Box';
 import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 import Dialog from 'design/Dialog';
 import Flex from 'design/Flex';
+import Indicator from 'design/Indicator';
 import { RadioGroup } from 'design/RadioGroup';
 import { StepComponentProps, StepHeader, StepSlider } from 'design/StepSlider';
-import React, { useCallback, useEffect, useState } from 'react';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
 import {
@@ -31,11 +35,6 @@ import {
   requiredPassword,
 } from 'shared/components/Validation/rules';
 import { useAsync } from 'shared/hooks/useAsync';
-import styled from 'styled-components';
-
-import Box from 'design/Box';
-
-import Indicator from 'design/Indicator';
 
 import useReAuthenticate, {
   ReauthState,
diff --git a/web/packages/teleport/src/Account/Header.tsx b/web/packages/teleport/src/Account/Header.tsx
index fd71dd4437f84..e14d68b650e9d 100644
--- a/web/packages/teleport/src/Account/Header.tsx
+++ b/web/packages/teleport/src/Account/Header.tsx
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React from 'react';
+import styled, { css, useTheme } from 'styled-components';
+
 import {
   Box,
   ButtonPrimary,
@@ -25,8 +28,6 @@ import {
   Indicator,
   Subtitle2,
 } from 'design';
-import React from 'react';
-import styled, { useTheme, css } from 'styled-components';
 
 export interface HeaderProps {
   title: React.ReactNode;
diff --git a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.story.tsx b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.story.tsx
index c9909a70a85e9..3a4851c26b7a5 100644
--- a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.story.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.story.tsx
@@ -19,7 +19,6 @@
 import * as Icon from 'design/Icon';
 
 import { ActionButtonSecondary, Header } from 'teleport/Account/Header';
-
 import { MfaDevice } from 'teleport/services/mfa';
 
 import { AuthDeviceList } from './AuthDeviceList';
diff --git a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.test.tsx b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.test.tsx
index 6811f9aad3137..caffe75a48bd0 100644
--- a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.test.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import { within } from '@testing-library/react';
 
+import { render, screen } from 'design/utils/testing';
+
 import { MfaDevice } from 'teleport/services/mfa';
 
 import { AuthDeviceList } from './AuthDeviceList';
diff --git a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.tsx b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.tsx
index ed1b94964ea8b..1d451f518905a 100644
--- a/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/AuthDeviceList/AuthDeviceList.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Cell, DateCell } from 'design/DataTable';
-import Table from 'design/DataTable/Table';
 import React from 'react';
-
 import styled from 'styled-components';
-import { MultiRowBox, Row } from 'design/MultiRowBox';
-import * as Icon from 'design/Icon';
+
 import { ButtonWarningBorder } from 'design/Button/Button';
+import { Cell, DateCell } from 'design/DataTable';
+import Table from 'design/DataTable/Table';
+import * as Icon from 'design/Icon';
+import { MultiRowBox, Row } from 'design/MultiRowBox';
 
 import { MfaDevice } from 'teleport/services/mfa';
 
diff --git a/web/packages/teleport/src/Account/ManageDevices/useManageDevices.ts b/web/packages/teleport/src/Account/ManageDevices/useManageDevices.ts
index 1ff3f7ba594e6..36c07541846e3 100644
--- a/web/packages/teleport/src/Account/ManageDevices/useManageDevices.ts
+++ b/web/packages/teleport/src/Account/ManageDevices/useManageDevices.ts
@@ -17,6 +17,7 @@
  */
 
 import { useEffect, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import cfg from 'teleport/config';
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.story.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.story.tsx
index 92590ac5b5cdc..57ec217fdc890 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.story.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.story.tsx
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Dialog from 'design/Dialog';
-
 import { delay, http, HttpResponse } from 'msw';
 
+import Dialog from 'design/Dialog';
 import { makeEmptyAttempt } from 'shared/hooks/useAsync';
 
+import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
+import cfg from 'teleport/config';
 import { ContextProvider } from 'teleport/index';
 import { createTeleportContext } from 'teleport/mocks/contexts';
-
-import cfg from 'teleport/config';
-
 import {
   DeviceUsage,
   MFA_OPTION_SSO_DEFAULT,
@@ -34,8 +32,6 @@ import {
   MFA_OPTION_WEBAUTHN,
 } from 'teleport/services/mfa';
 
-import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
-
 import {
   AddAuthDeviceWizardStepProps,
   CreateDeviceStep,
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.test.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.test.tsx
index 96a2fc05a404f..47a4bb0366ee2 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.test.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.test.tsx
@@ -16,19 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
-
 import { waitFor } from '@testing-library/react';
 import { userEvent, UserEvent } from '@testing-library/user-event';
 
+import { render, screen } from 'design/utils/testing';
+
 import { ContextProvider } from 'teleport';
 import auth from 'teleport/services/auth';
 import MfaService from 'teleport/services/mfa';
 import TeleportContext from 'teleport/teleportContext';
 
-import { AddAuthDeviceWizardStepProps } from './AddAuthDeviceWizard';
-
 import { AddAuthDeviceWizard } from '.';
+import { AddAuthDeviceWizardStepProps } from './AddAuthDeviceWizard';
 
 const dummyCredential: Credential = { id: 'cred-id', type: 'public-key' };
 let ctx: TeleportContext;
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.tsx
index bbce32df63f98..86805cb82dd0c 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.tsx
@@ -16,15 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { FormEvent, useEffect, useState } from 'react';
+
 import { Alert, OutlineDanger } from 'design/Alert/Alert';
+import Box from 'design/Box';
 import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 import Dialog from 'design/Dialog';
 import Flex from 'design/Flex';
 import Image from 'design/Image';
 import Indicator from 'design/Indicator';
 import { RadioGroup } from 'design/RadioGroup';
-import { StepComponentProps, StepSlider } from 'design/StepSlider';
-import React, { FormEvent, useEffect, useState } from 'react';
+import { StepComponentProps, StepHeader, StepSlider } from 'design/StepSlider';
+import { P } from 'design/Text/Text';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
@@ -32,26 +35,17 @@ import { useAsync } from 'shared/hooks/useAsync';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { Auth2faType } from 'shared/services';
 
-import Box from 'design/Box';
-
-import { StepHeader } from 'design/StepSlider';
-
-import { P } from 'design/Text/Text';
-
+import useReAuthenticate from 'teleport/components/ReAuthenticate/useReAuthenticate';
 import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
-import useTeleport from 'teleport/useTeleport';
-
 import {
   DeviceType,
   DeviceUsage,
   getMfaRegisterOptions,
   MfaOption,
 } from 'teleport/services/mfa';
-
-import useReAuthenticate from 'teleport/components/ReAuthenticate/useReAuthenticate';
+import useTeleport from 'teleport/useTeleport';
 
 import { PasskeyBlurb } from '../../../components/Passkeys/PasskeyBlurb';
-
 import {
   ReauthenticateStep,
   ReauthenticateStepProps,
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.story.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.story.tsx
index f11ab78da7cf0..db3730f2f8531 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.story.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.story.tsx
@@ -17,12 +17,11 @@
  */
 
 import Dialog from 'design/Dialog';
-
 import { makeEmptyAttempt } from 'shared/hooks/useAsync';
 
+import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
 import { ContextProvider } from 'teleport/index';
 import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import {
   MFA_OPTION_SSO_DEFAULT,
   MFA_OPTION_TOTP,
@@ -30,8 +29,6 @@ import {
   MfaDevice,
 } from 'teleport/services/mfa';
 
-import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
-
 import {
   DeleteAuthDeviceWizardStepProps,
   DeleteDeviceStep,
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.test.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.test.tsx
index dd780c4f3996f..5cc4f0d63d7bb 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.test.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.test.tsx
@@ -16,21 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
-
 import { waitFor } from '@testing-library/react';
 import { userEvent, UserEvent } from '@testing-library/user-event';
 
-import TeleportContext from 'teleport/teleportContext';
+import { render, screen } from 'design/utils/testing';
+
 import { ContextProvider } from 'teleport';
-import MfaService from 'teleport/services/mfa';
 import auth from 'teleport/services/auth';
-
-import { DeleteAuthDeviceWizardStepProps } from './DeleteAuthDeviceWizard';
-
-import { dummyPasskey, dummyHardwareDevice } from './deviceCases';
+import MfaService from 'teleport/services/mfa';
+import TeleportContext from 'teleport/teleportContext';
 
 import { DeleteAuthDeviceWizard } from '.';
+import { DeleteAuthDeviceWizardStepProps } from './DeleteAuthDeviceWizard';
+import { dummyHardwareDevice, dummyPasskey } from './deviceCases';
 
 let ctx: TeleportContext;
 let user: UserEvent;
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.tsx
index 13d6e8a67ae73..a45cdbfb1317a 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/DeleteAuthDeviceWizard.tsx
@@ -16,25 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { useState } from 'react';
+
 import { Alert, OutlineDanger } from 'design/Alert/Alert';
+import Box from 'design/Box';
 import { ButtonSecondary, ButtonWarning } from 'design/Button';
 import Dialog from 'design/Dialog';
 import Flex from 'design/Flex';
+import Indicator from 'design/Indicator';
 import { StepComponentProps, StepHeader, StepSlider } from 'design/StepSlider';
-import { useState } from 'react';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import Box from 'design/Box';
-
-import Indicator from 'design/Indicator';
-
-import useTeleport from 'teleport/useTeleport';
-
-import { MfaDevice } from 'teleport/services/mfa';
-
 import useReAuthenticate from 'teleport/components/ReAuthenticate/useReAuthenticate';
-
 import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
+import { MfaDevice } from 'teleport/services/mfa';
+import useTeleport from 'teleport/useTeleport';
 
 import {
   ReauthenticateStep,
diff --git a/web/packages/teleport/src/Account/ManageDevices/wizards/ReauthenticateStep.tsx b/web/packages/teleport/src/Account/ManageDevices/wizards/ReauthenticateStep.tsx
index 5dd0fd28eafb5..cbbe567e61716 100644
--- a/web/packages/teleport/src/Account/ManageDevices/wizards/ReauthenticateStep.tsx
+++ b/web/packages/teleport/src/Account/ManageDevices/wizards/ReauthenticateStep.tsx
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { FormEvent, useState } from 'react';
+
 import { OutlineDanger } from 'design/Alert/Alert';
+import Box from 'design/Box';
 import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 import Flex from 'design/Flex';
 import { RadioGroup } from 'design/RadioGroup';
 import { StepComponentProps, StepHeader } from 'design/StepSlider';
-import React, { FormEvent, useState } from 'react';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 
-import Box from 'design/Box';
-
 import { ReauthState } from 'teleport/components/ReAuthenticate/useReAuthenticate';
 import { DeviceType } from 'teleport/services/mfa';
 
diff --git a/web/packages/teleport/src/Account/PasswordBox.tsx b/web/packages/teleport/src/Account/PasswordBox.tsx
index ea136156d0120..3c73ea1d6b164 100644
--- a/web/packages/teleport/src/Account/PasswordBox.tsx
+++ b/web/packages/teleport/src/Account/PasswordBox.tsx
@@ -16,21 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, Flex } from 'design';
-import { SingleRowBox } from 'design/MultiRowBox';
 import { useState } from 'react';
 
+import { Box, Flex } from 'design';
 import * as Icon from 'design/Icon';
+import { SingleRowBox } from 'design/MultiRowBox';
 
 import cfg from 'teleport/config';
-
 import { MfaDevice } from 'teleport/services/mfa';
-
 import { PasswordState } from 'teleport/services/user';
 
-import { ActionButtonSecondary, Header } from './Header';
 import { ChangePasswordWizard } from './ChangePasswordWizard';
-import { StatePill, AuthMethodState } from './StatePill';
+import { ActionButtonSecondary, Header } from './Header';
+import { AuthMethodState, StatePill } from './StatePill';
 
 export interface PasswordBoxProps {
   devices: MfaDevice[];
diff --git a/web/packages/teleport/src/AppLauncher/AppLauncher.test.tsx b/web/packages/teleport/src/AppLauncher/AppLauncher.test.tsx
index ae561d4950532..e3fe262676e14 100644
--- a/web/packages/teleport/src/AppLauncher/AppLauncher.test.tsx
+++ b/web/packages/teleport/src/AppLauncher/AppLauncher.test.tsx
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, waitFor, screen } from 'design/utils/testing';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
 
+import { render, screen, waitFor } from 'design/utils/testing';
+
 import { Route } from 'teleport/components/Router';
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 import service from 'teleport/services/apps';
 
 import { AppLauncher } from './AppLauncher';
diff --git a/web/packages/teleport/src/AppLauncher/AppLauncher.tsx b/web/packages/teleport/src/AppLauncher/AppLauncher.tsx
index 97d3559bb6365..31e15074dd638 100644
--- a/web/packages/teleport/src/AppLauncher/AppLauncher.tsx
+++ b/web/packages/teleport/src/AppLauncher/AppLauncher.tsx
@@ -17,13 +17,10 @@
  */
 
 import { useCallback, useEffect } from 'react';
-
 import { useLocation, useParams } from 'react-router';
 
 import { Flex, Indicator } from 'design';
-
 import { AccessDenied } from 'design/CardError';
-
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { UrlLauncherParams } from 'teleport/config';
diff --git a/web/packages/teleport/src/Apps/AddApp/AddApp.tsx b/web/packages/teleport/src/Apps/AddApp/AddApp.tsx
index 7d158017aa93d..b40735fbce53d 100644
--- a/web/packages/teleport/src/Apps/AddApp/AddApp.tsx
+++ b/web/packages/teleport/src/Apps/AddApp/AddApp.tsx
@@ -18,16 +18,13 @@
 
 import { Flex } from 'design';
 import Dialog, { DialogTitle } from 'design/Dialog';
-
 import * as Icons from 'design/Icon';
 
-import useTeleport from 'teleport/useTeleport';
-
 import { TabIcon } from 'teleport/components/TabIcon';
-
-import { Manually } from './Manually';
+import useTeleport from 'teleport/useTeleport';
 
 import { Automatically } from './Automatically';
+import { Manually } from './Manually';
 import useAddApp, { State } from './useAddApp';
 
 export default function Container(props: Props) {
diff --git a/web/packages/teleport/src/Apps/AddApp/Automatically.test.tsx b/web/packages/teleport/src/Apps/AddApp/Automatically.test.tsx
index c694a488e33cb..5761abdbcb42f 100644
--- a/web/packages/teleport/src/Apps/AddApp/Automatically.test.tsx
+++ b/web/packages/teleport/src/Apps/AddApp/Automatically.test.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { fireEvent, render, screen } from 'design/utils/testing';
-
 import { act } from '@testing-library/react';
 
+import { fireEvent, render, screen } from 'design/utils/testing';
+
 import { Automatically, createAppBashCommand } from './Automatically';
 
 test('render command only after form submit', async () => {
diff --git a/web/packages/teleport/src/Apps/AddApp/Automatically.tsx b/web/packages/teleport/src/Apps/AddApp/Automatically.tsx
index 6ebb40572a15b..de6669284f1ce 100644
--- a/web/packages/teleport/src/Apps/AddApp/Automatically.tsx
+++ b/web/packages/teleport/src/Apps/AddApp/Automatically.tsx
@@ -16,22 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, KeyboardEvent } from 'react';
+import { KeyboardEvent, useEffect, useState } from 'react';
+
 import {
-  Link,
-  Text,
-  Flex,
   Alert,
-  ButtonSecondary,
   ButtonPrimary,
+  ButtonSecondary,
+  Flex,
+  Link,
+  Text,
 } from 'design';
 import { DialogContent, DialogFooter } from 'design/Dialog';
-import Validation, { Validator } from 'shared/components/Validation';
 import FieldInput from 'shared/components/FieldInput';
+import Validation, { Validator } from 'shared/components/Validation';
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
-import cfg from 'teleport/config';
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
+import cfg from 'teleport/config';
 
 import { State } from './useAddApp';
 
diff --git a/web/packages/teleport/src/Apps/AddApp/Manually.tsx b/web/packages/teleport/src/Apps/AddApp/Manually.tsx
index b36d5b0f382f2..d39a773ac865a 100644
--- a/web/packages/teleport/src/Apps/AddApp/Manually.tsx
+++ b/web/packages/teleport/src/Apps/AddApp/Manually.tsx
@@ -17,17 +17,17 @@
  */
 
 import {
-  Text,
   Box,
+  ButtonLink,
   ButtonSecondary,
-  Link,
   Indicator,
-  ButtonLink,
+  Link,
+  Text,
 } from 'design';
 import { DialogContent, DialogFooter } from 'design/Dialog';
 
-import TextSelectCopy from 'teleport/components/TextSelectCopy';
 import DownloadLinks from 'teleport/components/DownloadLinks';
+import TextSelectCopy from 'teleport/components/TextSelectCopy';
 import cfg from 'teleport/config';
 
 import { State } from './useAddApp';
diff --git a/web/packages/teleport/src/Apps/AddApp/useAddApp.ts b/web/packages/teleport/src/Apps/AddApp/useAddApp.ts
index 314475e63909d..be04b6cba17fd 100644
--- a/web/packages/teleport/src/Apps/AddApp/useAddApp.ts
+++ b/web/packages/teleport/src/Apps/AddApp/useAddApp.ts
@@ -17,11 +17,11 @@
  */
 
 import { useEffect, useState } from 'react';
-import useAttempt from 'shared/hooks/useAttemptNext';
 
-import TeleportContext from 'teleport/teleportContext';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
 import type { JoinToken } from 'teleport/services/joinToken';
+import TeleportContext from 'teleport/teleportContext';
 
 export default function useAddApp(ctx: TeleportContext) {
   const { attempt, run } = useAttempt('');
diff --git a/web/packages/teleport/src/Audit/Audit.story.tsx b/web/packages/teleport/src/Audit/Audit.story.tsx
index c4bba0210fa2f..26bcb51268764 100644
--- a/web/packages/teleport/src/Audit/Audit.story.tsx
+++ b/web/packages/teleport/src/Audit/Audit.story.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Router } from 'react-router';
 
-import { ContextProvider, Context } from 'teleport';
+import { Context, ContextProvider } from 'teleport';
 
 import { AuditContainer as Audit } from './Audit';
 import EventList from './EventList';
diff --git a/web/packages/teleport/src/Audit/Audit.tsx b/web/packages/teleport/src/Audit/Audit.tsx
index 5865e84d9c6c4..e9f766eca2ec7 100644
--- a/web/packages/teleport/src/Audit/Audit.tsx
+++ b/web/packages/teleport/src/Audit/Audit.tsx
@@ -18,23 +18,21 @@
 
 import { useState } from 'react';
 
+import { Box, Indicator } from 'design';
 import { Danger } from 'design/Alert';
-import { Indicator, Box } from 'design';
 import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
 
+import { ExternalAuditStorageCta } from '@gravitational/teleport/src/components/ExternalAuditStorageCta';
 import RangePicker from 'teleport/components/EventRangePicker';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import useTeleport from 'teleport/useTeleport';
 import useStickyClusterId from 'teleport/useStickyClusterId';
-
-import { ExternalAuditStorageCta } from '@gravitational/teleport/src/components/ExternalAuditStorageCta';
+import useTeleport from 'teleport/useTeleport';
 
 import EventList from './EventList';
-
 import useAuditEvents, { State } from './useAuditEvents';
 
 export function AuditContainer() {
diff --git a/web/packages/teleport/src/Audit/EventDialog/EventDialog.tsx b/web/packages/teleport/src/Audit/EventDialog/EventDialog.tsx
index 8fe8f8d3ee1b2..a62d1fbb45060 100644
--- a/web/packages/teleport/src/Audit/EventDialog/EventDialog.tsx
+++ b/web/packages/teleport/src/Audit/EventDialog/EventDialog.tsx
@@ -17,15 +17,15 @@
  */
 
 import PropTypes from 'prop-types';
-import TextEditor from 'shared/components/TextEditor';
+
+import { ButtonSecondary } from 'design';
 import Dialog, {
+  DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogContent,
 } from 'design/Dialog';
-
-import { ButtonSecondary } from 'design';
+import TextEditor from 'shared/components/TextEditor';
 
 import { Event } from 'teleport/services/audit';
 
diff --git a/web/packages/teleport/src/Audit/EventDialog/index.ts b/web/packages/teleport/src/Audit/EventDialog/index.ts
index b831566f4be66..e2dfae41a85e7 100644
--- a/web/packages/teleport/src/Audit/EventDialog/index.ts
+++ b/web/packages/teleport/src/Audit/EventDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import EventDialog from './EventDialog';
+
 export default EventDialog;
diff --git a/web/packages/teleport/src/Audit/EventList/EventList.tsx b/web/packages/teleport/src/Audit/EventList/EventList.tsx
index edae1169f515e..b643d5d196d42 100644
--- a/web/packages/teleport/src/Audit/EventList/EventList.tsx
+++ b/web/packages/teleport/src/Audit/EventList/EventList.tsx
@@ -17,17 +17,16 @@
  */
 
 import { useState } from 'react';
+
 import { ButtonBorder, Flex } from 'design';
 import Table, { Cell } from 'design/DataTable';
 import { dateTimeMatcher } from 'design/utils/match';
 
 import { Event } from 'teleport/services/audit';
 
-import { State } from '../useAuditEvents';
 import EventDialog from '../EventDialog';
-
+import { State } from '../useAuditEvents';
 import renderTypeCell from './EventTypeCell';
-
 import { ViewInPolicyButton } from './ViewInPolicyButton';
 
 export default function EventList(props: Props) {
diff --git a/web/packages/teleport/src/Audit/EventList/EventListCells.tsx b/web/packages/teleport/src/Audit/EventList/EventListCells.tsx
index f142fc97b4e0a..5664da0b1da15 100644
--- a/web/packages/teleport/src/Audit/EventList/EventListCells.tsx
+++ b/web/packages/teleport/src/Audit/EventList/EventListCells.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Cell } from 'design/DataTable';
 import { ButtonBorder } from 'design';
+import { Cell } from 'design/DataTable';
 import { displayDateTime } from 'design/datetime';
 
 import { Event } from 'teleport/services/audit';
diff --git a/web/packages/teleport/src/Audit/EventList/EventTypeCell.tsx b/web/packages/teleport/src/Audit/EventList/EventTypeCell.tsx
index 3db495c91dd2c..3186bf636b6ab 100644
--- a/web/packages/teleport/src/Audit/EventList/EventTypeCell.tsx
+++ b/web/packages/teleport/src/Audit/EventList/EventTypeCell.tsx
@@ -17,10 +17,11 @@
  */
 
 import styled from 'styled-components';
+
 import { Cell } from 'design/DataTable';
 import * as Icons from 'design/Icon';
 
-import { eventCodes, Event, EventCode } from 'teleport/services/audit';
+import { Event, EventCode, eventCodes } from 'teleport/services/audit';
 
 const EventIconMap: Record<EventCode, any> = {
   [eventCodes.AUTH_ATTEMPT_FAILURE]: Icons.Info,
diff --git a/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.test.tsx b/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.test.tsx
index 1a58ab6cadb4e..2d06fa9f9cf1f 100644
--- a/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.test.tsx
+++ b/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.test.tsx
@@ -17,14 +17,13 @@
  */
 
 import { screen } from '@testing-library/react';
-
 import { MemoryRouter } from 'react-router';
 
 import { render } from 'design/utils/testing';
 
 import { ViewInPolicyButton } from 'teleport/Audit/EventList/ViewInPolicyButton';
-import { RawEvents } from 'teleport/services/audit';
 import cfg from 'teleport/config';
+import { RawEvents } from 'teleport/services/audit';
 
 import makeEvent from '../../services/audit/makeEvent';
 
diff --git a/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.tsx b/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.tsx
index 5cf4c0f68cf12..7849b17a91783 100644
--- a/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.tsx
+++ b/web/packages/teleport/src/Audit/EventList/ViewInPolicyButton.tsx
@@ -17,12 +17,11 @@
  */
 
 import { useMemo } from 'react';
+import { NavLink } from 'react-router-dom';
 
 import { ButtonBorder } from 'design';
-import { NavLink } from 'react-router-dom';
 
 import cfg from 'teleport/config';
-
 import {
   Event,
   EventCode,
diff --git a/web/packages/teleport/src/Audit/EventList/index.ts b/web/packages/teleport/src/Audit/EventList/index.ts
index b1c7ae9024079..71f0f5bbe025d 100644
--- a/web/packages/teleport/src/Audit/EventList/index.ts
+++ b/web/packages/teleport/src/Audit/EventList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import EventList from './EventList';
+
 export default EventList;
diff --git a/web/packages/teleport/src/Audit/useAuditEvents.ts b/web/packages/teleport/src/Audit/useAuditEvents.ts
index 0dba36b065ef1..bfd248755bfb9 100644
--- a/web/packages/teleport/src/Audit/useAuditEvents.ts
+++ b/web/packages/teleport/src/Audit/useAuditEvents.ts
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import Ctx from 'teleport/teleportContext';
 import {
-  getRangeOptions,
   EventRange,
+  getRangeOptions,
 } from 'teleport/components/EventRangePicker';
 import { Event, EventCode, formatters } from 'teleport/services/audit';
+import Ctx from 'teleport/teleportContext';
 
 export default function useAuditEvents(
   ctx: Ctx,
diff --git a/web/packages/teleport/src/AuthConnectors/AuthConnectorTile.tsx b/web/packages/teleport/src/AuthConnectors/AuthConnectorTile.tsx
index e69ab077c8219..acd9bcb600c65 100644
--- a/web/packages/teleport/src/AuthConnectors/AuthConnectorTile.tsx
+++ b/web/packages/teleport/src/AuthConnectors/AuthConnectorTile.tsx
@@ -18,9 +18,8 @@
 
 import styled, { useTheme } from 'styled-components';
 
-import { Flex, H2, Subtitle2, ButtonSecondary, P3, Box } from 'design';
+import { Box, ButtonSecondary, Flex, H2, P3, Subtitle2 } from 'design';
 import { ArrowRight, CircleCheck, Password } from 'design/Icon';
-
 import { MenuIcon, MenuItem } from 'shared/components/MenuAction';
 import { AuthType } from 'shared/services';
 
diff --git a/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx b/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx
index 6f0b297c4bdf5..6e7dace0550dc 100644
--- a/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx
+++ b/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx
@@ -17,26 +17,24 @@
  */
 
 import { Alert, Box, Flex, H3, Indicator, Link } from 'design';
-
 import { H2, P } from 'design/Text/Text';
 
-import { FeatureBox, FeatureHeaderTitle } from 'teleport/components/Layout';
-import ResourceEditor from 'teleport/components/ResourceEditor';
-import useResources from 'teleport/components/useResources';
-
 import {
   DesktopDescription,
   MobileDescription,
   ResponsiveAddButton,
   ResponsiveFeatureHeader,
 } from 'teleport/AuthConnectors/styles/AuthConnectors.styles';
+import { FeatureBox, FeatureHeaderTitle } from 'teleport/components/Layout';
+import ResourceEditor from 'teleport/components/ResourceEditor';
+import useResources from 'teleport/components/useResources';
 
-import EmptyList from './EmptyList';
 import ConnectorList from './ConnectorList';
+import CTAConnectors from './ConnectorList/CTAConnectors';
 import DeleteConnectorDialog from './DeleteConnectorDialog';
-import useAuthConnectors, { State } from './useAuthConnectors';
+import EmptyList from './EmptyList';
 import templates from './templates';
-import CTAConnectors from './ConnectorList/CTAConnectors';
+import useAuthConnectors, { State } from './useAuthConnectors';
 
 export function AuthConnectorsContainer() {
   const state = useAuthConnectors();
diff --git a/web/packages/teleport/src/AuthConnectors/ConnectorList/CTAConnectors.tsx b/web/packages/teleport/src/AuthConnectors/ConnectorList/CTAConnectors.tsx
index 117b02e4236d6..ec23259daa2c9 100644
--- a/web/packages/teleport/src/AuthConnectors/ConnectorList/CTAConnectors.tsx
+++ b/web/packages/teleport/src/AuthConnectors/ConnectorList/CTAConnectors.tsx
@@ -19,10 +19,10 @@
 import styled from 'styled-components';
 
 import Box from 'design/Box';
-import { ResourceIcon } from 'design/ResourceIcon';
-import { H2, Subtitle2 } from 'design/Text';
 import Flex from 'design/Flex';
 import { RocketLaunch } from 'design/Icon';
+import { ResourceIcon } from 'design/ResourceIcon';
+import { H2, Subtitle2 } from 'design/Text';
 
 import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import { CtaEvent } from 'teleport/services/userEvent';
diff --git a/web/packages/teleport/src/AuthConnectors/ConnectorList/ConnectorList.tsx b/web/packages/teleport/src/AuthConnectors/ConnectorList/ConnectorList.tsx
index 8f3605b4044a1..90e7edb73deac 100644
--- a/web/packages/teleport/src/AuthConnectors/ConnectorList/ConnectorList.tsx
+++ b/web/packages/teleport/src/AuthConnectors/ConnectorList/ConnectorList.tsx
@@ -22,9 +22,9 @@ import { Box } from 'design';
 
 import { State as ResourceState } from 'teleport/components/useResources';
 
-import { State as AuthConnectorState } from '../useAuthConnectors';
 import { AuthConnectorTile, LocalConnectorTile } from '../AuthConnectorTile';
 import getSsoIcon from '../ssoIcons/getSsoIcon';
+import { State as AuthConnectorState } from '../useAuthConnectors';
 
 export default function ConnectorList({ items, onEdit, onDelete }: Props) {
   items = items || [];
diff --git a/web/packages/teleport/src/AuthConnectors/ConnectorList/index.ts b/web/packages/teleport/src/AuthConnectors/ConnectorList/index.ts
index febac225e28bf..39ea41a98fe8b 100644
--- a/web/packages/teleport/src/AuthConnectors/ConnectorList/index.ts
+++ b/web/packages/teleport/src/AuthConnectors/ConnectorList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ConnectorList from './ConnectorList';
+
 export default ConnectorList;
diff --git a/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/DeleteConnectorDialog.tsx b/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/DeleteConnectorDialog.tsx
index a9f7e3eccc5d2..8d11f605721d3 100644
--- a/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/DeleteConnectorDialog.tsx
+++ b/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/DeleteConnectorDialog.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import useAttempt from 'shared/hooks/useAttemptNext';
-import { ButtonWarning, ButtonSecondary, Text, Alert, P1 } from 'design';
+import { Alert, ButtonSecondary, ButtonWarning, P1, Text } from 'design';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from 'design/DialogConfirmation';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { State as ResourceState } from 'teleport/components/useResources';
 
diff --git a/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/index.ts b/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/index.ts
index 0c55375d0b394..1eb15527a346f 100644
--- a/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/index.ts
+++ b/web/packages/teleport/src/AuthConnectors/DeleteConnectorDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DeleteConnectorDialog from './DeleteConnectorDialog';
+
 export default DeleteConnectorDialog;
diff --git a/web/packages/teleport/src/AuthConnectors/EmptyList/index.ts b/web/packages/teleport/src/AuthConnectors/EmptyList/index.ts
index 1383d4cf7d139..b72cc16af98f8 100644
--- a/web/packages/teleport/src/AuthConnectors/EmptyList/index.ts
+++ b/web/packages/teleport/src/AuthConnectors/EmptyList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import EmptyList from './EmptyList';
+
 export default EmptyList;
diff --git a/web/packages/teleport/src/AuthConnectors/ssoIcons/getSsoIcon.tsx b/web/packages/teleport/src/AuthConnectors/ssoIcons/getSsoIcon.tsx
index fbb116b59f3f2..1609a7d9b1be3 100644
--- a/web/packages/teleport/src/AuthConnectors/ssoIcons/getSsoIcon.tsx
+++ b/web/packages/teleport/src/AuthConnectors/ssoIcons/getSsoIcon.tsx
@@ -17,8 +17,9 @@
  */
 
 import styled from 'styled-components';
-import { AuthProviderType } from 'shared/services';
+
 import { Box, Flex, ResourceIcon } from 'design';
+import { AuthProviderType } from 'shared/services';
 
 export default function getSsoIcon(
   kind: AuthProviderType,
diff --git a/web/packages/teleport/src/AuthConnectors/styles/AuthConnectors.styles.ts b/web/packages/teleport/src/AuthConnectors/styles/AuthConnectors.styles.ts
index 6ad741f0ad5e2..60e5f57dcfe8b 100644
--- a/web/packages/teleport/src/AuthConnectors/styles/AuthConnectors.styles.ts
+++ b/web/packages/teleport/src/AuthConnectors/styles/AuthConnectors.styles.ts
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box, Button, Subtitle1 } from 'design';
 
 import { FeatureHeader } from 'teleport/components/Layout';
diff --git a/web/packages/teleport/src/AuthConnectors/useAuthConnectors.tsx b/web/packages/teleport/src/AuthConnectors/useAuthConnectors.tsx
index 3a59862671dbf..488d0c62736f6 100644
--- a/web/packages/teleport/src/AuthConnectors/useAuthConnectors.tsx
+++ b/web/packages/teleport/src/AuthConnectors/useAuthConnectors.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useEffect, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { Resource } from 'teleport/services/resources';
diff --git a/web/packages/teleport/src/Bots/Add/AddBots.tsx b/web/packages/teleport/src/Bots/Add/AddBots.tsx
index e913db70bc06b..5b6ffa3412a38 100644
--- a/web/packages/teleport/src/Bots/Add/AddBots.tsx
+++ b/web/packages/teleport/src/Bots/Add/AddBots.tsx
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Switch, Route } from 'teleport/components/Router';
-import cfg from 'teleport/config';
-
 import { FeatureBox } from 'teleport/components/Layout';
+import { Route, Switch } from 'teleport/components/Router';
+import cfg from 'teleport/config';
 
 import { BotFlowType } from '../types';
-
-import GitHubActionsFlow from './GitHubActions';
 import { AddBotsPicker } from './AddBotsPicker';
+import GitHubActionsFlow from './GitHubActions';
 
 export function AddBots() {
   return (
diff --git a/web/packages/teleport/src/Bots/Add/AddBotsPicker.story.tsx b/web/packages/teleport/src/Bots/Add/AddBotsPicker.story.tsx
index 9ab7f6bc89628..0922a537bcb22 100644
--- a/web/packages/teleport/src/Bots/Add/AddBotsPicker.story.tsx
+++ b/web/packages/teleport/src/Bots/Add/AddBotsPicker.story.tsx
@@ -19,7 +19,6 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { AddBotsPicker } from './AddBotsPicker';
diff --git a/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx b/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx
index 695060aadb047..fe4056c0042ab 100644
--- a/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx
+++ b/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx
@@ -19,24 +19,20 @@
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { Box, Flex, Link as ExternalLink, Text, ResourceIcon } from 'design';
-
-import { P } from 'design/Text/Text';
-
+import { Box, Link as ExternalLink, Flex, ResourceIcon, Text } from 'design';
 import { Server } from 'design/Icon';
+import { P } from 'design/Text/Text';
 
+import { FeatureHeader, FeatureHeaderTitle } from 'teleport/components/Layout';
+import { ToolTipNoPermBadge } from 'teleport/components/ToolTipNoPermBadge';
 import cfg from 'teleport/config';
-
+import { IntegrationTile } from 'teleport/Integrations';
 import {
   IntegrationEnrollEvent,
   IntegrationEnrollKind,
   userEventService,
 } from 'teleport/services/userEvent';
-import { IntegrationTile } from 'teleport/Integrations';
-import { FeatureHeader, FeatureHeaderTitle } from 'teleport/components/Layout';
-
 import useTeleport from 'teleport/useTeleport';
-import { ToolTipNoPermBadge } from 'teleport/components/ToolTipNoPermBadge';
 
 import { BotFlowType } from '../types';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.story.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.story.tsx
index ff1c07d106ed3..a66b7ed730628 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.story.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.story.tsx
@@ -19,11 +19,9 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { FlowStepProps } from '../Shared/GuidedFlow';
-
 import { AddBotToWorkflow } from './AddBotToWorkflow';
 import { GitHubFlowProvider } from './useGitHubFlow';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.test.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.test.tsx
index 26dfa55af1aea..c70d2d49e5702 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.test.tsx
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import { MemoryRouter } from 'react-router-dom';
 
+import { render, screen } from 'design/utils/testing';
+
 import { ContextProvider } from 'teleport';
-import TeleportContext from 'teleport/teleportContext';
 import { allAccessAcl } from 'teleport/mocks/contexts';
+import TeleportContext from 'teleport/teleportContext';
 
-import { GitHubFlowProvider } from './useGitHubFlow';
 import { ConfigureBot } from './ConfigureBot';
+import { GitHubFlowProvider } from './useGitHubFlow';
 
 describe('addBotToWorkflow Component', () => {
   const setup = () => {
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.tsx
index 0b3a9f8c1d80f..9529970d4a679 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/AddBotToWorkflow.tsx
@@ -16,19 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { H2, Text } from 'design';
 import Box from 'design/Box';
-import { Text } from 'design';
-import TextEditor from 'shared/components/TextEditor';
 import Flex from 'design/Flex';
-
-import { H2 } from 'design';
+import TextEditor from 'shared/components/TextEditor';
 
 import useTeleport from 'teleport/useTeleport';
 
 import { FlowButtons } from '../Shared/FlowButtons';
-
 import { FlowStepProps } from '../Shared/GuidedFlow';
-
 import { useGitHubFlow } from './useGitHubFlow';
 
 export function AddBotToWorkflow({ prevStep, nextStep }: FlowStepProps) {
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.story.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.story.tsx
index c03d309ef2d9b..1f03d6937d12d 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.story.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.story.tsx
@@ -19,11 +19,9 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
 import { allAccessAcl, createTeleportContext } from 'teleport/mocks/contexts';
 
 import { FlowStepProps } from '../Shared/GuidedFlow';
-
 import { ConfigureBot } from './ConfigureBot';
 import { GitHubFlowProvider } from './useGitHubFlow';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.test.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.test.tsx
index c43d22890043d..1b5bfdbff512d 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.test.tsx
@@ -17,17 +17,17 @@
  */
 
 import { MemoryRouter } from 'react-router-dom';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-import TeleportContext from 'teleport/teleportContext';
 import { allAccessAcl } from 'teleport/mocks/contexts';
-
-import { Access, Acl } from 'teleport/services/user';
 import * as botService from 'teleport/services/bot/bot';
+import { Access, Acl } from 'teleport/services/user';
+import TeleportContext from 'teleport/teleportContext';
 
-import { GitHubFlowProvider } from './useGitHubFlow';
 import { ConfigureBot } from './ConfigureBot';
+import { GitHubFlowProvider } from './useGitHubFlow';
 
 type SetupProps = {
   access?: Acl;
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.tsx
index e7b3d248c9ac3..3a205471ceaf8 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConfigureBot.tsx
@@ -19,28 +19,20 @@
 import { useState } from 'react';
 import styled from 'styled-components';
 
+import { H2, Text } from 'design';
+import { Alert } from 'design/Alert';
 import Box from 'design/Box';
-import useAttempt from 'shared/hooks/useAttemptNext';
-import Validation, { Validator } from 'shared/components/Validation';
-
-import { Text } from 'design';
-
 import FieldInput from 'shared/components/FieldInput';
+import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
-import { Alert } from 'design/Alert';
-
-import { H2 } from 'design';
-
+import { LabelsInput } from 'teleport/components/LabelsInput';
 import { getBot } from 'teleport/services/bot';
-
 import useTeleport from 'teleport/useTeleport';
 
-import { LabelsInput } from 'teleport/components/LabelsInput';
-
-import { FlowStepProps } from '../Shared/GuidedFlow';
 import { FlowButtons } from '../Shared/FlowButtons';
-
+import { FlowStepProps } from '../Shared/GuidedFlow';
 import { useGitHubFlow } from './useGitHubFlow';
 
 export function ConfigureBot({ nextStep, prevStep }: FlowStepProps) {
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.story.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.story.tsx
index 81859d2f77b44..c89c75b4b7d44 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.story.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.story.tsx
@@ -19,14 +19,12 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { FlowStepProps } from '../Shared/GuidedFlow';
-
 import { ConnectGitHub } from './ConnectGitHub';
-import { GitHubFlowProvider } from './useGitHubFlow';
 import { Finish } from './Finish';
+import { GitHubFlowProvider } from './useGitHubFlow';
 
 const Provider = ({ children }) => {
   const ctx = createTeleportContext();
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.test.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.test.tsx
index 23704e8709ad2..408ede652f09e 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.test.tsx
@@ -20,13 +20,11 @@ import { MemoryRouter } from 'react-router';
 
 import { render, screen } from 'design/utils/testing';
 
-import { allAccessAcl } from 'teleport/mocks/contexts';
-
 import { ContextProvider } from 'teleport';
+import { allAccessAcl } from 'teleport/mocks/contexts';
 import TeleportContext from 'teleport/teleportContext';
 
 import { ConnectGitHub } from './ConnectGitHub';
-
 import { GitHubFlowProvider } from './useGitHubFlow';
 
 describe('connectGitHub Component', () => {
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.tsx
index 12cb3c60f0b94..800194d00d773 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/ConnectGitHub.tsx
@@ -19,35 +19,29 @@
 import { useState } from 'react';
 import styled from 'styled-components';
 
+import { H2, Text } from 'design';
+import { Alert } from 'design/Alert';
 import Box from 'design/Box';
-import { Text } from 'design';
-import * as Icons from 'design/Icon';
-import Select from 'shared/components/Select';
-import Input from 'design/Input';
 import { ButtonSecondary } from 'design/Button';
-import Validation, { Validator } from 'shared/components/Validation';
-
-import Flex from 'design/Flex';
-import Card from 'design/Card';
 import ButtonIcon from 'design/ButtonIcon';
-import FieldInput from 'shared/components/FieldInput';
-
-import { Alert } from 'design/Alert';
-
+import Card from 'design/Card';
+import Flex from 'design/Flex';
+import * as Icons from 'design/Icon';
+import Input from 'design/Input';
 import Link from 'design/Link';
-
-import { H2 } from 'design';
+import FieldInput from 'shared/components/FieldInput';
+import Select from 'shared/components/Select';
+import Validation, { Validator } from 'shared/components/Validation';
 
 import cfg from 'teleport/config';
 
 import { FlowButtons } from '../Shared/FlowButtons';
 import { FlowStepProps } from '../Shared/GuidedFlow';
-
 import {
   GITHUB_HOST,
+  parseRepoAddress,
   RefTypeOption,
   Rule,
-  parseRepoAddress,
   useGitHubFlow,
 } from './useGitHubFlow';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.test.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.test.tsx
index f162a5ed2e7c6..648b1c0c2937e 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.test.tsx
@@ -17,14 +17,15 @@
  */
 
 import { MemoryRouter } from 'react-router-dom';
+
 import { render, screen } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-import TeleportContext from 'teleport/teleportContext';
 import cfg from 'teleport/config';
+import TeleportContext from 'teleport/teleportContext';
 
-import { GitHubFlowProvider, initialBotState } from './useGitHubFlow';
 import { Finish } from './Finish';
+import { GitHubFlowProvider, initialBotState } from './useGitHubFlow';
 
 describe('finish Component', () => {
   const setup = ({ botName }) => {
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.tsx
index 2ae26050215eb..5ec2c6d0c07a9 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/Finish.tsx
@@ -18,14 +18,13 @@
 
 import { Link } from 'react-router-dom';
 
+import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 import Flex from 'design/Flex';
 import Image from 'design/Image';
-
 import Text, { H2 } from 'design/Text';
-import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 
-import celebratePamPng from 'teleport/Discover/Shared/Finished/celebrate-pam.png';
 import cfg from 'teleport/config';
+import celebratePamPng from 'teleport/Discover/Shared/Finished/celebrate-pam.png';
 
 import { useGitHubFlow } from './useGitHubFlow';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.test.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.test.tsx
index eb4e762ac2b9b..d838940fccd4c 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.test.tsx
@@ -17,18 +17,16 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-
 import { allAccessAcl, noAccess } from 'teleport/mocks/contexts';
-
 import * as botService from 'teleport/services/bot/bot';
-
 import TeleportContext from 'teleport/teleportContext';
 
-import { GitHubFlowProvider } from './useGitHubFlow';
 import { GitHubActions } from './GitHubActions';
+import { GitHubFlowProvider } from './useGitHubFlow';
 
 const tokenName = 'generated-test-token';
 const authVersion = 'v15.0.0';
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.tsx
index 21f43f51a8fd6..4332e2f466c6c 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/GitHubActions.tsx
@@ -18,11 +18,9 @@
 import { ResourceIcon } from 'design/ResourceIcon';
 
 import { GuidedFlow, View } from '../Shared/GuidedFlow';
-
-import { ConnectGitHub } from './ConnectGitHub';
-
-import { ConfigureBot } from './ConfigureBot';
 import { AddBotToWorkflow } from './AddBotToWorkflow';
+import { ConfigureBot } from './ConfigureBot';
+import { ConnectGitHub } from './ConnectGitHub';
 import { Finish } from './Finish';
 import { GitHubFlowProvider } from './useGitHubFlow';
 
diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx
index 558bad33b4bfc..6dc71f0ced447 100644
--- a/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx
+++ b/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useContext } from 'react';
-import { Option } from 'shared/components/Select';
+import React, { useContext, useState } from 'react';
 
+import { Option } from 'shared/components/Select';
 import useAttempt, { Attempt } from 'shared/hooks/useAttemptNext';
 
 import { ResourceLabel } from 'teleport/services/agents';
 import {
-  createBot as serviceCreateBot,
   createBotToken,
   GITHUB_ACTIONS_LABEL_KEY,
+  createBot as serviceCreateBot,
 } from 'teleport/services/bot';
 import {
   BotUiFlow,
@@ -33,7 +33,6 @@ import {
   GitHubRepoRule,
   RefType,
 } from 'teleport/services/bot/types';
-
 import useTeleport from 'teleport/useTeleport';
 
 export const GITHUB_HOST = 'github.com';
diff --git a/web/packages/teleport/src/Bots/Add/Shared/FlowButtons.test.tsx b/web/packages/teleport/src/Bots/Add/Shared/FlowButtons.test.tsx
index 6443d8ba1a3bb..714860ff56bfe 100644
--- a/web/packages/teleport/src/Bots/Add/Shared/FlowButtons.test.tsx
+++ b/web/packages/teleport/src/Bots/Add/Shared/FlowButtons.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import { createMemoryHistory } from 'history';
-import { Router, MemoryRouter } from 'react-router';
+import { MemoryRouter, Router } from 'react-router';
+
+import { render, screen, userEvent } from 'design/utils/testing';
 
 import cfg from 'teleport/config';
 
diff --git a/web/packages/teleport/src/Bots/Add/Shared/GuidedFlow.tsx b/web/packages/teleport/src/Bots/Add/Shared/GuidedFlow.tsx
index 2e6265250adfc..48e8b0c757c9c 100644
--- a/web/packages/teleport/src/Bots/Add/Shared/GuidedFlow.tsx
+++ b/web/packages/teleport/src/Bots/Add/Shared/GuidedFlow.tsx
@@ -18,8 +18,8 @@
 
 import { useState } from 'react';
 
+import { H1, Text } from 'design';
 import Flex from 'design/Flex';
-import { Text, H1 } from 'design';
 
 import { Navigation } from 'teleport/components/Wizard/Navigation';
 
diff --git a/web/packages/teleport/src/Bots/EditBot.test.tsx b/web/packages/teleport/src/Bots/EditBot.test.tsx
index 2a5b9210ef7d9..4b350c1b5b2b8 100644
--- a/web/packages/teleport/src/Bots/EditBot.test.tsx
+++ b/web/packages/teleport/src/Bots/EditBot.test.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
-
 import { waitFor } from '@testing-library/react';
 
+import { render, screen, userEvent } from 'design/utils/testing';
+
 import { EditBot } from 'teleport/Bots/EditBot';
 import { EditBotProps } from 'teleport/Bots/types';
 
diff --git a/web/packages/teleport/src/Bots/EditBot.tsx b/web/packages/teleport/src/Bots/EditBot.tsx
index fdacbaa5d8053..ccac6e58b102d 100644
--- a/web/packages/teleport/src/Bots/EditBot.tsx
+++ b/web/packages/teleport/src/Bots/EditBot.tsx
@@ -23,12 +23,11 @@ import Dialog, {
   DialogHeader,
   DialogTitle,
 } from 'design/DialogConfirmation';
-
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import { FieldSelectAsync } from 'shared/components/FieldSelect';
-import Validation from 'shared/components/Validation';
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
+import { requiredField } from 'shared/components/Validation/rules';
 
 import { EditBotProps } from 'teleport/Bots/types';
 
diff --git a/web/packages/teleport/src/Bots/List/BotList.test.tsx b/web/packages/teleport/src/Bots/List/BotList.test.tsx
index f239b5222ab00..6001a2a4a0b97 100644
--- a/web/packages/teleport/src/Bots/List/BotList.test.tsx
+++ b/web/packages/teleport/src/Bots/List/BotList.test.tsx
@@ -18,9 +18,9 @@
 
 import { fireEvent, render, screen } from 'design/utils/testing';
 
+import { botsFixture } from 'teleport/Bots/fixtures';
 import { BotList } from 'teleport/Bots/List/BotList';
 import { BotListProps } from 'teleport/Bots/types';
-import { botsFixture } from 'teleport/Bots/fixtures';
 import { BotUiFlow } from 'teleport/services/bot/types';
 
 const makeProps = (): BotListProps => ({
diff --git a/web/packages/teleport/src/Bots/List/BotList.tsx b/web/packages/teleport/src/Bots/List/BotList.tsx
index 058035bd5b293..b3894d962ece0 100644
--- a/web/packages/teleport/src/Bots/List/BotList.tsx
+++ b/web/packages/teleport/src/Bots/List/BotList.tsx
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Table, { LabelCell } from 'design/DataTable';
-
 import { useState } from 'react';
 
-import { BotOptionsCell } from 'teleport/Bots/List/ActionCell';
+import Table, { LabelCell } from 'design/DataTable';
 
-import { BotListProps } from 'teleport/Bots/types';
 import { DeleteBot } from 'teleport/Bots/DeleteBot';
 import { EditBot } from 'teleport/Bots/EditBot';
+import { BotOptionsCell } from 'teleport/Bots/List/ActionCell';
+import { BotListProps } from 'teleport/Bots/types';
 
 import { ViewBot } from '../ViewBot';
 
diff --git a/web/packages/teleport/src/Bots/List/Bots.test.tsx b/web/packages/teleport/src/Bots/List/Bots.test.tsx
index 99c79ac70b29b..ef0413429ae5b 100644
--- a/web/packages/teleport/src/Bots/List/Bots.test.tsx
+++ b/web/packages/teleport/src/Bots/List/Bots.test.tsx
@@ -17,16 +17,17 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen, userEvent, waitFor } from 'design/utils/testing';
 
-import api from 'teleport/services/api';
 import { botsApiResponseFixture } from 'teleport/Bots/fixtures';
+import { ContextProvider } from 'teleport/index';
 import {
   allAccessAcl,
   createTeleportContext,
   noAccess,
 } from 'teleport/mocks/contexts';
-import { ContextProvider } from 'teleport/index';
+import api from 'teleport/services/api';
 import TeleportContext from 'teleport/teleportContext';
 
 import { Bots } from './Bots';
diff --git a/web/packages/teleport/src/Bots/List/Bots.tsx b/web/packages/teleport/src/Bots/List/Bots.tsx
index 33cdc7959ca70..936a0feb5b05c 100644
--- a/web/packages/teleport/src/Bots/List/Bots.tsx
+++ b/web/packages/teleport/src/Bots/List/Bots.tsx
@@ -17,17 +17,19 @@
  */
 
 import { useEffect, useState } from 'react';
-import { useAttemptNext } from 'shared/hooks';
 import { Link } from 'react-router-dom';
-import { HoverTooltip } from 'design/Tooltip';
+
 import { Alert, Box, Button, Indicator } from 'design';
+import { HoverTooltip } from 'design/Tooltip';
+import { useAttemptNext } from 'shared/hooks';
 
+import { BotList } from 'teleport/Bots/List/BotList';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import { BotList } from 'teleport/Bots/List/BotList';
+import cfg from 'teleport/config';
 import {
   deleteBot,
   editBot,
@@ -37,8 +39,6 @@ import {
 import { FlatBot } from 'teleport/services/bot/types';
 import useTeleport from 'teleport/useTeleport';
 
-import cfg from 'teleport/config';
-
 import { EmptyState } from './EmptyState/EmptyState';
 
 export function Bots() {
diff --git a/web/packages/teleport/src/Bots/List/EmptyState/EmptyState.tsx b/web/packages/teleport/src/Bots/List/EmptyState/EmptyState.tsx
index adb892805532f..f574429b6c9ed 100644
--- a/web/packages/teleport/src/Bots/List/EmptyState/EmptyState.tsx
+++ b/web/packages/teleport/src/Bots/List/EmptyState/EmptyState.tsx
@@ -16,9 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
-import styled, { useTheme } from 'styled-components';
+import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
+import styled, { useTheme } from 'styled-components';
+
+import { Box, ButtonPrimary, Flex, H1, Image, Text } from 'design';
 import { ResourceIcon } from 'design/ResourceIcon';
 import {
   Description,
@@ -29,18 +31,15 @@ import {
   FeatureSlider,
   Title,
 } from 'shared/components/EmptyState/EmptyState';
-import { Box, ButtonPrimary, Flex, H1, Image, Text } from 'design';
 
-import cfg from 'teleport/config';
 import { DisplayTile } from 'teleport/Bots/Add/AddBotsPicker';
-
-import elimiateSecretsImage from './eliminate-secrets.svg';
-import elimiateSecretsLightImage from './eliminate-secrets-light.svg';
-
-import controlWorkflowsImage from './control-workflows.svg';
-import controlWorkflowsLightImage from './control-workflows-light.svg';
+import cfg from 'teleport/config';
 
 import argoCD from './argocd.png';
+import controlWorkflowsLightImage from './control-workflows-light.svg';
+import controlWorkflowsImage from './control-workflows.svg';
+import elimiateSecretsLightImage from './eliminate-secrets-light.svg';
+import elimiateSecretsImage from './eliminate-secrets.svg';
 
 const maxWidth = '1204px';
 
diff --git a/web/packages/teleport/src/Bots/ViewBot.story.tsx b/web/packages/teleport/src/Bots/ViewBot.story.tsx
index 64a46fce051bd..6a8926d85f73f 100644
--- a/web/packages/teleport/src/Bots/ViewBot.story.tsx
+++ b/web/packages/teleport/src/Bots/ViewBot.story.tsx
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BotUiFlow } from 'teleport/services/bot/types';
-
 import { ContextProvider } from 'teleport';
 import { createTeleportContext } from 'teleport/mocks/contexts';
+import { BotUiFlow } from 'teleport/services/bot/types';
 
-import { ViewBot } from './ViewBot';
 import { ViewBotProps } from './types';
+import { ViewBot } from './ViewBot';
 
 export default {
   title: 'Teleport/Bots/Add/ViewBot',
diff --git a/web/packages/teleport/src/Bots/ViewBot.tsx b/web/packages/teleport/src/Bots/ViewBot.tsx
index abaece2a2167f..7112cfea80c3f 100644
--- a/web/packages/teleport/src/Bots/ViewBot.tsx
+++ b/web/packages/teleport/src/Bots/ViewBot.tsx
@@ -23,11 +23,9 @@ import Dialog, {
   DialogHeader,
   DialogTitle,
 } from 'design/DialogConfirmation';
-
 import TextEditor from 'shared/components/TextEditor';
 
 import { ViewBotProps } from 'teleport/Bots/types';
-
 import useTeleport from 'teleport/useTeleport';
 
 import { getWorkflowExampleYaml } from './Add/GitHubActions/AddBotToWorkflow';
diff --git a/web/packages/teleport/src/Bots/types.ts b/web/packages/teleport/src/Bots/types.ts
index d694506f9b0e6..ead0fac477cb4 100644
--- a/web/packages/teleport/src/Bots/types.ts
+++ b/web/packages/teleport/src/Bots/types.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Dispatch, SetStateAction } from 'react';
+
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
 import { FlatBot } from 'teleport/services/bot/types';
diff --git a/web/packages/teleport/src/Clusters/ClusterList/ClusterList.tsx b/web/packages/teleport/src/Clusters/ClusterList/ClusterList.tsx
index 293bf38d15c90..3d3dc11902121 100644
--- a/web/packages/teleport/src/Clusters/ClusterList/ClusterList.tsx
+++ b/web/packages/teleport/src/Clusters/ClusterList/ClusterList.tsx
@@ -20,13 +20,13 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 import Table, { Cell } from 'design/DataTable';
 import { Primary, Secondary } from 'design/Label';
+import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 
-import { Cluster } from 'teleport/services/clusters';
-import cfg from 'teleport/config';
 import { DropdownDivider } from 'teleport/components/Dropdown';
+import cfg from 'teleport/config';
+import { Cluster } from 'teleport/services/clusters';
 
 export default function ClustersList(props: Props) {
   const { clusters = [], pageSize = 50, menuFlags } = props;
diff --git a/web/packages/teleport/src/Clusters/ClusterList/index.ts b/web/packages/teleport/src/Clusters/ClusterList/index.ts
index 23ea1097d00f9..4e5711ece4ce7 100644
--- a/web/packages/teleport/src/Clusters/ClusterList/index.ts
+++ b/web/packages/teleport/src/Clusters/ClusterList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ClusterList from './ClusterList';
+
 export default ClusterList;
diff --git a/web/packages/teleport/src/Clusters/Clusters.story.tsx b/web/packages/teleport/src/Clusters/Clusters.story.tsx
index 04d3b1d2e6dd4..1baeba60c7e0f 100644
--- a/web/packages/teleport/src/Clusters/Clusters.story.tsx
+++ b/web/packages/teleport/src/Clusters/Clusters.story.tsx
@@ -16,14 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Router } from 'react-router';
 
 import * as teleport from 'teleport';
-
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-
 import { getOSSFeatures } from 'teleport/features';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 
 import { ClusterListPage } from './Clusters';
 import * as fixtures from './fixtures';
diff --git a/web/packages/teleport/src/Clusters/Clusters.tsx b/web/packages/teleport/src/Clusters/Clusters.tsx
index 6030e33be988d..b21cf1676bbb1 100644
--- a/web/packages/teleport/src/Clusters/Clusters.tsx
+++ b/web/packages/teleport/src/Clusters/Clusters.tsx
@@ -17,9 +17,9 @@
  */
 
 import { useEffect, useState } from 'react';
+
 import { Box, Indicator } from 'design';
 import { Danger } from 'design/Alert';
-
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import {
@@ -27,15 +27,14 @@ import {
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import useTeleport from 'teleport/useTeleport';
-
-import { useFeatures } from 'teleport/FeaturesContext';
 import { Route, Switch } from 'teleport/components/Router';
 import cfg from 'teleport/config';
+import { useFeatures } from 'teleport/FeaturesContext';
+import useTeleport from 'teleport/useTeleport';
 
 import ClusterList from './ClusterList';
-import { buildACL } from './utils';
 import { ManageCluster } from './ManageCluster';
+import { buildACL } from './utils';
 
 export function Clusters() {
   return (
diff --git a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.story.tsx b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.story.tsx
index 8d6732bd3b743..a5fa9a492b153 100644
--- a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.story.tsx
+++ b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.story.tsx
@@ -19,13 +19,12 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { Route } from 'teleport/components/Router';
 import { ContextProvider } from 'teleport/index';
 import { ContentMinWidth } from 'teleport/Main/Main';
-import { Route } from 'teleport/components/Router';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { clusterInfoFixture } from '../fixtures';
-
 import { ManageCluster } from './ManageCluster';
 
 export default {
diff --git a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.test.tsx b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.test.tsx
index 0d137476956a4..52f5a59befc96 100644
--- a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.test.tsx
+++ b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.test.tsx
@@ -16,20 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
 import React from 'react';
 import { MemoryRouter, Route } from 'react-router-dom';
-import { setupServer } from 'msw/node';
-import { http, HttpResponse } from 'msw';
 
-import { render, waitFor, screen } from 'design/utils/testing';
+import { render, screen, waitFor } from 'design/utils/testing';
 
+import cfg from 'teleport/config';
 import { ContextProvider } from 'teleport/index';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContentMinWidth } from 'teleport/Main/Main';
-import cfg from 'teleport/config';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { clusterInfoFixture } from '../fixtures';
-
 import { ManageCluster } from './ManageCluster';
 
 function renderElement(element, ctx) {
diff --git a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.tsx b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.tsx
index e349e26b5098c..9619dd279438e 100644
--- a/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.tsx
+++ b/web/packages/teleport/src/Clusters/ManageCluster/ManageCluster.tsx
@@ -17,30 +17,28 @@
  */
 
 import React, { useCallback, useEffect, useState } from 'react';
-import styled from 'styled-components';
-import { Link } from 'react-router-dom';
 import { useParams } from 'react-router';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
 
-import { useAsync, Attempt } from 'shared/hooks/useAsync';
-
-import { MultiRowBox, Row } from 'design/MultiRowBox';
+import { Alert } from 'design/Alert';
+import Box, { BoxProps } from 'design/Box';
 import Flex from 'design/Flex';
 import * as Icons from 'design/Icon';
-import Text, { H2 } from 'design/Text';
 import { Indicator } from 'design/Indicator';
-import Box, { BoxProps } from 'design/Box';
+import { MultiRowBox, Row } from 'design/MultiRowBox';
 import { ShimmerBox } from 'design/ShimmerBox';
-import { Alert } from 'design/Alert';
-
+import Text, { H2 } from 'design/Text';
 import { LoadingSkeleton } from 'shared/components/UnifiedResources/shared/LoadingSkeleton';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
 
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import { useTeleport } from 'teleport/index';
 import cfg from 'teleport/config';
+import { useTeleport } from 'teleport/index';
 import { useNoMinWidth } from 'teleport/Main';
 import { ClusterInfo } from 'teleport/services/clusters';
 
diff --git a/web/packages/teleport/src/Clusters/utils.ts b/web/packages/teleport/src/Clusters/utils.ts
index f105007a46a27..81618561de0cf 100644
--- a/web/packages/teleport/src/Clusters/utils.ts
+++ b/web/packages/teleport/src/Clusters/utils.ts
@@ -17,7 +17,6 @@
  */
 
 import * as Features from 'teleport/features';
-
 import type { TeleportFeature } from 'teleport/types';
 
 export function buildACL(features: TeleportFeature[]) {
diff --git a/web/packages/teleport/src/Console/ActionBar/ActionBar.tsx b/web/packages/teleport/src/Console/ActionBar/ActionBar.tsx
index 07e9e0060295a..79d57152a242e 100644
--- a/web/packages/teleport/src/Console/ActionBar/ActionBar.tsx
+++ b/web/packages/teleport/src/Console/ActionBar/ActionBar.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LatencyDiagnostic } from 'shared/components/LatencyDiagnostic';
-
 import { Flex } from 'design';
+import { LatencyDiagnostic } from 'shared/components/LatencyDiagnostic';
 
 import { DocumentSsh } from 'teleport/Console/stores';
 
diff --git a/web/packages/teleport/src/Console/ActionBar/index.ts b/web/packages/teleport/src/Console/ActionBar/index.ts
index 68780db3589b9..9d87648f34b85 100644
--- a/web/packages/teleport/src/Console/ActionBar/index.ts
+++ b/web/packages/teleport/src/Console/ActionBar/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ActionBar from './ActionBar';
+
 export default ActionBar;
diff --git a/web/packages/teleport/src/Console/Console.story.tsx b/web/packages/teleport/src/Console/Console.story.tsx
index cc64a3a2d30bc..8bd19ab2deabd 100644
--- a/web/packages/teleport/src/Console/Console.story.tsx
+++ b/web/packages/teleport/src/Console/Console.story.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState } from 'react';
-import { Flex } from 'design';
 import { createMemoryHistory } from 'history';
-import { Router, Route } from 'react-router';
 import { http, HttpResponse } from 'msw';
+import { useState } from 'react';
+import { Route, Router } from 'react-router';
+
+import { Flex } from 'design';
 
 import cfg from 'teleport/config';
 
diff --git a/web/packages/teleport/src/Console/Console.tsx b/web/packages/teleport/src/Console/Console.tsx
index b2a74e4aa1a69..fd2ff576e0e4e 100644
--- a/web/packages/teleport/src/Console/Console.tsx
+++ b/web/packages/teleport/src/Console/Console.tsx
@@ -18,26 +18,26 @@
 
 import { useEffect, useMemo } from 'react';
 import styled from 'styled-components';
+
 import { Box, Flex, Indicator } from 'design';
 import { Danger } from 'design/Alert';
-
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import AjaxPoller from 'teleport/components/AjaxPoller';
 
+import ActionBar from './ActionBar';
 import { useConsoleContext, useStoreDocs } from './consoleContextProvider';
+import DocumentBlank from './DocumentBlank';
+import { DocumentDb } from './DocumentDb';
+import DocumentKubeExec from './DocumentKubeExec';
+import DocumentNodes from './DocumentNodes';
+import DocumentSsh from './DocumentSsh';
 import * as stores from './stores/types';
 import Tabs from './Tabs';
-import ActionBar from './ActionBar';
-import DocumentSsh from './DocumentSsh';
-import DocumentNodes from './DocumentNodes';
-import DocumentKubeExec from './DocumentKubeExec';
-import DocumentBlank from './DocumentBlank';
+import useKeyboardNav from './useKeyboardNav';
+import useOnExitConfirmation from './useOnExitConfirmation';
 import usePageTitle from './usePageTitle';
 import useTabRouting from './useTabRouting';
-import useOnExitConfirmation from './useOnExitConfirmation';
-import useKeyboardNav from './useKeyboardNav';
-import { DocumentDb } from './DocumentDb';
 
 const POLL_INTERVAL = 5000; // every 5 sec
 
diff --git a/web/packages/teleport/src/Console/Document/Document.tsx b/web/packages/teleport/src/Console/Document/Document.tsx
index 80b17f7de536f..1c997a43b3871 100644
--- a/web/packages/teleport/src/Console/Document/Document.tsx
+++ b/web/packages/teleport/src/Console/Document/Document.tsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+
 import { Flex } from 'design';
 
 const Document: React.FC<{ visible: boolean; [x: string]: any }> = ({
diff --git a/web/packages/teleport/src/Console/Document/index.ts b/web/packages/teleport/src/Console/Document/index.ts
index 53f8277a52916..16c6ec99d3f61 100644
--- a/web/packages/teleport/src/Console/Document/index.ts
+++ b/web/packages/teleport/src/Console/Document/index.ts
@@ -17,4 +17,5 @@
  */
 
 import Document from './Document';
+
 export default Document;
diff --git a/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.story.tsx b/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.story.tsx
index 1f4b83395045a..f4adc953ef560 100644
--- a/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.story.tsx
+++ b/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import DocumentBlank from './DocumentBlank';
 import { TestLayout } from './../Console.story';
+import DocumentBlank from './DocumentBlank';
 
 export default {
   title: 'Teleport/Console/DocumentBlank',
diff --git a/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.tsx b/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.tsx
index 6ba4b0d0c1180..be768d302681b 100644
--- a/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.tsx
+++ b/web/packages/teleport/src/Console/DocumentBlank/DocumentBlank.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, ButtonPrimary } from 'design';
+import { ButtonPrimary, Flex } from 'design';
 import * as Icons from 'design/Icon';
 
 import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
diff --git a/web/packages/teleport/src/Console/DocumentBlank/index.ts b/web/packages/teleport/src/Console/DocumentBlank/index.ts
index 24aaf09504bed..56eb738d42d4b 100644
--- a/web/packages/teleport/src/Console/DocumentBlank/index.ts
+++ b/web/packages/teleport/src/Console/DocumentBlank/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DocumentBlank from './DocumentBlank';
+
 export default DocumentBlank;
diff --git a/web/packages/teleport/src/Console/DocumentDb/ConnectDialog.tsx b/web/packages/teleport/src/Console/DocumentDb/ConnectDialog.tsx
index 7af8db35c9e3e..3df94211e5446 100644
--- a/web/packages/teleport/src/Console/DocumentDb/ConnectDialog.tsx
+++ b/web/packages/teleport/src/Console/DocumentDb/ConnectDialog.tsx
@@ -17,28 +17,27 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
+
+import { Box, ButtonPrimary, ButtonSecondary, Flex, Indicator } from 'design';
+import { Danger } from 'design/Alert';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from 'design/Dialog';
-import { Box, ButtonPrimary, ButtonSecondary, Flex, Indicator } from 'design';
-
-import Validation from 'shared/components/Validation';
-import { Option } from 'shared/components/Select';
 import {
   FieldSelect,
   FieldSelectCreatable,
 } from 'shared/components/FieldSelect';
-
-import { Danger } from 'design/Alert';
+import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 import { useAsync } from 'shared/hooks/useAsync';
 
 import { useTeleport } from 'teleport';
-import { Database } from 'teleport/services/databases';
 import { DbConnectData } from 'teleport/lib/term/tty';
+import { Database } from 'teleport/services/databases';
 
 export function ConnectDialog(props: {
   clusterId: string;
diff --git a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.story.tsx b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.story.tsx
index 70f1e94d9e7d9..202cd4c637e50 100644
--- a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.story.tsx
+++ b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.story.tsx
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import ConsoleCtx from 'teleport/Console/consoleContext';
-
 import { ContextProvider } from 'teleport';
 import { TestLayout } from 'teleport/Console/Console.story';
-import TeleportContext from 'teleport/teleportContext';
+import ConsoleCtx from 'teleport/Console/consoleContext';
 import * as stores from 'teleport/Console/stores/types';
-
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ResourcesResponse, UnifiedResource } from 'teleport/services/agents';
+import TeleportContext from 'teleport/teleportContext';
 
 import { DocumentDb } from './DocumentDb';
 
diff --git a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.test.tsx b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.test.tsx
index aecc3424a499f..5915dea6df8bb 100644
--- a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.test.tsx
+++ b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.test.tsx
@@ -19,7 +19,6 @@
 import { screen } from '@testing-library/react';
 
 import '@testing-library/jest-dom';
-
 import 'jest-canvas-mock';
 
 import { act, render } from 'design/utils/testing';
@@ -27,15 +26,12 @@ import { act, render } from 'design/utils/testing';
 import { ContextProvider } from 'teleport';
 import { TestLayout } from 'teleport/Console/Console.story';
 import ConsoleCtx from 'teleport/Console/consoleContext';
-import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import Tty from 'teleport/lib/term/tty';
-
-import { useDbSession, Status } from './useDbSession';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import type { Session } from 'teleport/services/session';
 
 import { DocumentDb } from './DocumentDb';
-
-import type { Session } from 'teleport/services/session';
+import { Status, useDbSession } from './useDbSession';
 
 jest.mock('./useDbSession');
 
diff --git a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.tsx b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.tsx
index 0d6d333141b2a..6c078bd3616af 100644
--- a/web/packages/teleport/src/Console/DocumentDb/DocumentDb.tsx
+++ b/web/packages/teleport/src/Console/DocumentDb/DocumentDb.tsx
@@ -15,20 +15,19 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { useRef, useEffect } from 'react';
-
+import { useEffect, useRef } from 'react';
 import { useTheme } from 'styled-components';
+
 import { Box, Indicator } from 'design';
 
-import * as stores from 'teleport/Console/stores/types';
+import AuthnDialog from 'teleport/components/AuthnDialog';
+import Document from 'teleport/Console/Document';
 import { Terminal, TerminalRef } from 'teleport/Console/DocumentSsh/Terminal';
+import * as stores from 'teleport/Console/stores/types';
 import { useMfa } from 'teleport/lib/useMfa';
 
-import Document from 'teleport/Console/Document';
-import AuthnDialog from 'teleport/components/AuthnDialog';
-
-import { useDbSession } from './useDbSession';
 import { ConnectDialog } from './ConnectDialog';
+import { useDbSession } from './useDbSession';
 
 type Props = {
   visible: boolean;
diff --git a/web/packages/teleport/src/Console/DocumentDb/useDbSession.tsx b/web/packages/teleport/src/Console/DocumentDb/useDbSession.tsx
index 5f5d01d099cfd..d7c54d46f2caa 100644
--- a/web/packages/teleport/src/Console/DocumentDb/useDbSession.tsx
+++ b/web/packages/teleport/src/Console/DocumentDb/useDbSession.tsx
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useState, useEffect } from 'react';
-
 import { context, trace } from '@opentelemetry/api';
+import { useEffect, useRef, useState } from 'react';
 
 import cfg from 'teleport/config';
-import { TermEvent } from 'teleport/lib/term/enums';
-import Tty, { DbConnectData } from 'teleport/lib/term/tty';
 import ConsoleContext from 'teleport/Console/consoleContext';
 import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
 import { DocumentDb } from 'teleport/Console/stores';
-
+import { TermEvent } from 'teleport/lib/term/enums';
+import Tty, { DbConnectData } from 'teleport/lib/term/tty';
 import type { Session, SessionMetadata } from 'teleport/services/session';
 
 const tracer = trace.getTracer('TTY');
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.story.tsx b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.story.tsx
index 72431021ab720..b7aaa2bb76d22 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.story.tsx
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.story.tsx
@@ -16,18 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import ConsoleCtx from 'teleport/Console/consoleContext';
-
 import { ContextProvider } from 'teleport';
 import { TestLayout } from 'teleport/Console/Console.story';
-import TeleportContext from 'teleport/teleportContext';
+import ConsoleCtx from 'teleport/Console/consoleContext';
 import * as stores from 'teleport/Console/stores/types';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import type { Session } from 'teleport/services/session';
+import TeleportContext from 'teleport/teleportContext';
 
 import DocumentKubeExec from './DocumentKubeExec';
 
-import type { Session } from 'teleport/services/session';
-
 export default {
   title: 'Teleport/Console/DocumentKubeExec',
 };
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.test.tsx b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.test.tsx
index a8c6620d449d8..fe2c0de58338a 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.test.tsx
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.test.tsx
@@ -18,7 +18,6 @@
 import { screen } from '@testing-library/react';
 
 import '@testing-library/jest-dom';
-
 import 'jest-canvas-mock';
 
 import { act, render } from 'design/utils/testing';
@@ -26,15 +25,12 @@ import { act, render } from 'design/utils/testing';
 import { ContextProvider } from 'teleport';
 import { TestLayout } from 'teleport/Console/Console.story';
 import ConsoleCtx from 'teleport/Console/consoleContext';
-import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import Tty from 'teleport/lib/term/tty';
-
-import useKubeExecSession, { Status } from './useKubeExecSession';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import type { Session } from 'teleport/services/session';
 
 import DocumentKubeExec from './DocumentKubeExec';
-
-import type { Session } from 'teleport/services/session';
+import useKubeExecSession, { Status } from './useKubeExecSession';
 
 jest.mock('./useKubeExecSession');
 
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.tsx b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.tsx
index 30f3f45cae668..8658deedf94ed 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.tsx
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/DocumentKubeExec.tsx
@@ -15,18 +15,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { useRef, useEffect } from 'react';
-
+import { useEffect, useRef } from 'react';
 import { useTheme } from 'styled-components';
+
 import { Box, Indicator } from 'design';
 
-import * as stores from 'teleport/Console/stores/types';
+import AuthnDialog from 'teleport/components/AuthnDialog';
+import Document from 'teleport/Console/Document';
+import useKubeExecSession from 'teleport/Console/DocumentKubeExec/useKubeExecSession';
 import { Terminal, TerminalRef } from 'teleport/Console/DocumentSsh/Terminal';
+import * as stores from 'teleport/Console/stores/types';
 import { useMfa } from 'teleport/lib/useMfa';
-import useKubeExecSession from 'teleport/Console/DocumentKubeExec/useKubeExecSession';
-
-import Document from 'teleport/Console/Document';
-import AuthnDialog from 'teleport/components/AuthnDialog';
 
 import KubeExecData from './KubeExecDataDialog';
 
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/KubeExecDataDialog.tsx b/web/packages/teleport/src/Console/DocumentKubeExec/KubeExecDataDialog.tsx
index d71d12e1c5f09..e4c838f6036e0 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/KubeExecDataDialog.tsx
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/KubeExecDataDialog.tsx
@@ -17,12 +17,7 @@
  */
 
 import { useState } from 'react';
-import Dialog, {
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from 'design/Dialog';
+
 import {
   Box,
   ButtonPrimary,
@@ -31,11 +26,16 @@ import {
   Text,
   Toggle,
 } from 'design';
-
-import Validation from 'shared/components/Validation';
+import Dialog, {
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from 'design/Dialog';
+import { IconTooltip } from 'design/Tooltip';
 import FieldInput from 'shared/components/FieldInput';
+import Validation from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import { IconTooltip } from 'design/Tooltip';
 
 type Props = {
   onClose(): void;
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/index.ts b/web/packages/teleport/src/Console/DocumentKubeExec/index.ts
index 14f5557a9dbb6..0c5cef524a599 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/index.ts
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DocumentKubeExec from './DocumentKubeExec';
+
 export default DocumentKubeExec;
diff --git a/web/packages/teleport/src/Console/DocumentKubeExec/useKubeExecSession.tsx b/web/packages/teleport/src/Console/DocumentKubeExec/useKubeExecSession.tsx
index 912dd0be6ee9b..53ff57b1d5d62 100644
--- a/web/packages/teleport/src/Console/DocumentKubeExec/useKubeExecSession.tsx
+++ b/web/packages/teleport/src/Console/DocumentKubeExec/useKubeExecSession.tsx
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useState, useEffect } from 'react';
-
 import { context, trace } from '@opentelemetry/api';
+import { useEffect, useRef, useState } from 'react';
 
 import cfg from 'teleport/config';
-import { TermEvent } from 'teleport/lib/term/enums';
-import Tty from 'teleport/lib/term/tty';
 import ConsoleContext from 'teleport/Console/consoleContext';
 import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
 import { DocumentKubeExec } from 'teleport/Console/stores';
-
+import { TermEvent } from 'teleport/lib/term/enums';
+import Tty from 'teleport/lib/term/tty';
 import type {
   ParticipantMode,
   Session,
diff --git a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.story.tsx b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.story.tsx
index 4bcc499c1f266..6f104fd76cc2d 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.story.tsx
+++ b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.story.tsx
@@ -18,9 +18,9 @@
 
 import { Node } from 'teleport/services/nodes/types';
 
-import DocumentNodes from './DocumentNodes';
-import ConsoleCtx from './../consoleContext';
 import { TestLayout } from './../Console.story';
+import ConsoleCtx from './../consoleContext';
+import DocumentNodes from './DocumentNodes';
 
 export default {
   title: 'Teleport/Console/DocumentNodes',
diff --git a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
index 93c5691848897..ccee850a53c95 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
+++ b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
@@ -18,15 +18,14 @@
 
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { Indicator, Box } from 'design';
-import { Danger } from 'design/Alert';
 
+import { Box, Indicator } from 'design';
+import { Danger } from 'design/Alert';
 import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
 
-import { NodeList } from 'teleport/components/NodeList';
 import ErrorMessage from 'teleport/components/AgentErrorMessage';
+import { NodeList } from 'teleport/components/NodeList';
 import Document from 'teleport/Console/Document';
-
 import * as stores from 'teleport/Console/stores/types';
 
 import useNodes from './useNodes';
diff --git a/web/packages/teleport/src/Console/DocumentNodes/consoleTheme.ts b/web/packages/teleport/src/Console/DocumentNodes/consoleTheme.ts
index d76a9f3bf940f..f977f8b0c24c0 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/consoleTheme.ts
+++ b/web/packages/teleport/src/Console/DocumentNodes/consoleTheme.ts
@@ -17,17 +17,17 @@
  */
 
 import { fonts } from 'design/theme/fonts';
-import { getContrastRatio } from 'design/theme/utils/colorManipulator';
 import {
+  blueGrey,
   lightBlue,
-  red,
-  teal,
   orange,
   pink,
-  blueGrey,
+  red,
+  teal,
   yellow,
 } from 'design/theme/palette';
 import typography, { fontSizes, fontWeights } from 'design/theme/typography';
+import { getContrastRatio } from 'design/theme/utils/colorManipulator';
 
 const space = [0, 4, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80];
 const contrastThreshold = 3;
diff --git a/web/packages/teleport/src/Console/DocumentNodes/index.ts b/web/packages/teleport/src/Console/DocumentNodes/index.ts
index b31c7c7f33fb1..43b6c70af095d 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/index.ts
+++ b/web/packages/teleport/src/Console/DocumentNodes/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DocumentNodes from './DocumentNodes';
+
 export default DocumentNodes;
diff --git a/web/packages/teleport/src/Console/DocumentNodes/useNodes.ts b/web/packages/teleport/src/Console/DocumentNodes/useNodes.ts
index 85338911bd4f8..e25856f7c95a8 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/useNodes.ts
+++ b/web/packages/teleport/src/Console/DocumentNodes/useNodes.ts
@@ -19,14 +19,13 @@
 import { useEffect } from 'react';
 
 import {
-  useUrlFiltering,
   useServerSidePagination,
+  useUrlFiltering,
 } from 'teleport/components/hooks';
+import type { Node } from 'teleport/services/nodes';
 
-import * as stores from './../stores';
 import { useConsoleContext } from './../consoleContextProvider';
-
-import type { Node } from 'teleport/services/nodes';
+import * as stores from './../stores';
 
 export default function useNodes({ clusterId, id }: stores.DocumentNodes) {
   const consoleCtx = useConsoleContext();
diff --git a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.story.tsx b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.story.tsx
index 21cbe5048897f..13a27e50b6f4b 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.story.tsx
+++ b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.story.tsx
@@ -17,19 +17,14 @@
  */
 
 import { ContextProvider } from 'teleport';
-
+import * as stores from 'teleport/Console/stores/types';
 import { createTeleportContext } from 'teleport/mocks/contexts';
-
+import type { Session } from 'teleport/services/session';
 import TeleportContext from 'teleport/teleportContext';
 
-import * as stores from 'teleport/Console/stores/types';
-
-import DocumentSsh from './DocumentSsh';
-
 import { TestLayout } from './../Console.story';
 import ConsoleCtx from './../consoleContext';
-
-import type { Session } from 'teleport/services/session';
+import DocumentSsh from './DocumentSsh';
 
 export const Connected = () => {
   const { ctx, consoleCtx } = getContexts();
diff --git a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.test.tsx b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.test.tsx
index 0003326ef754f..1416623548ced 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.test.tsx
+++ b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.test.tsx
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import { MemoryRouter } from 'react-router';
+
+import { render, screen } from 'design/utils/testing';
+
 import 'jest-canvas-mock';
 
 import { allAccessAcl } from 'teleport/mocks/contexts';
 
+import DocumentSsh from '.';
 import ConsoleContext from '../consoleContext';
 import ConsoleContextProvider from '../consoleContextProvider';
 
-import DocumentSsh from '.';
-
 test('file transfer buttons are disabled if user does not have access', async () => {
   const ctx = new ConsoleContext();
   ctx.storeUser.setState({
diff --git a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.tsx b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.tsx
index c378216dd66fb..800afa1fc9209 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.tsx
+++ b/web/packages/teleport/src/Console/DocumentSsh/DocumentSsh.tsx
@@ -16,31 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useEffect, useState, useCallback } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTheme } from 'styled-components';
 
-import { Indicator, Box } from 'design';
-
+import { Box, Indicator } from 'design';
 import {
-  FileTransferActionBar,
   FileTransfer,
-  FileTransferRequests,
+  FileTransferActionBar,
   FileTransferContextProvider,
+  FileTransferRequests,
 } from 'shared/components/FileTransfer';
 import { TerminalSearch } from 'shared/components/TerminalSearch';
 
-import * as stores from 'teleport/Console/stores';
-
 import AuthnDialog from 'teleport/components/AuthnDialog';
+import * as stores from 'teleport/Console/stores';
 import { useMfa } from 'teleport/lib/useMfa';
 
-import Document from '../Document';
-
 import { useConsoleContext } from '../consoleContextProvider';
-
+import Document from '../Document';
 import { Terminal, TerminalRef } from './Terminal';
-import useSshSession from './useSshSession';
 import { useFileTransfer } from './useFileTransfer';
+import useSshSession from './useSshSession';
 
 export default function DocumentSshWrapper(props: PropTypes) {
   return (
diff --git a/web/packages/teleport/src/Console/DocumentSsh/ShareSession/ShareSession.tsx b/web/packages/teleport/src/Console/DocumentSsh/ShareSession/ShareSession.tsx
index f2b0d48354fcb..038c1fa5a0b8e 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/ShareSession/ShareSession.tsx
+++ b/web/packages/teleport/src/Console/DocumentSsh/ShareSession/ShareSession.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, ButtonSecondary } from 'design';
+import { ButtonSecondary, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
diff --git a/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx b/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx
index da11d44e8df7f..5d25b597ca05b 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx
+++ b/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ITheme } from '@xterm/xterm';
 import React, {
   forwardRef,
   useEffect,
@@ -23,14 +24,13 @@ import React, {
   useRef,
 } from 'react';
 import styled from 'styled-components';
-import { Flex } from 'design';
-import { ITheme } from '@xterm/xterm';
 
+import { Flex } from 'design';
 import { getPlatformType } from 'design/platform';
 
-import Tty from 'teleport/lib/term/tty';
-import XTermCtrl from 'teleport/lib/term/terminal';
 import { getMappedAction } from 'teleport/Console/useKeyboardNav';
+import XTermCtrl from 'teleport/lib/term/terminal';
+import Tty from 'teleport/lib/term/tty';
 
 import StyledXterm from '../../StyledXterm';
 
diff --git a/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts b/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts
index 9bf702453fd1a..bfa16b9e4a8f3 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts
+++ b/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts
@@ -17,9 +17,9 @@
  */
 
 import {
+  createFileTransferEventsEmitter,
   FileTransferEventsEmitter,
   FileTransferListeners,
-  createFileTransferEventsEmitter,
 } from 'shared/components/FileTransfer';
 
 import { getAuthHeaders, getNoCacheHeaders } from 'teleport/services/api';
diff --git a/web/packages/teleport/src/Console/DocumentSsh/index.ts b/web/packages/teleport/src/Console/DocumentSsh/index.ts
index de39fe6acc89d..a08f4a387bd8b 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/index.ts
+++ b/web/packages/teleport/src/Console/DocumentSsh/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DocumentSsh from './DocumentSsh';
+
 export default DocumentSsh;
diff --git a/web/packages/teleport/src/Console/DocumentSsh/useFileTransfer.ts b/web/packages/teleport/src/Console/DocumentSsh/useFileTransfer.ts
index 90c3625a902cf..58080d2f02ecb 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/useFileTransfer.ts
+++ b/web/packages/teleport/src/Console/DocumentSsh/useFileTransfer.ts
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
+
 import { useFileTransferContext } from 'shared/components/FileTransfer';
 
-import Tty from 'teleport/lib/term/tty';
+import { DocumentSsh } from 'teleport/Console/stores';
 import { EventType } from 'teleport/lib/term/enums';
+import Tty from 'teleport/lib/term/tty';
 import { Session } from 'teleport/services/session';
-import { DocumentSsh } from 'teleport/Console/stores';
 
 import { useConsoleContext } from '../consoleContextProvider';
-
 import { getHttpFileTransferHandlers } from './httpFileTransferHandlers';
 import useGetScpUrl from './useGetScpUrl';
 
diff --git a/web/packages/teleport/src/Console/DocumentSsh/useGetScpUrl.ts b/web/packages/teleport/src/Console/DocumentSsh/useGetScpUrl.ts
index 478ccbcc5fa59..d945380ba2c37 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/useGetScpUrl.ts
+++ b/web/packages/teleport/src/Console/DocumentSsh/useGetScpUrl.ts
@@ -17,6 +17,7 @@
  */
 
 import { useCallback } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import cfg, { UrlScpParams } from 'teleport/config';
diff --git a/web/packages/teleport/src/Console/DocumentSsh/useSshSession.ts b/web/packages/teleport/src/Console/DocumentSsh/useSshSession.ts
index 26d8ae765a10f..a49772c8ea342 100644
--- a/web/packages/teleport/src/Console/DocumentSsh/useSshSession.ts
+++ b/web/packages/teleport/src/Console/DocumentSsh/useSshSession.ts
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useState, useEffect } from 'react';
-
 import { context, trace } from '@opentelemetry/api';
+import { useEffect, useRef, useState } from 'react';
 
 import cfg from 'teleport/config';
-import { TermEvent } from 'teleport/lib/term/enums';
-import Tty from 'teleport/lib/term/tty';
 import ConsoleContext from 'teleport/Console/consoleContext';
 import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
 import { DocumentSsh } from 'teleport/Console/stores';
-
+import { TermEvent } from 'teleport/lib/term/enums';
+import Tty from 'teleport/lib/term/tty';
 import type {
   ParticipantMode,
   Session,
diff --git a/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx b/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx
index 07f0aba027f99..340c7f32e9433 100644
--- a/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx
+++ b/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
 import '@xterm/xterm/css/xterm.css';
diff --git a/web/packages/teleport/src/Console/StyledXterm/index.ts b/web/packages/teleport/src/Console/StyledXterm/index.ts
index 5f2a3a0a23b6c..e93c0eaa538f0 100644
--- a/web/packages/teleport/src/Console/StyledXterm/index.ts
+++ b/web/packages/teleport/src/Console/StyledXterm/index.ts
@@ -17,4 +17,5 @@
  */
 
 import StyledXterm from './StyledXterm';
+
 export default StyledXterm;
diff --git a/web/packages/teleport/src/Console/Tabs/JoinedUsers/JoinedUsers.jsx b/web/packages/teleport/src/Console/Tabs/JoinedUsers/JoinedUsers.jsx
index 955df3c1cb6a9..48d44bce80c1d 100644
--- a/web/packages/teleport/src/Console/Tabs/JoinedUsers/JoinedUsers.jsx
+++ b/web/packages/teleport/src/Console/Tabs/JoinedUsers/JoinedUsers.jsx
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useState, useMemo } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import styled from 'styled-components';
-import Popover from 'design/Popover';
+
 import { Box } from 'design';
+import Popover from 'design/Popover';
 import { debounce } from 'shared/utils/highbar';
 
 export default function JoinedUsers(props) {
diff --git a/web/packages/teleport/src/Console/Tabs/JoinedUsers/index.js b/web/packages/teleport/src/Console/Tabs/JoinedUsers/index.js
index 4b609f7c85b37..82acee21b8b27 100644
--- a/web/packages/teleport/src/Console/Tabs/JoinedUsers/index.js
+++ b/web/packages/teleport/src/Console/Tabs/JoinedUsers/index.js
@@ -17,4 +17,5 @@
  */
 
 import JoinedUsers from './JoinedUsers';
+
 export default JoinedUsers;
diff --git a/web/packages/teleport/src/Console/Tabs/TabItem.tsx b/web/packages/teleport/src/Console/Tabs/TabItem.tsx
index 35f53d78692ad..a2d1d5f012577 100644
--- a/web/packages/teleport/src/Console/Tabs/TabItem.tsx
+++ b/web/packages/teleport/src/Console/Tabs/TabItem.tsx
@@ -17,9 +17,10 @@
  */
 
 import styled from 'styled-components';
+
+import { Flex, Text } from 'design';
 import { Cross as CloseIcon } from 'design/Icon';
 import { space } from 'design/system';
-import { Flex, Text } from 'design';
 
 import JoinedUsers from './JoinedUsers';
 
diff --git a/web/packages/teleport/src/Console/Tabs/Tabs.story.tsx b/web/packages/teleport/src/Console/Tabs/Tabs.story.tsx
index 09ebdd1fa6c1d..250cab1d4a046 100644
--- a/web/packages/teleport/src/Console/Tabs/Tabs.story.tsx
+++ b/web/packages/teleport/src/Console/Tabs/Tabs.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Tabs from './Tabs';
 import { TestLayout } from './../Console.story';
+import Tabs from './Tabs';
 
 export default {
   title: 'Teleport/Console',
diff --git a/web/packages/teleport/src/Console/Tabs/Tabs.tsx b/web/packages/teleport/src/Console/Tabs/Tabs.tsx
index 607a8e3ed725c..854e5599128aa 100644
--- a/web/packages/teleport/src/Console/Tabs/Tabs.tsx
+++ b/web/packages/teleport/src/Console/Tabs/Tabs.tsx
@@ -17,17 +17,15 @@
  */
 
 import styled from 'styled-components';
-import { typography } from 'design/system';
 
-import * as Icons from 'design/Icon';
 import { Box, ButtonIcon } from 'design';
-
-import { useStore } from 'shared/libs/stores';
-
+import * as Icons from 'design/Icon';
+import { typography } from 'design/system';
 import { TypographyProps } from 'design/system/typography';
+import { useStore } from 'shared/libs/stores';
 
-import * as stores from 'teleport/Console/stores';
 import { useConsoleContext } from 'teleport/Console/consoleContextProvider';
+import * as stores from 'teleport/Console/stores';
 
 import TabItem from './TabItem';
 
diff --git a/web/packages/teleport/src/Console/consoleContext.tsx b/web/packages/teleport/src/Console/consoleContext.tsx
index 24f1d8cc4427f..b7fe2029e8440 100644
--- a/web/packages/teleport/src/Console/consoleContext.tsx
+++ b/web/packages/teleport/src/Console/consoleContext.tsx
@@ -16,38 +16,38 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Logger from 'shared/libs/logger';
-
 import { context, defaultTextMapSetter, trace } from '@opentelemetry/api';
 import { W3CTraceContextPropagator } from '@opentelemetry/core';
 
-import webSession from 'teleport/services/websession';
-import history from 'teleport/services/history';
+import Logger from 'shared/libs/logger';
+
 import cfg, {
   UrlDbConnectParams,
   UrlKubeExecParams,
   UrlSshParams,
 } from 'teleport/config';
-import { getHostName } from 'teleport/services/api';
 import Tty from 'teleport/lib/term/tty';
 import TtyAddressResolver from 'teleport/lib/term/ttyAddressResolver';
+import { getHostName } from 'teleport/services/api';
+import ClustersService from 'teleport/services/clusters';
+import history from 'teleport/services/history';
+import ServiceNodes from 'teleport/services/nodes';
 import serviceSession, {
-  Session,
   ParticipantList,
   ParticipantMode,
+  Session,
 } from 'teleport/services/session';
-import ServiceNodes from 'teleport/services/nodes';
-import ClustersService from 'teleport/services/clusters';
-import { StoreUserContext } from 'teleport/stores';
 import usersService from 'teleport/services/user';
+import webSession from 'teleport/services/websession';
+import { StoreUserContext } from 'teleport/stores';
 
 import {
-  StoreParties,
-  StoreDocs,
-  DocumentSsh,
-  DocumentKubeExec,
   Document,
   DocumentDb,
+  DocumentKubeExec,
+  DocumentSsh,
+  StoreDocs,
+  StoreParties,
 } from './stores';
 
 const logger = Logger.create('teleport/console');
diff --git a/web/packages/teleport/src/Console/consoleContextProvider.tsx b/web/packages/teleport/src/Console/consoleContextProvider.tsx
index 82ad48a753b6d..cc28c3eb901dd 100644
--- a/web/packages/teleport/src/Console/consoleContextProvider.tsx
+++ b/web/packages/teleport/src/Console/consoleContextProvider.tsx
@@ -17,6 +17,7 @@
  */
 
 import React, { PropsWithChildren } from 'react';
+
 import { useStore } from 'shared/libs/stores';
 
 import ConsoleContext from './consoleContext';
diff --git a/web/packages/teleport/src/Console/stores/index.ts b/web/packages/teleport/src/Console/stores/index.ts
index d417f9903b295..5794c8c0be5dd 100644
--- a/web/packages/teleport/src/Console/stores/index.ts
+++ b/web/packages/teleport/src/Console/stores/index.ts
@@ -18,6 +18,7 @@
 
 import StoreDocs from './storeDocs';
 import StoreParties from './storeParties';
+
 export { StoreParties, StoreDocs };
 
 export * from './types';
diff --git a/web/packages/teleport/src/Console/useTabRouting.test.tsx b/web/packages/teleport/src/Console/useTabRouting.test.tsx
index 9422964afd834..2e5668c77c264 100644
--- a/web/packages/teleport/src/Console/useTabRouting.test.tsx
+++ b/web/packages/teleport/src/Console/useTabRouting.test.tsx
@@ -18,10 +18,11 @@
 
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
+
 import renderHook from 'design/utils/renderHook';
 
-import useTabRouting from './useTabRouting';
 import ConsoleContext from './consoleContext';
+import useTabRouting from './useTabRouting';
 
 test('handling of index route', async () => {
   const ctx = new ConsoleContext();
diff --git a/web/packages/teleport/src/Console/useTabRouting.ts b/web/packages/teleport/src/Console/useTabRouting.ts
index ce4306fa82fb6..f5d20b44f57a2 100644
--- a/web/packages/teleport/src/Console/useTabRouting.ts
+++ b/web/packages/teleport/src/Console/useTabRouting.ts
@@ -17,7 +17,7 @@
  */
 
 import { useMemo } from 'react';
-import { useRouteMatch, useParams, useLocation } from 'react-router';
+import { useLocation, useParams, useRouteMatch } from 'react-router';
 
 import cfg, {
   UrlDbConnectParams,
diff --git a/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx b/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx
index bfd4c81daff47..ea6b2368591b5 100644
--- a/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx
+++ b/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx
@@ -16,21 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Box, ButtonSecondary, Link, ButtonPrimary } from 'design';
+import { Box, ButtonPrimary, ButtonSecondary, Link, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
-import { DbProtocol } from 'shared/services/databases';
-
 import { NewTab as NewTabIcon } from 'design/Icon';
+import { DbProtocol } from 'shared/services/databases';
 
-import { AuthType } from 'teleport/services/user';
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
-import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
 import cfg from 'teleport/config';
+import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
+import { AuthType } from 'teleport/services/user';
 
 export default function ConnectDialog({
   username,
diff --git a/web/packages/teleport/src/Databases/ConnectDialog/index.ts b/web/packages/teleport/src/Databases/ConnectDialog/index.ts
index 36057e0d81bec..739fa3d5ba5a6 100644
--- a/web/packages/teleport/src/Databases/ConnectDialog/index.ts
+++ b/web/packages/teleport/src/Databases/ConnectDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ConnectDialog from './ConnectDialog';
+
 export default ConnectDialog;
diff --git a/web/packages/teleport/src/DesktopSession/ActionMenu.tsx b/web/packages/teleport/src/DesktopSession/ActionMenu.tsx
index 552b1d4824815..9e8e1a7ae469d 100644
--- a/web/packages/teleport/src/DesktopSession/ActionMenu.tsx
+++ b/web/packages/teleport/src/DesktopSession/ActionMenu.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MenuIcon, MenuItem, MenuItemIcon } from 'shared/components/MenuAction';
-import * as Icons from 'design/Icon';
 import { Flex } from 'design';
+import * as Icons from 'design/Icon';
+import { MenuIcon, MenuItem, MenuItemIcon } from 'shared/components/MenuAction';
 
 export default function ActionMenu(props: Props) {
   const { showShareDirectory, onShareDirectory, onDisconnect, onCtrlAltDel } =
diff --git a/web/packages/teleport/src/DesktopSession/AlertDropdown.tsx b/web/packages/teleport/src/DesktopSession/AlertDropdown.tsx
index c35bb2a02fab7..4664ab92d4141 100644
--- a/web/packages/teleport/src/DesktopSession/AlertDropdown.tsx
+++ b/web/packages/teleport/src/DesktopSession/AlertDropdown.tsx
@@ -17,13 +17,15 @@
  */
 
 import { useRef, useState } from 'react';
-import { Flex, Button, Card, ButtonIcon, H3 } from 'design';
 import styled, { useTheme } from 'styled-components';
-import { Notification } from 'shared/components/Notification';
-import { Warning, Cross } from 'design/Icon';
-import { useClickOutside } from 'shared/hooks/useClickOutside';
 
-import type { NotificationItem } from 'shared/components/Notification';
+import { Button, ButtonIcon, Card, Flex, H3 } from 'design';
+import { Cross, Warning } from 'design/Icon';
+import {
+  Notification,
+  type NotificationItem,
+} from 'shared/components/Notification';
+import { useClickOutside } from 'shared/hooks/useClickOutside';
 
 export function AlertDropdown({ alerts, onRemoveAlert }: Props) {
   const [showDropdown, setShowDropdown] = useState(false);
diff --git a/web/packages/teleport/src/DesktopSession/DesktopSession.story.tsx b/web/packages/teleport/src/DesktopSession/DesktopSession.story.tsx
index 97606b1ea3b86..1dab83ce8accd 100644
--- a/web/packages/teleport/src/DesktopSession/DesktopSession.story.tsx
+++ b/web/packages/teleport/src/DesktopSession/DesktopSession.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useState } from 'react';
+
 import { ButtonPrimary } from 'design/Button';
 import { NotificationItem } from 'shared/components/Notification';
 import { throttle } from 'shared/utils/highbar';
@@ -24,8 +25,8 @@ import { throttle } from 'shared/utils/highbar';
 import { TdpClient, TdpClientEvent } from 'teleport/lib/tdp';
 import { makeDefaultMfaState } from 'teleport/lib/useMfa';
 
-import { State } from './useDesktopSession';
 import { DesktopSession } from './DesktopSession';
+import { State } from './useDesktopSession';
 
 export default {
   title: 'Teleport/DesktopSession',
diff --git a/web/packages/teleport/src/DesktopSession/DesktopSession.tsx b/web/packages/teleport/src/DesktopSession/DesktopSession.tsx
index f5105f7d0246e..c9511895de418 100644
--- a/web/packages/teleport/src/DesktopSession/DesktopSession.tsx
+++ b/web/packages/teleport/src/DesktopSession/DesktopSession.tsx
@@ -16,30 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
-import { Indicator, Box, Flex, ButtonSecondary, ButtonPrimary } from 'design';
+import { useEffect, useState } from 'react';
+
+import { Box, ButtonPrimary, ButtonSecondary, Flex, Indicator } from 'design';
 import { Info } from 'design/Alert';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
-import TdpClientCanvas from 'teleport/components/TdpClientCanvas';
 import AuthnDialog from 'teleport/components/AuthnDialog';
+import TdpClientCanvas from 'teleport/components/TdpClientCanvas';
+import type { MfaState } from 'teleport/lib/useMfa';
 
+import TopBar from './TopBar';
 import useDesktopSession, {
   clipboardSharingMessage,
   directorySharingPossible,
   isSharingClipboard,
   isSharingDirectory,
+  type State,
+  type WebsocketAttempt,
 } from './useDesktopSession';
-import TopBar from './TopBar';
-
-import type { State, WebsocketAttempt } from './useDesktopSession';
-import type { MfaState } from 'teleport/lib/useMfa';
 
 export function DesktopSessionContainer() {
   const state = useDesktopSession();
diff --git a/web/packages/teleport/src/DesktopSession/KeyboardHandler.tsx b/web/packages/teleport/src/DesktopSession/KeyboardHandler.tsx
index a7bb98061e901..c6fab9b435ee7 100644
--- a/web/packages/teleport/src/DesktopSession/KeyboardHandler.tsx
+++ b/web/packages/teleport/src/DesktopSession/KeyboardHandler.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Platform, getPlatform } from 'design/platform';
+import { getPlatform, Platform } from 'design/platform';
 
-import { TdpClient, ButtonState } from 'teleport/lib/tdp';
+import { ButtonState, TdpClient } from 'teleport/lib/tdp';
 import { SyncKeys } from 'teleport/lib/tdp/codec';
 
 import { Withholder } from './Withholder';
diff --git a/web/packages/teleport/src/DesktopSession/TopBar.tsx b/web/packages/teleport/src/DesktopSession/TopBar.tsx
index 9e69440f024fe..eb0610c2a77dc 100644
--- a/web/packages/teleport/src/DesktopSession/TopBar.tsx
+++ b/web/packages/teleport/src/DesktopSession/TopBar.tsx
@@ -17,16 +17,15 @@
  */
 
 import { useTheme } from 'styled-components';
-import { Text, TopNav, Flex } from 'design';
-import { Clipboard, FolderShared } from 'design/Icon';
 
+import { Flex, Text, TopNav } from 'design';
+import { Clipboard, FolderShared } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
+import type { NotificationItem } from 'shared/components/Notification';
 
 import ActionMenu from './ActionMenu';
 import { AlertDropdown } from './AlertDropdown';
 
-import type { NotificationItem } from 'shared/components/Notification';
-
 export default function TopBar(props: Props) {
   const {
     userHost,
diff --git a/web/packages/teleport/src/DesktopSession/useDesktopSession.tsx b/web/packages/teleport/src/DesktopSession/useDesktopSession.tsx
index 1f642d38d8d96..720cf4ce50677 100644
--- a/web/packages/teleport/src/DesktopSession/useDesktopSession.tsx
+++ b/web/packages/teleport/src/DesktopSession/useDesktopSession.tsx
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useMemo, Dispatch, SetStateAction } from 'react';
+import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router';
 
+import type { NotificationItem } from 'shared/components/Notification';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
+import type { UrlDesktopParams } from 'teleport/config';
 import { ButtonState } from 'teleport/lib/tdp';
 import { useMfa } from 'teleport/lib/useMfa';
 import desktopService from 'teleport/services/desktops';
@@ -28,9 +30,6 @@ import userService from 'teleport/services/user';
 
 import useTdpClientCanvas from './useTdpClientCanvas';
 
-import type { UrlDesktopParams } from 'teleport/config';
-import type { NotificationItem } from 'shared/components/Notification';
-
 export default function useDesktopSession() {
   const { attempt: fetchAttempt, run } = useAttempt('processing');
 
diff --git a/web/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx b/web/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx
index 00ecb243682b6..28b5f0e3038ab 100644
--- a/web/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx
+++ b/web/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx
@@ -17,34 +17,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useRef } from 'react';
-import { Attempt } from 'shared/hooks/useAttemptNext';
+import { useEffect, useRef, useState } from 'react';
+
 import { NotificationItem } from 'shared/components/Notification';
+import { Attempt } from 'shared/hooks/useAttemptNext';
 import { debounce } from 'shared/utils/highbar';
 
-import { TdpClient, ButtonState, ScrollAxis } from 'teleport/lib/tdp';
+import cfg from 'teleport/config';
+import { ButtonState, ScrollAxis, TdpClient } from 'teleport/lib/tdp';
+import type { BitmapFrame } from 'teleport/lib/tdp/client';
 import {
   ClientScreenSpec,
   ClipboardData,
   PngFrame,
 } from 'teleport/lib/tdp/codec';
-import { getHostName } from 'teleport/services/api';
-import cfg from 'teleport/config';
 import { Sha256Digest } from 'teleport/lib/util';
+import { getHostName } from 'teleport/services/api';
 
+import { KeyboardHandler } from './KeyboardHandler';
 import { TopBarHeight } from './TopBar';
 import {
-  ClipboardSharingState,
-  DirectorySharingState,
-  Setter,
   clipboardSharingPossible,
+  ClipboardSharingState,
   defaultClipboardSharingState,
   defaultDirectorySharingState,
+  DirectorySharingState,
   isSharingClipboard,
+  Setter,
 } from './useDesktopSession';
-import { KeyboardHandler } from './KeyboardHandler';
-
-import type { BitmapFrame } from 'teleport/lib/tdp/client';
 
 declare global {
   interface Navigator {
diff --git a/web/packages/teleport/src/DeviceTrust/DeviceTrustLocked.tsx b/web/packages/teleport/src/DeviceTrust/DeviceTrustLocked.tsx
index 6d9dc859579cf..d5188f3782af9 100644
--- a/web/packages/teleport/src/DeviceTrust/DeviceTrustLocked.tsx
+++ b/web/packages/teleport/src/DeviceTrust/DeviceTrustLocked.tsx
@@ -19,27 +19,22 @@
 import styled from 'styled-components';
 
 import { Box, Flex, Link } from 'design';
-
-import { IconCircle } from 'design/Icon/IconCircle';
-
-import { Windows, Linux, Apple, Lock } from 'design/Icon';
-
 import Table, { Cell } from 'design/DataTable';
-
+import { Apple, Linux, Lock, Windows } from 'design/Icon';
+import { IconCircle } from 'design/Icon/IconCircle';
 import { P } from 'design/Text/Text';
 
-import {
-  DeviceListProps,
-  TrustedDeviceOSType,
-} from 'teleport/DeviceTrust/types';
-
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
+import {
+  DeviceListProps,
+  TrustedDeviceOSType,
+} from 'teleport/DeviceTrust/types';
 import { CtaEvent } from 'teleport/services/userEvent';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 
 export function DeviceTrustLocked() {
   return (
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/AppCreatedDialog.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/AppCreatedDialog.tsx
index ec60acb2dc1e6..e86e4d029cda9 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/AppCreatedDialog.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/AppCreatedDialog.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Flex, ButtonPrimary } from 'design';
-import * as Icons from 'design/Icon';
+import { ButtonPrimary, Flex, Text } from 'design';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import * as Icons from 'design/Icon';
 
 export function AppCreatedDialog({
   toNextStep,
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.story.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.story.tsx
index bc2a2b1245874..b875b4ee6f251 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.story.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.story.tsx
@@ -16,22 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { delay, http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
+
 import { Info } from 'design/Alert';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import { DiscoverEventResource } from 'teleport/services/userEvent';
 
 import { CreateAppAccess } from './CreateAppAccess';
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.test.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.test.tsx
index ab58947ca3980..a1ac5d1b032b7 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.test.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.test.tsx
@@ -17,29 +17,29 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-import {
-  IntegrationKind,
-  IntegrationStatusCode,
-  integrationService,
-} from 'teleport/services/integrations';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import cfg from 'teleport/config';
-import TeleportContext from 'teleport/teleportContext';
+import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import {
   DiscoverContextState,
   DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
 import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import {
+  IntegrationKind,
+  integrationService,
+  IntegrationStatusCode,
+} from 'teleport/services/integrations';
 import {
   DiscoverEventResource,
   userEventService,
 } from 'teleport/services/userEvent';
-import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
-import { ResourceKind } from 'teleport/Discover/Shared';
+import TeleportContext from 'teleport/teleportContext';
 
 import { CreateAppAccess } from './CreateAppAccess';
 
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.tsx
index 3f266ee9b32a5..d3341bce3d419 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/CreateAppAccess/CreateAppAccess.tsx
@@ -17,23 +17,22 @@
  */
 
 import styled from 'styled-components';
-import { Box, Flex, Link, Mark, H3 } from 'design';
-import TextEditor from 'shared/components/TextEditor';
+
+import { Box, Flex, H3, Link, Mark } from 'design';
 import { Danger } from 'design/Alert';
+import { P } from 'design/Text/Text';
 import { IconTooltip } from 'design/Tooltip';
+import TextEditor from 'shared/components/TextEditor';
 import { useAsync } from 'shared/hooks/useAsync';
 
-import { P } from 'design/Text/Text';
-
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
-import { useDiscover } from 'teleport/Discover/useDiscover';
-import { integrationService } from 'teleport/services/integrations';
 import cfg from 'teleport/config';
 import { Container } from 'teleport/Discover/Shared/CommandBox';
+import { useDiscover } from 'teleport/Discover/useDiscover';
+import { integrationService } from 'teleport/services/integrations';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 
 import { ActionButtons, Header } from '../../Shared';
-
 import { AppCreatedDialog } from './AppCreatedDialog';
 
 const IAM_POLICY_NAME = 'AWSAppAccess';
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.story.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.story.tsx
index 236d763712d6e..61d0c1ee65f48 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.story.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.story.tsx
@@ -16,27 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { http, HttpResponse } from 'msw';
 import React from 'react';
 import { MemoryRouter } from 'react-router';
-import { http, HttpResponse } from 'msw';
+
 import { AwsRole } from 'shared/services/apps';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import { DiscoverEventResource } from 'teleport/services/userEvent';
 
 import { app } from '../fixtures';
-
 import { SetupAccess } from './SetupAccess';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.tsx
index 62b81ba28aaec..d14cfec59e095 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/SetupAccess/SetupAccess.tsx
@@ -16,25 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
-import { LabelInput, Link, Mark } from 'design';
+import React, { useEffect, useState } from 'react';
 import { useTheme } from 'styled-components';
-import { Cross } from 'design/Icon';
 
+import { LabelInput, Link, Mark } from 'design';
 import { OutlineInfo } from 'design/Alert/Alert';
+import { Cross } from 'design/Icon';
+import { P } from 'design/Text/Text';
 import { FieldSelectCreatable } from 'shared/components/FieldSelect';
 import Validation, { Validator } from 'shared/components/Validation';
 
-import { P } from 'design/Text/Text';
-
+import { AWS_TAG_INFO_LINK } from 'teleport/Discover/Shared/const';
 import { Option } from 'teleport/Discover/Shared/SelectCreatable';
-import { IAM_ROLE_ARN_REGEX } from 'teleport/services/integrations/aws';
+import { styles } from 'teleport/Discover/Shared/SelectCreatable/SelectCreatable';
 import {
-  useUserTraits,
   SetupAccessWrapper,
+  useUserTraits,
 } from 'teleport/Discover/Shared/SetupAccess';
-import { styles } from 'teleport/Discover/Shared/SelectCreatable/SelectCreatable';
-import { AWS_TAG_INFO_LINK } from 'teleport/Discover/Shared/const';
+import { IAM_ROLE_ARN_REGEX } from 'teleport/services/integrations/aws';
 
 export function SetupAccess() {
   const {
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.story.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.story.tsx
index 165778e4b5e6d..151eafda5d200 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.story.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.story.tsx
@@ -20,14 +20,13 @@ import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { app } from '../fixtures';
-
 import { TestConnection as Comp } from './TestConnection';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.tsx
index e14ebefba6608..7ebae176c4324 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/TestConnection/TestConnection.tsx
@@ -17,29 +17,27 @@
  */
 
 import { useState } from 'react';
-import { Box, Link, Mark, H3 } from 'design';
-import Select from 'shared/components/Select';
-import { OutlineInfo } from 'design/Alert/Alert';
-import { TextSelectCopy } from 'shared/components/TextSelectCopy';
 
+import { Box, H3, Link, Mark } from 'design';
+import { OutlineInfo } from 'design/Alert/Alert';
 import { P } from 'design/Text/Text';
+import Select, { type Option } from 'shared/components/Select';
+import { TextSelectCopy } from 'shared/components/TextSelectCopy';
 
 import cfg from 'teleport/config';
-import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
 import {
-  Header,
   ActionButtons,
+  Header,
   HeaderSubtitle,
   StyledBox,
 } from 'teleport/Discover/Shared';
-import useTeleport from 'teleport/useTeleport';
-import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 import { AWS_TAG_INFO_LINK } from 'teleport/Discover/Shared/const';
+import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
+import { splitAwsIamArn } from 'teleport/services/integrations/aws';
+import useTeleport from 'teleport/useTeleport';
 
 import { AppMeta, useDiscover } from '../../useDiscover';
 
-import type { Option } from 'shared/components/Select';
-
 export function TestConnection() {
   const ctx = useTeleport();
   const { username, authType } = ctx.storeUser.state;
diff --git a/web/packages/teleport/src/Discover/AwsMangementConsole/index.tsx b/web/packages/teleport/src/Discover/AwsMangementConsole/index.tsx
index d800066c628a1..eb8dffcfb088a 100644
--- a/web/packages/teleport/src/Discover/AwsMangementConsole/index.tsx
+++ b/web/packages/teleport/src/Discover/AwsMangementConsole/index.tsx
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AwsAccount, ResourceKind, Finished } from 'teleport/Discover/Shared';
 import { ResourceViewConfig } from 'teleport/Discover/flow';
 import { ResourceSpec } from 'teleport/Discover/SelectResource';
-
+import { AwsAccount, Finished, ResourceKind } from 'teleport/Discover/Shared';
 import { DiscoverEvent } from 'teleport/services/userEvent';
 
 import { CreateAppAccess } from './CreateAppAccess/CreateAppAccess';
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.story.tsx b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.story.tsx
index b81246f9b195a..12abddcc32b6f 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.story.tsx
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
 import { withoutQuery } from 'web/packages/build/storybook';
 
 import {
@@ -27,9 +27,9 @@ import {
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { UserContext } from 'teleport/User/UserContext';
 import { createTeleportContext } from 'teleport/mocks/contexts';
 import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
+import { UserContext } from 'teleport/User/UserContext';
 
 import { SetupConnect } from './SetupConnect';
 
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.test.ts b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.test.ts
index 4010401f684b7..f121720cc7323 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.test.ts
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.test.ts
@@ -18,12 +18,11 @@
 
 import { renderHook, waitFor } from '@testing-library/react';
 
-import * as useTeleport from 'teleport/useTeleport';
+import { nodes } from 'teleport/Nodes/fixtures';
 import NodeService, { Node } from 'teleport/services/nodes';
 import UserService from 'teleport/services/user';
 import TeleportContext from 'teleport/teleportContext';
-
-import { nodes } from 'teleport/Nodes/fixtures';
+import * as useTeleport from 'teleport/useTeleport';
 
 import { usePollForConnectMyComputerNode } from './SetupConnect';
 
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.tsx b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.tsx
index 4dfefd4a38240..a0352cf4c55a6 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.tsx
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/SetupConnect/SetupConnect.tsx
@@ -16,39 +16,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useCallback, useState, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 
+import { Flex, H3, Subtitle3, Text } from 'design';
 import { ButtonSecondary } from 'design/Button';
-import { getPlatform } from 'design/platform';
-import { Text, Flex, H3, Subtitle3 } from 'design';
 import * as Icons from 'design/Icon';
-import { makeDeepLinkWithSafeInput } from 'shared/deepLinks';
-import * as connectMyComputer from 'shared/connectMyComputer';
+import { getPlatform } from 'design/platform';
+import { P } from 'design/Text/Text';
 import {
   DownloadConnect,
   getConnectDownloadLinks,
 } from 'shared/components/DownloadConnect/DownloadConnect';
-
-import { P } from 'design/Text/Text';
+import * as connectMyComputer from 'shared/connectMyComputer';
+import { makeDeepLinkWithSafeInput } from 'shared/deepLinks';
 
 import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
-import { Node } from 'teleport/services/nodes';
-
 import {
   ActionButtons,
   Header,
   StyledBox,
   TextIcon,
 } from 'teleport/Discover/Shared';
-import { usePoll } from 'teleport/Discover/Shared/usePoll';
-
 import {
   HintBox,
   SuccessBox,
   WaitingInfo,
 } from 'teleport/Discover/Shared/HintBox';
+import { usePoll } from 'teleport/Discover/Shared/usePoll';
+import { Node } from 'teleport/services/nodes';
+import useTeleport from 'teleport/useTeleport';
 
 import type { AgentStepProps } from '../../types';
 
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.story.tsx b/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.story.tsx
index 0f6c5098c4e1d..f02fb2940c329 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.story.tsx
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.story.tsx
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { MemoryRouter } from 'react-router';
-import { http, HttpResponse, delay } from 'msw';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { nodes } from 'teleport/Nodes/fixtures';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import { nodes } from 'teleport/Nodes/fixtures';
 
 import { TestConnection } from './TestConnection';
 
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.tsx b/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.tsx
index eddce1b82a260..68ee43cddc4f8 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.tsx
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.tsx
@@ -16,49 +16,46 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+
 import {
+  Box,
   ButtonPrimary,
   ButtonSecondary,
-  Text,
-  Box,
-  LabelInput,
+  H3,
   Indicator,
+  LabelInput,
   Link,
-  H3,
   Subtitle3,
+  Text,
 } from 'design';
-import Select from 'shared/components/Select';
-import { useAsync } from 'shared/hooks/useAsync';
 import * as Icons from 'design/Icon';
-import * as connectMyComputer from 'shared/connectMyComputer';
-
 import { P } from 'design/Text/Text';
+import Select, { type Option } from 'shared/components/Select';
+import * as connectMyComputer from 'shared/connectMyComputer';
+import { useAsync } from 'shared/hooks/useAsync';
 
-import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
 import ReAuthenticate from 'teleport/components/ReAuthenticate';
-import { openNewTab } from 'teleport/lib/util';
+import cfg from 'teleport/config';
 import {
-  useConnectionDiagnostic,
-  Header,
   ActionButtons,
-  HeaderSubtitle,
   ConnectionDiagnosticResult,
+  Header,
+  HeaderSubtitle,
   StyledBox,
   TextIcon,
+  useConnectionDiagnostic,
 } from 'teleport/Discover/Shared';
-import { sortNodeLogins } from 'teleport/services/nodes';
+import { openNewTab } from 'teleport/lib/util';
+import type { ConnectionDiagnosticRequest } from 'teleport/services/agents';
 import { ApiError } from 'teleport/services/api/parseError';
-
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
+import { sortNodeLogins } from 'teleport/services/nodes';
+import useTeleport from 'teleport/useTeleport';
 
-import { NodeMeta } from '../../useDiscover';
-
-import type { Option } from 'shared/components/Select';
 import type { AgentStepProps } from '../../types';
-import type { MfaChallengeResponse } from 'teleport/services/mfa';
-import type { ConnectionDiagnosticRequest } from 'teleport/services/agents';
+import { NodeMeta } from '../../useDiscover';
 
 export function TestConnection(props: AgentStepProps) {
   const { userService, storeUser } = useTeleport();
diff --git a/web/packages/teleport/src/Discover/ConnectMyComputer/index.ts b/web/packages/teleport/src/Discover/ConnectMyComputer/index.ts
index 2d3007266a999..9d53076abeed6 100644
--- a/web/packages/teleport/src/Discover/ConnectMyComputer/index.ts
+++ b/web/packages/teleport/src/Discover/ConnectMyComputer/index.ts
@@ -21,7 +21,6 @@ import { Finished, ResourceKind } from 'teleport/Discover/Shared';
 import { DiscoverEvent } from 'teleport/services/userEvent';
 
 import { ResourceSpec } from '../SelectResource';
-
 import { SetupConnect } from './SetupConnect';
 import { TestConnection } from './TestConnection';
 
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.story.tsx b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.story.tsx
index 7276f47992078..c34bee1ab3a28 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.story.tsx
@@ -19,9 +19,7 @@
 import { MemoryRouter } from 'react-router';
 
 import { DatabaseEngine, DatabaseLocation } from '../../SelectResource';
-
 import { CreateDatabaseView } from './CreateDatabase';
-
 import type { State } from './useCreateDatabase';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.tsx b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.tsx
index ac1dad4f82457..c741944ebf6bc 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.tsx
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabase.tsx
@@ -16,32 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
-import { Text, Box, Flex, Mark } from 'design';
+import { useEffect, useState } from 'react';
 
-import Validation, { Validator } from 'shared/components/Validation';
+import { Box, Flex, Mark, Text } from 'design';
+import { P } from 'design/Text/Text';
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import TextEditor from 'shared/components/TextEditor';
+import Validation, { Validator } from 'shared/components/Validation';
+import { requiredField } from 'shared/components/Validation/rules';
 
-import { P } from 'design/Text/Text';
+import type { ResourceLabel } from 'teleport/services/agents';
 
+import {
+  getDatabaseProtocol,
+  getDefaultDatabasePort,
+} from '../../SelectResource';
 import {
   ActionButtons,
+  Header,
   HeaderSubtitle,
   LabelsCreater,
-  Header,
 } from '../../Shared';
 import { dbCU } from '../../yamlTemplates';
-import {
-  getDatabaseProtocol,
-  getDefaultDatabasePort,
-} from '../../SelectResource';
-
-import { useCreateDatabase, State } from './useCreateDatabase';
 import { CreateDatabaseDialog } from './CreateDatabaseDialog';
-
-import type { ResourceLabel } from 'teleport/services/agents';
+import { State, useCreateDatabase } from './useCreateDatabase';
 
 export function CreateDatabase() {
   const state = useCreateDatabase();
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx
index ec1a9036c8ed6..4657818e35e58 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx
@@ -18,11 +18,11 @@
 
 import { Info } from 'design/Alert';
 
+import { dbWithoutDbServerExistsErrorMsg, timeoutErrorMsg } from './const';
 import {
   CreateDatabaseDialog,
   CreateDatabaseDialogProps,
 } from './CreateDatabaseDialog';
-import { dbWithoutDbServerExistsErrorMsg, timeoutErrorMsg } from './const';
 
 export default {
   title: 'Teleport/Discover/Database/CreateDatabase/Dialog',
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx
index 923f2028be6c6..47deff24e7b52 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx
@@ -17,24 +17,23 @@
  */
 
 import {
-  Text,
-  Flex,
   AnimatedProgressBar,
   ButtonPrimary,
   ButtonSecondary,
-  H2,
   ButtonWarning,
+  Flex,
+  H2,
+  Text,
 } from 'design';
-import * as Icons from 'design/Icon';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import * as Icons from 'design/Icon';
+import type { Attempt } from 'shared/hooks/useAttemptNext';
 
-import { Timeout } from 'teleport/Discover/Shared/Timeout';
 import { TextIcon } from 'teleport/Discover/Shared';
+import { Timeout } from 'teleport/Discover/Shared/Timeout';
 
 import { dbWithoutDbServerExistsErrorMsg, timeoutErrorMsg } from './const';
 
-import type { Attempt } from 'shared/hooks/useAttemptNext';
-
 export type CreateDatabaseDialogProps = {
   pollTimeout: number;
   attempt: Attempt;
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.test.tsx b/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.test.tsx
index fb4ea2c3c3ddc..4ee174f0486d7 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.test.tsx
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.test.tsx
@@ -16,31 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act, renderHook, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router';
-import { renderHook, act, waitFor } from '@testing-library/react';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContextProvider } from 'teleport';
-import {
-  DiscoverProvider,
-  DiscoverContextState,
-} from 'teleport/Discover/useDiscover';
-import api from 'teleport/services/api';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { userEventService } from 'teleport/services/userEvent';
 import cfg from 'teleport/config';
 import {
   DatabaseEngine,
   DatabaseLocation,
 } from 'teleport/Discover/SelectResource';
 import {
-  IamPolicyStatus,
+  DiscoverContextState,
+  DiscoverProvider,
+} from 'teleport/Discover/useDiscover';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import api from 'teleport/services/api';
+import {
   CreateDatabaseRequest,
+  IamPolicyStatus,
 } from 'teleport/services/databases';
+import { userEventService } from 'teleport/services/userEvent';
 
 import {
-  useCreateDatabase,
   findActiveDatabaseSvc,
+  useCreateDatabase,
   WAITING_TIMEOUT,
 } from './useCreateDatabase';
 
diff --git a/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.ts b/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.ts
index 8b2ab77e7f8d2..a184ec7a3de12 100644
--- a/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.ts
+++ b/web/packages/teleport/src/Discover/Database/CreateDatabase/useCreateDatabase.ts
@@ -21,27 +21,24 @@ import { useEffect, useState } from 'react';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 
-import useTeleport from 'teleport/useTeleport';
-import { useDiscover } from 'teleport/Discover/useDiscover';
+import cfg from 'teleport/config';
+import { DatabaseLocation } from 'teleport/Discover/SelectResource';
 import { usePoll } from 'teleport/Discover/Shared/usePoll';
+import { useDiscover, type DbMeta } from 'teleport/Discover/useDiscover';
 import { compareByString } from 'teleport/lib/util';
+import type { ResourceLabel } from 'teleport/services/agents';
 import { ApiError } from 'teleport/services/api/parseError';
-import { DatabaseLocation } from 'teleport/Discover/SelectResource';
-import { IamPolicyStatus } from 'teleport/services/databases';
-import cfg from 'teleport/config';
+import {
+  IamPolicyStatus,
+  type CreateDatabaseRequest,
+  type Database as DatabaseResource,
+  type DatabaseService,
+} from 'teleport/services/databases';
+import useTeleport from 'teleport/useTeleport';
 
 import { matchLabels } from '../common';
-
 import { dbWithoutDbServerExistsErrorMsg, timeoutErrorMsg } from './const';
 
-import type {
-  CreateDatabaseRequest,
-  Database as DatabaseResource,
-  DatabaseService,
-} from 'teleport/services/databases';
-import type { ResourceLabel } from 'teleport/services/agents';
-import type { DbMeta } from 'teleport/Discover/useDiscover';
-
 export const WAITING_TIMEOUT = 30000; // 30 seconds
 
 export function useCreateDatabase() {
diff --git a/web/packages/teleport/src/Discover/Database/DatabaseWrapper.tsx b/web/packages/teleport/src/Discover/Database/DatabaseWrapper.tsx
index 008ad5d09b352..0f17ea044532f 100644
--- a/web/packages/teleport/src/Discover/Database/DatabaseWrapper.tsx
+++ b/web/packages/teleport/src/Discover/Database/DatabaseWrapper.tsx
@@ -18,9 +18,8 @@
 
 import React, { useEffect } from 'react';
 
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import { PING_INTERVAL } from 'teleport/Discover/Database/config';
-
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 
 import { ResourceKind } from '../Shared';
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.story.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.story.tsx
index f448c137e5bad..11f103e8744dc 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.story.tsx
@@ -19,20 +19,17 @@
 import { delay, http, HttpResponse } from 'msw';
 
 import cfg from 'teleport/config';
-
-import { ResourceKind } from 'teleport/Discover/Shared';
-
 import {
   ComponentWrapper,
   getDbMeta,
   getDbResourceSpec,
 } from 'teleport/Discover/Fixtures/databases';
-
 import { TeleportProvider } from 'teleport/Discover/Fixtures/fixtures';
 import {
   DatabaseEngine,
   DatabaseLocation,
 } from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
 
 import { AutoDeploy } from './AutoDeploy';
 
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.test.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.test.tsx
index b1ca3d88a2ae5..80c18bfa8b4ff 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.test.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.test.tsx
@@ -17,9 +17,25 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { act, fireEvent, render, screen } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
+import cfg from 'teleport/config';
+import {
+  DatabaseEngine,
+  DatabaseLocation,
+} from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
+import { SHOW_HINT_TIMEOUT } from 'teleport/Discover/Shared/useShowHint';
+import {
+  DbMeta,
+  DiscoverContextState,
+  DiscoverProvider,
+} from 'teleport/Discover/useDiscover';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   AwsRdsDatabase,
   Integration,
@@ -28,24 +44,8 @@ import {
   IntegrationStatusCode,
   Regions,
 } from 'teleport/services/integrations';
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import cfg from 'teleport/config';
-import TeleportContext from 'teleport/teleportContext';
-import {
-  DbMeta,
-  DiscoverContextState,
-  DiscoverProvider,
-} from 'teleport/Discover/useDiscover';
-import {
-  DatabaseEngine,
-  DatabaseLocation,
-} from 'teleport/Discover/SelectResource';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
-import { ResourceKind } from 'teleport/Discover/Shared';
-import { SHOW_HINT_TIMEOUT } from 'teleport/Discover/Shared/useShowHint';
-
 import { userEventService } from 'teleport/services/userEvent';
+import TeleportContext from 'teleport/teleportContext';
 
 import { AutoDeploy } from './AutoDeploy';
 
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx
index 51801fca10dbe..675393fa36256 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx
@@ -16,63 +16,60 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
+
 import {
   Box,
   ButtonSecondary,
+  Link as ExternalLink,
+  Flex,
+  H3,
   Link,
-  Text,
   Mark,
-  H3,
   Subtitle3,
-  Link as ExternalLink,
-  Flex,
+  Text,
 } from 'design';
 import * as Icons from 'design/Icon';
+import { P } from 'design/Text/Text';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
-import useAttempt from 'shared/hooks/useAttemptNext';
 import { requiredIamRoleName } from 'shared/components/Validation/rules';
-
-import { P } from 'design/Text/Text';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
-import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import cfg from 'teleport/config';
 import {
   HintBox,
   SuccessBox,
   WaitingInfo,
 } from 'teleport/Discover/Shared/HintBox';
+import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import { DbMeta, useDiscover } from 'teleport/Discover/useDiscover';
+import type { Database } from 'teleport/services/databases';
 import { integrationService, Regions } from 'teleport/services/integrations';
-import { useDiscover, DbMeta } from 'teleport/Discover/useDiscover';
+import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 import {
   DiscoverEventStatus,
   DiscoverServiceDeployMethod,
   DiscoverServiceDeployType,
 } from 'teleport/services/userEvent';
-import cfg from 'teleport/config';
-import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 
 import {
   ActionButtons,
+  AlternateInstructionButton,
+  Header,
   HeaderSubtitle,
   TextIcon,
   useShowHint,
-  Header,
-  AlternateInstructionButton,
 } from '../../../Shared';
-import awsEcsLight from '../../aws-ecs-light.svg';
-import awsEcsDark from '../../aws-ecs-dark.svg';
 import awsEcsBblp from '../../aws-ecs-bblp.svg';
-
+import awsEcsDark from '../../aws-ecs-dark.svg';
+import awsEcsLight from '../../aws-ecs-light.svg';
 import { DeployServiceProp } from '../DeployService';
-
 import { SelectSecurityGroups } from './SelectSecurityGroups';
 import { SelectSubnetIds } from './SelectSubnetIds';
 
-import type { Database } from 'teleport/services/databases';
-
 export function AutoDeploy({ toggleDeployMethod }: DeployServiceProp) {
   const { emitErrorEvent, nextStep, emitEvent, agentMeta, updateAgentMeta } =
     useDiscover();
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx
index 1717a082208ba..10d9121cbd716 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx
@@ -16,29 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
-import { Text, Flex, Box, Indicator, ButtonSecondary, Subtitle3 } from 'design';
-import * as Icons from 'design/Icon';
+import { Box, ButtonSecondary, Flex, Indicator, Subtitle3, Text } from 'design';
 import { FetchStatus } from 'design/DataTable/types';
+import * as Icons from 'design/Icon';
+import { P, P3 } from 'design/Text/Text';
 import { HoverTooltip, IconTooltip } from 'design/Tooltip';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 import { pluralize } from 'shared/utils/text';
-import { P, P3 } from 'design/Text/Text';
 
+import { DbMeta } from 'teleport/Discover/useDiscover';
 import {
   AwsRdsDatabase,
   integrationService,
   SecurityGroup,
   SecurityGroupRule,
 } from 'teleport/services/integrations';
-import { DbMeta } from 'teleport/Discover/useDiscover';
 
 import {
+  ButtonBlueText,
   SecurityGroupPicker,
   SecurityGroupWithRecommendation,
-  ButtonBlueText,
 } from '../../../Shared';
 
 type TableData = {
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx
index 8a6e93a0491b1..503d28eafd03e 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx
@@ -16,27 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import {
-  Text,
-  Flex,
   Box,
-  Indicator,
   ButtonSecondary,
-  Subtitle3,
+  Flex,
+  Indicator,
   P3,
+  Subtitle3,
+  Text,
 } from 'design';
-import * as Icons from 'design/Icon';
 import { FetchStatus } from 'design/DataTable/types';
+import * as Icons from 'design/Icon';
 import { HoverTooltip, IconTooltip } from 'design/Tooltip';
-import { pluralize } from 'shared/utils/text';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
+import { pluralize } from 'shared/utils/text';
 
 import { SubnetIdPicker } from 'teleport/Discover/Shared/SubnetIdPicker';
-import { integrationService, Subnet } from 'teleport/services/integrations';
 import { DbMeta } from 'teleport/Discover/useDiscover';
+import { integrationService, Subnet } from 'teleport/services/integrations';
 import useTeleport from 'teleport/useTeleport';
 
 import { ButtonBlueText } from '../../../Shared';
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/DeployService.tsx b/web/packages/teleport/src/Discover/Database/DeployService/DeployService.tsx
index 605c9c2ddacf8..9b11f3a581130 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/DeployService.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/DeployService.tsx
@@ -19,9 +19,8 @@
 import { useState } from 'react';
 
 import { ServiceDeployMethod } from '../common';
-
-import { ManualDeploy } from './ManualDeploy';
 import { AutoDeploy } from './AutoDeploy';
+import { ManualDeploy } from './ManualDeploy';
 
 export function DeployService() {
   const [deployMethod, setDeployMethod] = useState<ServiceDeployMethod>('auto');
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.story.tsx b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.story.tsx
index 44b9bd75c0265..4b11b3df65403 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.story.tsx
@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
 
-import { Context as TeleportContext, ContextProvider } from 'teleport';
+import { ContextProvider, Context as TeleportContext } from 'teleport';
 import cfg from 'teleport/config';
-import { ResourceKind } from 'teleport/Discover/Shared';
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
-import { getUserContext } from 'teleport/mocks/contexts';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { INTERNAL_RESOURCE_ID_LABEL_KEY } from 'teleport/services/joinToken';
 import {
   DatabaseEngine,
   DatabaseLocation,
 } from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { getUserContext } from 'teleport/mocks/contexts';
+import { INTERNAL_RESOURCE_ID_LABEL_KEY } from 'teleport/services/joinToken';
 
 import ManualDeploy from './ManualDeploy';
 
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.tsx b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.tsx
index cf056ad6ef285..4420460d05ed4 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.tsx
+++ b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.tsx
@@ -16,32 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Suspense, useState, useEffect } from 'react';
-import { Box, ButtonSecondary, Text, Mark, H3 } from 'design';
+import { Suspense, useEffect, useState } from 'react';
+
+import { Box, ButtonSecondary, H3, Mark, Text } from 'design';
 import * as Icons from 'design/Icon';
 import Validation, { Validator } from 'shared/components/Validation';
 
 import { CatchError } from 'teleport/components/CatchError';
-import {
-  clearCachedJoinTokenResult,
-  useJoinTokenSuspender,
-} from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
-import { ResourceLabel } from 'teleport/services/agents';
-import cfg from 'teleport/config';
-import { Database } from 'teleport/services/databases';
-
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
-
+import cfg from 'teleport/config';
+import { DatabaseLocation } from 'teleport/Discover/SelectResource';
+import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
 import {
   HintBox,
   SuccessBox,
   WaitingInfo,
 } from 'teleport/Discover/Shared/HintBox';
-
-import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
+import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import {
+  clearCachedJoinTokenResult,
+  useJoinTokenSuspender,
+} from 'teleport/Discover/Shared/useJoinTokenSuspender';
 import { useDiscover } from 'teleport/Discover/useDiscover';
-import { DatabaseLocation } from 'teleport/Discover/SelectResource';
+import { ResourceLabel } from 'teleport/services/agents';
+import { Database } from 'teleport/services/databases';
 import {
   DiscoverEventStatus,
   DiscoverServiceDeployMethod,
@@ -58,7 +56,7 @@ import {
   TextIcon,
   useShowHint,
 } from '../../../Shared';
-import { Labels, hasMatchingLabels } from '../../common';
+import { hasMatchingLabels, Labels } from '../../common';
 import { DeployServiceProp } from '../DeployService';
 
 export default function Container({ toggleDeployMethod }: DeployServiceProp) {
diff --git a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/index.ts b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/index.ts
index 7919452715950..86e2646226dbc 100644
--- a/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/index.ts
+++ b/web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ManualDeploy from './ManualDeploy';
+
 export { ManualDeploy };
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoDiscoverToggle.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoDiscoverToggle.tsx
index a5a12c24c6d21..56d6b969fed0a 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoDiscoverToggle.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoDiscoverToggle.tsx
@@ -17,7 +17,6 @@
  */
 
 import { Box, Toggle } from 'design';
-
 import { IconTooltip } from 'design/Tooltip';
 
 export function AutoDiscoverToggle({
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoEnrollment.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoEnrollment.tsx
index f2254c79b178e..d6ef0b85041f2 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoEnrollment.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/AutoEnrollment.tsx
@@ -16,34 +16,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
 import { Text } from 'design';
+import { Alert } from 'design/Alert/Alert';
 import { FetchStatus } from 'design/DataTable/types';
 import useAttempt, { Attempt } from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
-import { Alert } from 'design/Alert/Alert';
 
+import cfg from 'teleport/config';
+import { CreatedDiscoveryConfigDialog } from 'teleport/Discover/Shared/ConfigureDiscoveryService';
 import { DbMeta, useDiscover } from 'teleport/Discover/useDiscover';
+import {
+  createDiscoveryConfig,
+  DISCOVERY_GROUP_CLOUD,
+} from 'teleport/services/discovery';
 import {
   AwsRdsDatabase,
+  integrationService,
   Regions,
   Vpc,
-  integrationService,
 } from 'teleport/services/integrations';
-import cfg from 'teleport/config';
-import {
-  DISCOVERY_GROUP_CLOUD,
-  createDiscoveryConfig,
-} from 'teleport/services/discovery';
-import useTeleport from 'teleport/useTeleport';
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
-import { CreatedDiscoveryConfigDialog } from 'teleport/Discover/Shared/ConfigureDiscoveryService';
+import useTeleport from 'teleport/useTeleport';
 
 import { ActionButtons } from '../../Shared';
-
 import { DatabaseList } from './RdsDatabaseList';
 
 type TableData = {
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
index e6ae451c5f28f..d883a3345783d 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
@@ -16,27 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { useEffect } from 'react';
 import { MemoryRouter } from 'react-router';
-import { http, HttpResponse, delay } from 'msw';
-import { Info } from 'design/Alert';
 import { withoutQuery } from 'web/packages/build/storybook';
 
+import { Info } from 'design/Alert';
+
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
+  DatabaseEngine,
+  DatabaseLocation,
+} from 'teleport/Discover/SelectResource';
+import {
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import {
-  DatabaseEngine,
-  DatabaseLocation,
-} from 'teleport/Discover/SelectResource';
 
 import { EnrollRdsDatabase } from './EnrollRdsDatabase';
 
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.test.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.test.tsx
index 76fcc62a7d7a4..53e84624adcde 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.test.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.test.tsx
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, fireEvent, act } from 'design/utils/testing';
+import { act, fireEvent, render, screen } from 'design/utils/testing';
 
+import cfg from 'teleport/config';
+import { ComponentWrapper } from 'teleport/Discover/Fixtures/databases';
+import DatabaseService from 'teleport/services/databases/databases';
+import * as discoveryService from 'teleport/services/discovery/discovery';
+import { DISCOVERY_GROUP_CLOUD } from 'teleport/services/discovery/discovery';
 import {
   AwsRdsDatabase,
   integrationService,
 } from 'teleport/services/integrations';
 import { userEventService } from 'teleport/services/userEvent';
-import DatabaseService from 'teleport/services/databases/databases';
-import * as discoveryService from 'teleport/services/discovery/discovery';
-import { ComponentWrapper } from 'teleport/Discover/Fixtures/databases';
-import cfg from 'teleport/config';
-import { DISCOVERY_GROUP_CLOUD } from 'teleport/services/discovery/discovery';
 
 import { EnrollRdsDatabase } from './EnrollRdsDatabase';
 
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.tsx
index 6e51e7d229b38..8080cd263b975 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.tsx
@@ -17,30 +17,30 @@
  */
 
 import { useState } from 'react';
+
 import { Box, Indicator } from 'design';
 import { Danger } from 'design/Alert';
+import { P } from 'design/Text/Text';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
-import { P } from 'design/Text/Text';
 
+import { ConfigureIamPerms } from 'teleport/Discover/Shared/Aws/ConfigureIamPerms';
+import { isIamPermError } from 'teleport/Discover/Shared/Aws/error';
+import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
 import { useDiscover } from 'teleport/Discover/useDiscover';
 import {
+  integrationService,
   Regions,
   Vpc,
-  integrationService,
 } from 'teleport/services/integrations';
-import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
-import { ConfigureIamPerms } from 'teleport/Discover/Shared/Aws/ConfigureIamPerms';
-import { isIamPermError } from 'teleport/Discover/Shared/Aws/error';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 import useTeleport from 'teleport/useTeleport';
 
 import { Header } from '../../Shared';
-
-import { VpcOption, VpcSelector } from './VpcSelector';
 import { AutoDiscoverToggle } from './AutoDiscoverToggle';
 import { AutoEnrollment } from './AutoEnrollment';
 import { SingleEnrollment } from './SingleEnrollment';
+import { VpcOption, VpcSelector } from './VpcSelector';
 
 export function EnrollRdsDatabase() {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/RdsDatabaseList.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/RdsDatabaseList.tsx
index d85c3058a167b..02fadef8492ed 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/RdsDatabaseList.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/RdsDatabaseList.tsx
@@ -21,11 +21,11 @@ import { FetchStatus } from 'design/DataTable/types';
 
 import {
   DisableableCell as Cell,
-  StatusCell,
   ItemStatus,
-  RadioCell,
-  Labels,
   labelMatcher,
+  Labels,
+  RadioCell,
+  StatusCell,
 } from 'teleport/Discover/Shared';
 
 import { CheckedAwsRdsDatabase } from './SingleEnrollment';
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/SingleEnrollment.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/SingleEnrollment.tsx
index f68f62aaf0ba8..eba8893130f3e 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/SingleEnrollment.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/SingleEnrollment.tsx
@@ -16,27 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
 import { Text } from 'design';
 import { FetchStatus } from 'design/DataTable/types';
 import { Attempt } from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 
+import { getRdsEngineIdentifier } from 'teleport/Discover/SelectResource/types';
 import { useDiscover } from 'teleport/Discover/useDiscover';
+import { Database } from 'teleport/services/databases';
 import {
   AwsRdsDatabase,
+  integrationService,
   Regions,
   Vpc,
-  integrationService,
 } from 'teleport/services/integrations';
-import { Database } from 'teleport/services/databases';
-import { getRdsEngineIdentifier } from 'teleport/Discover/SelectResource/types';
 
 import { ActionButtons } from '../../Shared';
-
-import { useCreateDatabase } from '../CreateDatabase/useCreateDatabase';
 import { CreateDatabaseDialog } from '../CreateDatabase/CreateDatabaseDialog';
-
+import { useCreateDatabase } from '../CreateDatabase/useCreateDatabase';
 import { DatabaseList } from './RdsDatabaseList';
 
 type TableData = {
diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/VpcSelector.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/VpcSelector.tsx
index 64c9bf122f36a..38908bfcdadd9 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/VpcSelector.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/VpcSelector.tsx
@@ -17,9 +17,10 @@
  */
 
 import { components } from 'react-select';
-import { Box, Flex, LabelInput, Link, ButtonIcon } from 'design';
-import Select from 'shared/components/Select';
+
+import { Box, ButtonIcon, Flex, LabelInput, Link } from 'design';
 import { NewTab } from 'design/Icon';
+import Select from 'shared/components/Select';
 
 import { Regions, Vpc } from 'teleport/services/integrations';
 
diff --git a/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.story.tsx b/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.story.tsx
index da71cef5194d5..83ad566a48955 100644
--- a/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.story.tsx
@@ -19,7 +19,6 @@
 import { MemoryRouter } from 'react-router';
 
 import { IamPolicyView } from './IamPolicy';
-
 import type { State } from './useIamPolicy';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.tsx b/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.tsx
index 0b1ef727d7450..939ce2b4fdae4 100644
--- a/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.tsx
+++ b/web/packages/teleport/src/Discover/Database/IamPolicy/IamPolicy.tsx
@@ -16,24 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Box, Flex, Indicator, Link, H3 } from 'design';
+import { Box, Flex, H3, Indicator, Link, Text } from 'design';
 import * as Icons from 'design/Icon';
-
 import { P } from 'design/Text/Text';
 
-import useTeleport from 'teleport/useTeleport';
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
+import useTeleport from 'teleport/useTeleport';
 
 import {
-  HeaderSubtitle,
   ActionButtons,
-  Header,
   ButtonBlueText,
+  Header,
+  HeaderSubtitle,
 } from '../../Shared';
-
-import { useIamPolicy, State } from './useIamPolicy';
-
 import type { AgentStepProps } from '../../types';
+import { State, useIamPolicy } from './useIamPolicy';
 
 export function IamPolicy(props: AgentStepProps) {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Discover/Database/IamPolicy/useIamPolicy.ts b/web/packages/teleport/src/Discover/Database/IamPolicy/useIamPolicy.ts
index b6e77735e99a3..30e2d938319be 100644
--- a/web/packages/teleport/src/Discover/Database/IamPolicy/useIamPolicy.ts
+++ b/web/packages/teleport/src/Discover/Database/IamPolicy/useIamPolicy.ts
@@ -20,11 +20,11 @@ import { useEffect, useState } from 'react';
 
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import TeleportContext from 'teleport/teleportContext';
 import { useDiscover } from 'teleport/Discover/useDiscover';
+import type { DatabaseIamPolicyResponse } from 'teleport/services/databases';
+import TeleportContext from 'teleport/teleportContext';
 
 import type { AgentStepProps } from '../../types';
-import type { DatabaseIamPolicyResponse } from 'teleport/services/databases';
 
 export function useIamPolicy({ ctx, props }: Props) {
   const { attempt, run } = useAttempt('');
diff --git a/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.story.tsx b/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.story.tsx
index 886758bcc796e..8c419c3a88841 100644
--- a/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.story.tsx
@@ -19,9 +19,7 @@
 import { MemoryRouter } from 'react-router';
 
 import { DatabaseEngine } from '../../SelectResource';
-
 import { MutualTlsView } from './MutualTls';
-
 import type { State } from './useMutualTls';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.tsx b/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.tsx
index cab72e1d173a9..f027a2a82957c 100644
--- a/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.tsx
+++ b/web/packages/teleport/src/Discover/Database/MutualTls/MutualTls.tsx
@@ -17,24 +17,23 @@
  */
 
 import { useState } from 'react';
-import { Text, Box, Flex, Link, Mark } from 'design';
+
+import { Box, Flex, Link, Mark, Text } from 'design';
 import { Danger } from 'design/Alert';
 import { Info } from 'design/Icon';
-import TextEditor from 'shared/components/TextEditor';
 import { FieldTextArea } from 'shared/components/FieldTextArea';
+import TextEditor from 'shared/components/TextEditor';
 import Validation from 'shared/components/Validation';
 
-import useTeleport from 'teleport/useTeleport';
-import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 import { Tabs } from 'teleport/components/Tabs';
+import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
+import useTeleport from 'teleport/useTeleport';
 
-import { HeaderSubtitle, ActionButtons, Header, StyledBox } from '../../Shared';
-import { dbCU } from '../../yamlTemplates';
 import { DatabaseEngine } from '../../SelectResource';
-
-import { useMutualTls, State } from './useMutualTls';
-
+import { ActionButtons, Header, HeaderSubtitle, StyledBox } from '../../Shared';
 import type { AgentStepProps } from '../../types';
+import { dbCU } from '../../yamlTemplates';
+import { State, useMutualTls } from './useMutualTls';
 
 export function MutualTls(props: AgentStepProps) {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Discover/Database/MutualTls/useMutualTls.ts b/web/packages/teleport/src/Discover/Database/MutualTls/useMutualTls.ts
index 0a73b10959eb2..60db47e5b6234 100644
--- a/web/packages/teleport/src/Discover/Database/MutualTls/useMutualTls.ts
+++ b/web/packages/teleport/src/Discover/Database/MutualTls/useMutualTls.ts
@@ -21,16 +21,15 @@ import { useEffect, useState } from 'react';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import cfg from 'teleport/config';
-import TeleportContext from 'teleport/teleportContext';
-import { useJoinTokenSuspender } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 import {
-  resourceKindToJoinRole,
   ResourceKind,
+  resourceKindToJoinRole,
 } from 'teleport/Discover/Shared/ResourceKind';
-
-import { DbMeta, useDiscover } from '../../useDiscover';
+import { useJoinTokenSuspender } from 'teleport/Discover/Shared/useJoinTokenSuspender';
+import TeleportContext from 'teleport/teleportContext';
 
 import type { AgentStepProps } from '../../types';
+import { DbMeta, useDiscover } from '../../useDiscover';
 
 export function useMutualTls({ ctx, props }: Props) {
   const { attempt, run } = useAttempt('');
diff --git a/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.story.tsx b/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.story.tsx
index a07af8627d0d2..8cbd325430619 100644
--- a/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.story.tsx
@@ -18,17 +18,16 @@
 
 import { http, HttpResponse } from 'msw';
 
-import { noAccess, getAcl } from 'teleport/mocks/contexts';
 import cfg from 'teleport/config';
-import { ResourceKind } from 'teleport/Discover/Shared';
-import { TeleportProvider } from 'teleport/Discover/Fixtures/fixtures';
 import {
   getDbMeta,
   getDbResourceSpec,
 } from 'teleport/Discover/Fixtures/databases';
+import { TeleportProvider } from 'teleport/Discover/Fixtures/fixtures';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { getAcl, noAccess } from 'teleport/mocks/contexts';
 
 import { DatabaseEngine, DatabaseLocation } from '../../SelectResource';
-
 import SetupAccess from './SetupAccess';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.tsx b/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.tsx
index 04b7341074d6b..ff65ffac1dfe0 100644
--- a/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.tsx
+++ b/web/packages/teleport/src/Discover/Database/SetupAccess/SetupAccess.tsx
@@ -16,27 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
-import { Box, Text, Flex, Link, Mark, H3 } from 'design';
+import React, { useEffect, useState } from 'react';
+
+import { Box, Flex, H3, Link, Mark, Text } from 'design';
 import { Info as InfoIcon } from 'design/Icon';
 
+import { Tabs } from 'teleport/components/Tabs';
+import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
+import { StyledBox } from 'teleport/Discover/Shared';
 import {
-  SelectCreatable,
   Option,
+  SelectCreatable,
 } from 'teleport/Discover/Shared/SelectCreatable';
 import {
-  useUserTraits,
   SetupAccessWrapper,
+  useUserTraits,
+  type State,
 } from 'teleport/Discover/Shared/SetupAccess';
-import { StyledBox } from 'teleport/Discover/Shared';
-import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 import { DbMeta } from 'teleport/Discover/useDiscover';
-import { Tabs } from 'teleport/components/Tabs';
 
 import { DatabaseEngine, DatabaseLocation } from '../../SelectResource';
 
-import type { State } from 'teleport/Discover/Shared/SetupAccess';
-
 export default function Container() {
   const state = useUserTraits();
   return <SetupAccess {...state} />;
diff --git a/web/packages/teleport/src/Discover/Database/SetupAccess/index.ts b/web/packages/teleport/src/Discover/Database/SetupAccess/index.ts
index 9dff28d2505a0..dff3646fb943b 100644
--- a/web/packages/teleport/src/Discover/Database/SetupAccess/index.ts
+++ b/web/packages/teleport/src/Discover/Database/SetupAccess/index.ts
@@ -17,4 +17,5 @@
  */
 
 import SetupAccess from './SetupAccess';
+
 export { SetupAccess };
diff --git a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.story.tsx b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.story.tsx
index 9c048edfbb609..4cd1ec4927fa8 100644
--- a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.story.tsx
@@ -21,18 +21,17 @@ import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
 
 import { DatabaseEngine, DatabaseLocation } from '../../SelectResource';
-
 import { TestConnection } from './TestConnection';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.test.tsx b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.test.tsx
index ce19f13ae978d..b33869372152d 100644
--- a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.test.tsx
+++ b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.test.tsx
@@ -18,18 +18,18 @@
 
 import { render, screen, userEvent } from 'design/utils/testing';
 
-import { userEventService } from 'teleport/services/userEvent';
 import {
   ComponentWrapper,
   getDbMeta,
   getDbResourceSpec,
 } from 'teleport/Discover/Fixtures/databases';
-import { agentService } from 'teleport/services/agents';
 import {
   DatabaseEngine,
   DatabaseLocation,
 } from 'teleport/Discover/SelectResource';
+import { agentService } from 'teleport/services/agents';
 import auth from 'teleport/services/auth/auth';
+import { userEventService } from 'teleport/services/userEvent';
 
 import { TestConnection } from './TestConnection';
 
diff --git a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.tsx b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.tsx
index f9162dafd01be..212fb17581b0c 100644
--- a/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.tsx
+++ b/web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.tsx
@@ -17,33 +17,31 @@
  */
 
 import { useState } from 'react';
-import { Box, LabelInput, H3, Subtitle3 } from 'design';
 
+import { Box, H3, LabelInput, Subtitle3 } from 'design';
+import { P } from 'design/Text/Text';
 import Select, { Option } from 'shared/components/Select';
 import Validation, { Validator } from 'shared/components/Validation';
 
-import { P } from 'design/Text/Text';
-
-import TextSelectCopy from 'teleport/components/TextSelectCopy';
-import useStickyClusterId from 'teleport/useStickyClusterId';
-import { generateTshLoginCommand } from 'teleport/lib/util';
 import ReAuthenticate from 'teleport/components/ReAuthenticate';
+import TextSelectCopy from 'teleport/components/TextSelectCopy';
+import { WILD_CARD } from 'teleport/Discover/Shared/const';
 import { CustomInputFieldForAsterisks } from 'teleport/Discover/Shared/CustomInputFieldForAsterisks';
-
-import { MfaChallengeScope } from 'teleport/services/auth/auth';
 import { DbMeta, useDiscover } from 'teleport/Discover/useDiscover';
+import { generateTshLoginCommand } from 'teleport/lib/util';
+import { MfaChallengeScope } from 'teleport/services/auth/auth';
 import { MfaChallengeResponse } from 'teleport/services/mfa';
-import { WILD_CARD } from 'teleport/Discover/Shared/const';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
+import { DatabaseEngine, getDatabaseProtocol } from '../../SelectResource';
 import {
   ActionButtons,
-  HeaderSubtitle,
-  Header,
   ConnectionDiagnosticResult,
+  Header,
+  HeaderSubtitle,
   StyledBox,
   useConnectionDiagnostic,
 } from '../../Shared';
-import { DatabaseEngine, getDatabaseProtocol } from '../../SelectResource';
 
 export function TestConnection() {
   const { resourceSpec, agentMeta } = useDiscover();
diff --git a/web/packages/teleport/src/Discover/Database/common.tsx b/web/packages/teleport/src/Discover/Database/common.tsx
index ddb2de8a8d9d3..3cc782febd17b 100644
--- a/web/packages/teleport/src/Discover/Database/common.tsx
+++ b/web/packages/teleport/src/Discover/Database/common.tsx
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, Label as Pill, Mark } from 'design';
+import { Box, Mark, Label as Pill } from 'design';
 import * as Icons from 'design/Icon';
-
 import { P } from 'design/Text/Text';
 
-import { ResourceLabel } from 'teleport/services/agents';
 import { LabelsCreater, TextIcon } from 'teleport/Discover/Shared';
+import { ResourceLabel } from 'teleport/services/agents';
 import { Regions } from 'teleport/services/integrations';
 
 // serviceDeployedMethod is a flag to determine if user opted to
diff --git a/web/packages/teleport/src/Discover/Database/index.tsx b/web/packages/teleport/src/Discover/Database/index.tsx
index 705857c853015..dc6f54cb7f19d 100644
--- a/web/packages/teleport/src/Discover/Database/index.tsx
+++ b/web/packages/teleport/src/Discover/Database/index.tsx
@@ -18,24 +18,23 @@
 
 import React from 'react';
 
-import { AwsAccount, ResourceKind, Finished } from 'teleport/Discover/Shared';
-import { ResourceViewConfig } from 'teleport/Discover/flow';
-import { DatabaseWrapper } from 'teleport/Discover/Database/DatabaseWrapper';
-import {
-  ResourceSpec,
-  DatabaseLocation,
-} from 'teleport/Discover/SelectResource';
 import cfg from 'teleport/config';
-
 import { CreateDatabase } from 'teleport/Discover/Database/CreateDatabase';
-import { SetupAccess } from 'teleport/Discover/Database/SetupAccess';
+import { DatabaseWrapper } from 'teleport/Discover/Database/DatabaseWrapper';
 import { DeployService } from 'teleport/Discover/Database/DeployService';
 import { ManualDeploy } from 'teleport/Discover/Database/DeployService/ManualDeploy';
+import { EnrollRdsDatabase } from 'teleport/Discover/Database/EnrollRdsDatabase';
+import { IamPolicy } from 'teleport/Discover/Database/IamPolicy';
 import { MutualTls } from 'teleport/Discover/Database/MutualTls';
+import { SetupAccess } from 'teleport/Discover/Database/SetupAccess';
 import { TestConnection } from 'teleport/Discover/Database/TestConnection';
+import { ResourceViewConfig } from 'teleport/Discover/flow';
+import {
+  DatabaseLocation,
+  ResourceSpec,
+} from 'teleport/Discover/SelectResource';
+import { AwsAccount, Finished, ResourceKind } from 'teleport/Discover/Shared';
 import { DiscoverEvent } from 'teleport/services/userEvent';
-import { EnrollRdsDatabase } from 'teleport/Discover/Database/EnrollRdsDatabase';
-import { IamPolicy } from 'teleport/Discover/Database/IamPolicy';
 
 import { ConfigureDiscoveryService } from '../Shared/ConfigureDiscoveryService';
 
diff --git a/web/packages/teleport/src/Discover/Discover.test.tsx b/web/packages/teleport/src/Discover/Discover.test.tsx
index ee054f898d814..d484dbf0456e2 100644
--- a/web/packages/teleport/src/Discover/Discover.test.tsx
+++ b/web/packages/teleport/src/Discover/Discover.test.tsx
@@ -19,36 +19,32 @@
 import { MemoryRouter } from 'react-router';
 
 import { render, screen } from 'design/utils/testing';
-
 import { Resource } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
 
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
+import cfg from 'teleport/config';
 import { Discover, DiscoverComponent } from 'teleport/Discover/Discover';
 import { ResourceViewConfig } from 'teleport/Discover/flow';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
-import { getOSSFeatures } from 'teleport/features';
-import cfg from 'teleport/config';
-import {
-  APPLICATIONS,
-  KUBERNETES,
-  SERVERS,
-} from 'teleport/Discover/SelectResource/resources';
 import {
   DATABASES,
   DATABASES_UNGUIDED,
   DATABASES_UNGUIDED_DOC,
 } from 'teleport/Discover/SelectResource/databases';
-
-import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
-import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
-
+import {
+  APPLICATIONS,
+  KUBERNETES,
+  SERVERS,
+} from 'teleport/Discover/SelectResource/resources';
+import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
+import { getOSSFeatures } from 'teleport/features';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
+import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
+import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
 
 import { ResourceKind } from './Shared';
-import { useDiscover, DiscoverUpdateProps } from './useDiscover';
-
-import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
+import { DiscoverUpdateProps, useDiscover } from './useDiscover';
 
 beforeEach(() => {
   jest.restoreAllMocks();
diff --git a/web/packages/teleport/src/Discover/Discover.tsx b/web/packages/teleport/src/Discover/Discover.tsx
index a18d33b894ef9..8b723b32af020 100644
--- a/web/packages/teleport/src/Discover/Discover.tsx
+++ b/web/packages/teleport/src/Discover/Discover.tsx
@@ -19,26 +19,24 @@
 import React from 'react';
 import { useLocation } from 'react-router';
 import { Prompt } from 'react-router-dom';
+
 import { Box } from 'design';
 
-import { Navigation } from 'teleport/components/Wizard/Navigation';
 import { FeatureBox } from 'teleport/components/Layout';
-import { SelectResource } from 'teleport/Discover/SelectResource/SelectResource';
-import cfg from 'teleport/config';
 import { findViewAtIndex } from 'teleport/components/Wizard/flow';
-
+import { Navigation } from 'teleport/components/Wizard/Navigation';
+import cfg from 'teleport/config';
+import type { View } from 'teleport/Discover/flow';
+import { SelectResource } from 'teleport/Discover/SelectResource/SelectResource';
 import { DiscoverEvent } from 'teleport/services/userEvent';
 
+import { DiscoverIcon } from './SelectResource/icons';
 import { EViewConfigs } from './types';
-
 import {
   DiscoverProvider,
-  useDiscover,
   DiscoverUpdateProps,
+  useDiscover,
 } from './useDiscover';
-import { DiscoverIcon } from './SelectResource/icons';
-
-import type { View } from 'teleport/Discover/flow';
 
 function DiscoverContent() {
   const {
diff --git a/web/packages/teleport/src/Discover/Fixtures/databases.tsx b/web/packages/teleport/src/Discover/Fixtures/databases.tsx
index 0504c23536bd5..d39910f2efc30 100644
--- a/web/packages/teleport/src/Discover/Fixtures/databases.tsx
+++ b/web/packages/teleport/src/Discover/Fixtures/databases.tsx
@@ -23,16 +23,15 @@ import {
   DatabaseLocation,
   ResourceSpec,
 } from 'teleport/Discover/SelectResource';
+import { DbMeta } from 'teleport/Discover/useDiscover';
+import { IamPolicyStatus } from 'teleport/services/databases';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { DbMeta } from 'teleport/Discover/useDiscover';
-import { IamPolicyStatus } from 'teleport/services/databases';
 
 import { DATABASES } from '../SelectResource/databases';
 import { ResourceKind } from '../Shared';
-
 import { TeleportProvider } from './fixtures';
 
 export function getDbResourceSpec(
diff --git a/web/packages/teleport/src/Discover/Fixtures/fixtures.tsx b/web/packages/teleport/src/Discover/Fixtures/fixtures.tsx
index e20fe437d76eb..63f33ce713d9f 100644
--- a/web/packages/teleport/src/Discover/Fixtures/fixtures.tsx
+++ b/web/packages/teleport/src/Discover/Fixtures/fixtures.tsx
@@ -19,18 +19,18 @@
 import React, { PropsWithChildren } from 'react';
 import { MemoryRouter } from 'react-router';
 
-import { ResourceSpec } from 'teleport/Discover/SelectResource';
 import { ContextProvider } from 'teleport';
+import cfg from 'teleport/config';
+import { ResourceSpec } from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import {
-  DiscoverProvider,
-  DiscoverContextState,
   AgentMeta,
+  DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { ResourceKind } from 'teleport/Discover/Shared';
-import cfg from 'teleport/config';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import { Acl, AuthType } from 'teleport/services/user';
 
 export const TeleportProvider: React.FC<
diff --git a/web/packages/teleport/src/Discover/Fixtures/kubernetes.tsx b/web/packages/teleport/src/Discover/Fixtures/kubernetes.tsx
index 5399d6f0ffded..3c57e36be34e8 100644
--- a/web/packages/teleport/src/Discover/Fixtures/kubernetes.tsx
+++ b/web/packages/teleport/src/Discover/Fixtures/kubernetes.tsx
@@ -19,14 +19,14 @@
 import React, { PropsWithChildren } from 'react';
 
 import { TeleportProvider } from 'teleport/Discover/Fixtures/fixtures';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import { KubeLocation, ResourceSpec } from 'teleport/Discover/SelectResource';
+import { KUBERNETES } from 'teleport/Discover/SelectResource/resources';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import { EksMeta } from 'teleport/Discover/useDiscover';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { KUBERNETES } from 'teleport/Discover/SelectResource/resources';
 
 export function getKubeResourceSpec(location?: KubeLocation): ResourceSpec {
   return {
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/AgentWaitingDialog.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/AgentWaitingDialog.tsx
index 395daa58a88cd..dcaa6245bcf94 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/AgentWaitingDialog.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/AgentWaitingDialog.tsx
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import { useEffect } from 'react';
+
 import {
   AnimatedProgressBar,
   Box,
   ButtonPrimary,
-  Text,
   Flex,
   Mark,
+  Text,
 } from 'design';
-import { useEffect } from 'react';
-
+import Dialog, { DialogContent } from 'design/DialogConfirmation';
 import * as Icons from 'design/Icon';
 
-import { Kube } from 'teleport/services/kube';
-import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
 import { TextIcon, useShowHint } from 'teleport/Discover/Shared';
 import { HintBox } from 'teleport/Discover/Shared/HintBox';
+import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import { Kube } from 'teleport/services/kube';
 
 type AgentWaitingDialogProps = {
   joinResourceId: string;
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/Dialogs.story.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/Dialogs.story.tsx
index 7981549f89ca7..76d6d67a0af96 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/Dialogs.story.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/Dialogs.story.tsx
@@ -16,35 +16,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { useEffect, useState } from 'react';
 import { MemoryRouter } from 'react-router';
-import { http, HttpResponse, delay } from 'msw';
 
+import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { generateCmd } from 'teleport/Discover/Kubernetes/HelmChart/HelmChart';
 import { ResourceKind } from 'teleport/Discover/Shared';
 import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
-import { ContextProvider } from 'teleport';
-
-import {
-  INTERNAL_RESOURCE_ID_LABEL_KEY,
-  JoinToken,
-} from 'teleport/services/joinToken';
 import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 import {
   DiscoverContextState,
   DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
+import {
+  INTERNAL_RESOURCE_ID_LABEL_KEY,
+  JoinToken,
+} from 'teleport/services/joinToken';
 import { DiscoverEventResource } from 'teleport/services/userEvent';
 
-import { generateCmd } from 'teleport/Discover/Kubernetes/HelmChart/HelmChart';
-
-import { EnrollmentDialog } from './EnrollmentDialog';
 import { AgentWaitingDialog } from './AgentWaitingDialog';
+import { EnrollmentDialog } from './EnrollmentDialog';
 import { ManualHelmDialog } from './ManualHelmDialog';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EksClustersList.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EksClustersList.tsx
index 9dc312aa79b7b..0e7f32d6799af 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EksClustersList.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EksClustersList.tsx
@@ -19,17 +19,16 @@
 import Table from 'design/DataTable';
 import { FetchStatus } from 'design/DataTable/types';
 
+import cfg from 'teleport/config';
 import {
   DisableableCell as Cell,
-  StatusCell,
   ItemStatus,
-  RadioCell,
-  Labels,
   labelMatcher,
+  Labels,
+  RadioCell,
+  StatusCell,
 } from 'teleport/Discover/Shared';
 
-import cfg from 'teleport/config';
-
 import { CheckedEksCluster } from './EnrollEksCluster';
 
 type Props = {
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEKSCluster.test.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEKSCluster.test.tsx
index 23956e03be415..7cfb7dfd93b7d 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEKSCluster.test.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEKSCluster.test.tsx
@@ -16,21 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, fireEvent, act } from 'design/utils/testing';
+import { act, fireEvent, render, screen } from 'design/utils/testing';
 
+import cfg from 'teleport/config';
+import { ComponentWrapper } from 'teleport/Discover/Fixtures/kubernetes';
+import * as discoveryService from 'teleport/services/discovery/discovery';
+import {
+  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
+  DISCOVERY_GROUP_CLOUD,
+} from 'teleport/services/discovery/discovery';
 import {
   AwsEksCluster,
   integrationService,
 } from 'teleport/services/integrations';
-import { userEventService } from 'teleport/services/userEvent';
 import KubeService from 'teleport/services/kube/kube';
-import * as discoveryService from 'teleport/services/discovery/discovery';
-import { ComponentWrapper } from 'teleport/Discover/Fixtures/kubernetes';
-import cfg from 'teleport/config';
-import {
-  DISCOVERY_GROUP_CLOUD,
-  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
-} from 'teleport/services/discovery/discovery';
+import { userEventService } from 'teleport/services/userEvent';
 
 import { EnrollEksCluster } from './EnrollEksCluster';
 
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.story.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.story.tsx
index 275a7e2ebcd8a..9feab905372e7 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.story.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.story.tsx
@@ -15,32 +15,30 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { delay, http, HttpResponse } from 'msw';
 import { useEffect } from 'react';
-
 import { MemoryRouter } from 'react-router';
 
 import { Info } from 'design/Alert';
 
-import { http, HttpResponse, delay } from 'msw';
-
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import {
-  AwsEksCluster,
-  IntegrationKind,
-  IntegrationStatusCode,
-} from 'teleport/services/integrations';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
+import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 import {
   DiscoverContextState,
   DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
 import { createTeleportContext, getUserContext } from 'teleport/mocks/contexts';
-import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import { ResourceKind } from 'teleport/Discover/Shared';
+import {
+  AwsEksCluster,
+  IntegrationKind,
+  IntegrationStatusCode,
+} from 'teleport/services/integrations';
 import { INTERNAL_RESOURCE_ID_LABEL_KEY } from 'teleport/services/joinToken';
-import { DiscoverEventResource } from 'teleport/services/userEvent/types';
 import { Kube } from 'teleport/services/kube';
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
+import { DiscoverEventResource } from 'teleport/services/userEvent/types';
 
 import { EnrollEksCluster } from './EnrollEksCluster';
 
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.tsx
index 1452adba62f8f..6de7f1aa88c2e 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.tsx
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from 'react';
+import styled from 'styled-components';
+
 import {
   Box,
   ButtonPrimary,
@@ -26,53 +28,47 @@ import {
   Text,
   Toggle,
 } from 'design';
-import styled from 'styled-components';
-import { FetchStatus } from 'design/DataTable/types';
 import { Danger } from 'design/Alert';
-
-import useAttempt from 'shared/hooks/useAttemptNext';
+import { FetchStatus } from 'design/DataTable/types';
 import { IconTooltip } from 'design/Tooltip';
+import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 
-import { EksMeta, useDiscover } from 'teleport/Discover/useDiscover';
-import {
-  Regions,
-  integrationService,
-  AwsEksCluster,
-} from 'teleport/services/integrations';
-
-import {
-  DISCOVERY_GROUP_CLOUD,
-  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
-  DiscoveryConfig,
-  createDiscoveryConfig,
-} from 'teleport/services/discovery';
-import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
+import cfg from 'teleport/config';
+import { generateCmd } from 'teleport/Discover/Kubernetes/HelmChart/HelmChart';
 import { ConfigureIamPerms } from 'teleport/Discover/Shared/Aws/ConfigureIamPerms';
 import { isIamPermError } from 'teleport/Discover/Shared/Aws/error';
-import { AgentStepProps } from 'teleport/Discover/types';
-import useTeleport from 'teleport/useTeleport';
-
-import { generateCmd } from 'teleport/Discover/Kubernetes/HelmChart/HelmChart';
-import { Kube } from 'teleport/services/kube';
-
-import { JoinToken } from 'teleport/services/joinToken';
-import cfg from 'teleport/config';
+import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
 import {
   ConfigureDiscoveryServiceDirections,
   CreatedDiscoveryConfigDialog,
 } from 'teleport/Discover/Shared/ConfigureDiscoveryService';
+import { AgentStepProps } from 'teleport/Discover/types';
+import { EksMeta, useDiscover } from 'teleport/Discover/useDiscover';
+import {
+  createDiscoveryConfig,
+  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
+  DISCOVERY_GROUP_CLOUD,
+  DiscoveryConfig,
+} from 'teleport/services/discovery';
+import {
+  AwsEksCluster,
+  integrationService,
+  Regions,
+} from 'teleport/services/integrations';
+import { JoinToken } from 'teleport/services/joinToken';
+import { Kube } from 'teleport/services/kube';
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
 import { ActionButtons, Header } from '../../Shared';
-
+import { AgentWaitingDialog } from './AgentWaitingDialog';
 import { ClustersList } from './EksClustersList';
-import ManualHelmDialog from './ManualHelmDialog';
 import { EnrollmentDialog } from './EnrollmentDialog';
-import { AgentWaitingDialog } from './AgentWaitingDialog';
+import ManualHelmDialog from './ManualHelmDialog';
 
 type TableData = {
   items: CheckedEksCluster[];
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollmentDialog.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollmentDialog.tsx
index 6636d1dbd7894..6a861d8904e70 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollmentDialog.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollmentDialog.tsx
@@ -18,13 +18,12 @@
 import {
   AnimatedProgressBar,
   ButtonPrimary,
-  Text,
-  Flex,
   ButtonSecondary,
+  Flex,
+  Text,
 } from 'design';
-
-import * as Icons from 'design/Icon';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import * as Icons from 'design/Icon';
 
 import { TextIcon } from 'teleport/Discover/Shared';
 
diff --git a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/ManualHelmDialog.tsx b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/ManualHelmDialog.tsx
index 07d5bc03b83a0..1db186f8d3297 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/ManualHelmDialog.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/ManualHelmDialog.tsx
@@ -16,32 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Dialog, { DialogContent, DialogFooter } from 'design/DialogConfirmation';
+import React, { Suspense, useEffect, useState } from 'react';
+import styled from 'styled-components';
+
 import {
   Box,
-  Flex,
   ButtonPrimary,
   ButtonSecondary,
-  Indicator,
+  Flex,
   H2,
   H3,
+  Indicator,
 } from 'design';
-
-import React, { Suspense, useState, useEffect } from 'react';
-
-import styled from 'styled-components';
-
+import Dialog, { DialogContent, DialogFooter } from 'design/DialogConfirmation';
 import * as Icons from 'design/Icon';
-
 import { P } from 'design/Text/Text';
 
+import { CatchError } from 'teleport/components/CatchError';
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
+import { ResourceKind, TextIcon } from 'teleport/Discover/Shared';
 import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
-
 import { useJoinTokenSuspender } from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import { ResourceKind, TextIcon } from 'teleport/Discover/Shared';
 import { JoinToken } from 'teleport/services/joinToken';
-import { CatchError } from 'teleport/components/CatchError';
 
 type ManualHelmDialogProps = {
   setJoinTokenAndGetCommand(token: JoinToken): string;
diff --git a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.story.tsx b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.story.tsx
index d74f66a600a65..e112ed2c1ae89 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.story.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.story.tsx
@@ -16,28 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { StoryObj } from '@storybook/react';
+import { delay, http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
 import { withoutQuery } from 'web/packages/build/storybook';
 
-import { http, delay, HttpResponse } from 'msw';
-
+import { ContextProvider, Context as TeleportContext } from 'teleport';
+import cfg from 'teleport/config';
+import { ResourceKind } from 'teleport/Discover/Shared';
+import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
+import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 import {
   DiscoverContextState,
   DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
-import { Context as TeleportContext, ContextProvider } from 'teleport';
-import cfg from 'teleport/config';
-import { ResourceKind } from 'teleport/Discover/Shared';
-import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
 import { getUserContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { DiscoverEventResource } from 'teleport/services/userEvent';
 import { INTERNAL_RESOURCE_ID_LABEL_KEY } from 'teleport/services/joinToken';
+import { DiscoverEventResource } from 'teleport/services/userEvent';
 
 import HelmChart from './HelmChart';
 
diff --git a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx
index cb0b21ec28119..ef91a9ff0160d 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx
@@ -18,31 +18,32 @@
 
 import { Suspense, useState } from 'react';
 import styled from 'styled-components';
-import { Box, ButtonSecondary, Link, Text, Mark, H3, Subtitle3 } from 'design';
+
+import { Box, ButtonSecondary, H3, Link, Mark, Subtitle3, Text } from 'design';
 import * as Icons from 'design/Icon';
+import { P } from 'design/Text/Text';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 
-import { P } from 'design/Text/Text';
-
-import { ResourceLabel } from 'teleport/services/agents';
-import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 import { CatchError } from 'teleport/components/CatchError';
-import {
-  clearCachedJoinTokenResult,
-  useJoinTokenSuspender,
-} from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import useTeleport from 'teleport/useTeleport';
-import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
-
+import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
+import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
 import {
   HintBox,
   SuccessBox,
   WaitingInfo,
 } from 'teleport/Discover/Shared/HintBox';
-
-import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
+import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import {
+  clearCachedJoinTokenResult,
+  useJoinTokenSuspender,
+} from 'teleport/Discover/Shared/useJoinTokenSuspender';
+import type { AgentMeta, KubeMeta } from 'teleport/Discover/useDiscover';
+import { ResourceLabel } from 'teleport/services/agents';
+import type { JoinRole, JoinToken } from 'teleport/services/joinToken';
+import type { Kube } from 'teleport/services/kube';
+import useTeleport from 'teleport/useTeleport';
 
 import {
   ActionButtons,
@@ -52,11 +53,7 @@ import {
   TextIcon,
   useShowHint,
 } from '../../Shared';
-
 import type { AgentStepProps } from '../../types';
-import type { JoinRole, JoinToken } from 'teleport/services/joinToken';
-import type { AgentMeta, KubeMeta } from 'teleport/Discover/useDiscover';
-import type { Kube } from 'teleport/services/kube';
 
 export default function Container(props: AgentStepProps) {
   const [namespace, setNamespace] = useState('');
diff --git a/web/packages/teleport/src/Discover/Kubernetes/KubeWrapper.tsx b/web/packages/teleport/src/Discover/Kubernetes/KubeWrapper.tsx
index c9496892e2d53..7f5d20bb73bcd 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/KubeWrapper.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/KubeWrapper.tsx
@@ -19,7 +19,6 @@
 import React, { useEffect } from 'react';
 
 import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
-
 import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 
 import { ResourceKind } from '../Shared';
diff --git a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.story.tsx b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.story.tsx
index bcf2eee9cb211..53cc423a5f88e 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.story.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.story.tsx
@@ -18,12 +18,13 @@
 
 import { MemoryRouter } from 'react-router';
 
-import { initSelectedOptionsHelper } from 'teleport/Discover/Shared/SetupAccess';
+import {
+  initSelectedOptionsHelper,
+  type State,
+} from 'teleport/Discover/Shared/SetupAccess';
 
 import { SetupAccess } from './SetupAccess';
 
-import type { State } from 'teleport/Discover/Shared/SetupAccess';
-
 export default {
   title: 'Teleport/Discover/Kube/SetupAccess',
 };
diff --git a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.tsx b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.tsx
index 4c071b92b28ae..93b61b059ff0f 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/SetupAccess.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
+
 import { Box, Text } from 'design';
 
 import {
-  SelectCreatable,
   Option,
+  SelectCreatable,
 } from 'teleport/Discover/Shared/SelectCreatable';
 import {
-  useUserTraits,
   SetupAccessWrapper,
+  useUserTraits,
+  type State,
 } from 'teleport/Discover/Shared/SetupAccess';
 
-import type { State } from 'teleport/Discover/Shared/SetupAccess';
-
 export default function Container() {
   const state = useUserTraits();
   return <SetupAccess {...state} />;
diff --git a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/index.ts b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/index.ts
index 9dff28d2505a0..dff3646fb943b 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/index.ts
+++ b/web/packages/teleport/src/Discover/Kubernetes/SetupAccess/index.ts
@@ -17,4 +17,5 @@
  */
 
 import SetupAccess from './SetupAccess';
+
 export { SetupAccess };
diff --git a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.story.tsx b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.story.tsx
index 31c589d16487b..7a11fc87e5d6f 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.story.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.story.tsx
@@ -19,7 +19,6 @@
 import { MemoryRouter } from 'react-router';
 
 import { TestConnection } from './TestConnection';
-
 import type { State } from './useTestConnection';
 
 export default {
diff --git a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.tsx b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.tsx
index a43fddf1c22a4..cfad30b14f6f1 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/TestConnection.tsx
@@ -17,31 +17,29 @@
  */
 
 import { useState } from 'react';
+
 import { Box, H3, Subtitle3 } from 'design';
-import Validation, { Validator } from 'shared/components/Validation';
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import FieldSelect from 'shared/components/FieldSelect';
 import { Option } from 'shared/components/Select';
+import Validation, { Validator } from 'shared/components/Validation';
+import { requiredField } from 'shared/components/Validation/rules';
 
+import ReAuthenticate from 'teleport/components/ReAuthenticate';
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
 import { generateTshLoginCommand } from 'teleport/lib/util';
-import ReAuthenticate from 'teleport/components/ReAuthenticate';
-
+import type { KubeImpersonation } from 'teleport/services/agents';
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
 
 import {
   ActionButtons,
-  HeaderSubtitle,
-  Header,
   ConnectionDiagnosticResult,
+  Header,
+  HeaderSubtitle,
   StyledBox,
 } from '../../Shared';
-
-import { useTestConnection, State } from './useTestConnection';
-
 import type { AgentStepProps } from '../../types';
-import type { KubeImpersonation } from 'teleport/services/agents';
+import { State, useTestConnection } from './useTestConnection';
 
 /**
  * @deprecated Refactor Discover/Kubernetes/TestConnection away from the container component
diff --git a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/index.ts b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/index.ts
index a3d519d9b3727..4e3dbecca4936 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/index.ts
+++ b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/index.ts
@@ -17,4 +17,5 @@
  */
 
 import TestConnection from './TestConnection';
+
 export { TestConnection };
diff --git a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/useTestConnection.ts b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/useTestConnection.ts
index 2ceeeba7cecd1..e69092108e26f 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/TestConnection/useTestConnection.ts
+++ b/web/packages/teleport/src/Discover/Kubernetes/TestConnection/useTestConnection.ts
@@ -17,13 +17,12 @@
  */
 
 import { useConnectionDiagnostic } from 'teleport/Discover/Shared';
-
-import { KubeMeta } from '../../useDiscover';
-
 import type { KubeImpersonation } from 'teleport/services/agents';
-import type { AgentStepProps } from '../../types';
 import type { MfaChallengeResponse } from 'teleport/services/mfa';
 
+import type { AgentStepProps } from '../../types';
+import { KubeMeta } from '../../useDiscover';
+
 /**
  * @deprecated Refactor Discover/Kubernetes/TestConnection away from the container component
  * pattern. See https://github.com/gravitational/teleport/pull/34952.
diff --git a/web/packages/teleport/src/Discover/Kubernetes/index.tsx b/web/packages/teleport/src/Discover/Kubernetes/index.tsx
index d7e6e36e7d2ee..f5b668cab05b4 100644
--- a/web/packages/teleport/src/Discover/Kubernetes/index.tsx
+++ b/web/packages/teleport/src/Discover/Kubernetes/index.tsx
@@ -18,15 +18,15 @@
 
 import React from 'react';
 
-import { AwsAccount, Finished, ResourceKind } from 'teleport/Discover/Shared';
 import { ResourceViewConfig } from 'teleport/Discover/flow';
-import { DiscoverEvent } from 'teleport/services/userEvent';
-import { KubeLocation, ResourceSpec } from 'teleport/Discover/SelectResource';
 import { EnrollEksCluster } from 'teleport/Discover/Kubernetes/EnrollEKSCluster';
+import { KubeLocation, ResourceSpec } from 'teleport/Discover/SelectResource';
+import { AwsAccount, Finished, ResourceKind } from 'teleport/Discover/Shared';
+import { DiscoverEvent } from 'teleport/services/userEvent';
 
+import { HelmChart } from './HelmChart';
 import { KubeWrapper } from './KubeWrapper';
 import { SetupAccess } from './SetupAccess';
-import { HelmChart } from './HelmChart';
 import { TestConnection } from './TestConnection';
 
 export const KubernetesResource: ResourceViewConfig = {
diff --git a/web/packages/teleport/src/Discover/SelectResource/PermissionsErrorMessage.tsx b/web/packages/teleport/src/Discover/SelectResource/PermissionsErrorMessage.tsx
index 6be722224c60d..cfa876eeaa317 100644
--- a/web/packages/teleport/src/Discover/SelectResource/PermissionsErrorMessage.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/PermissionsErrorMessage.tsx
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Box } from 'design';
+import { Box, Text } from 'design';
 
 import { ResourceKind } from '../Shared';
-
 import { ResourceSpec } from './types';
 
 export function PermissionsErrorMessage({
diff --git a/web/packages/teleport/src/Discover/SelectResource/SelectResource.story.tsx b/web/packages/teleport/src/Discover/SelectResource/SelectResource.story.tsx
index f9de6452bf2f3..517792f6090d5 100644
--- a/web/packages/teleport/src/Discover/SelectResource/SelectResource.story.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/SelectResource.story.tsx
@@ -20,21 +20,17 @@ import React from 'react';
 import { MemoryRouter } from 'react-router';
 
 import { Resource } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
-
 import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
+import { ContextProvider } from 'teleport';
 import {
   createTeleportContext,
   getAcl,
   noAccess,
 } from 'teleport/mocks/contexts';
-import { ContextProvider } from 'teleport';
-
-import { UserContext } from 'teleport/User/UserContext';
-
-import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
-
 import { Acl } from 'teleport/services/user';
+import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
+import { UserContext } from 'teleport/User/UserContext';
 
 import { SelectResource } from './SelectResource';
 
diff --git a/web/packages/teleport/src/Discover/SelectResource/SelectResource.test.tsx b/web/packages/teleport/src/Discover/SelectResource/SelectResource.test.tsx
index b338eeedf793d..23c8ff9ab5967 100644
--- a/web/packages/teleport/src/Discover/SelectResource/SelectResource.test.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/SelectResource.test.tsx
@@ -17,19 +17,16 @@
  */
 
 import { Platform, UserAgent } from 'design/platform';
-
 import {
   OnboardUserPreferences,
   Resource,
 } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
 
-import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
-
 import { OnboardDiscover } from 'teleport/services/user';
+import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
 
 import { ResourceKind } from '../Shared';
 import { resourceKindToPreferredResource } from '../Shared/ResourceKind';
-
 import { filterResources, sortResources } from './SelectResource';
 import { ResourceSpec } from './types';
 
diff --git a/web/packages/teleport/src/Discover/SelectResource/SelectResource.tsx b/web/packages/teleport/src/Discover/SelectResource/SelectResource.tsx
index e9c197f68b717..37a764b01cd31 100644
--- a/web/packages/teleport/src/Discover/SelectResource/SelectResource.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/SelectResource.tsx
@@ -16,49 +16,44 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState, type ComponentPropsWithoutRef } from 'react';
 import { useHistory, useLocation } from 'react-router';
-
-import * as Icons from 'design/Icon';
 import styled from 'styled-components';
+
 import { Box, Flex, Link, P3, Text } from 'design';
+import * as Icons from 'design/Icon';
+import { NewTab } from 'design/Icon';
 import { getPlatform, Platform } from 'design/platform';
-
-import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
-
 import { Resource } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
+import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
-import { NewTab } from 'design/Icon';
-
-import useTeleport from 'teleport/useTeleport';
+import AddApp from 'teleport/Apps/AddApp';
+import { FeatureHeader, FeatureHeaderTitle } from 'teleport/components/Layout';
 import { ToolTipNoPermBadge } from 'teleport/components/ToolTipNoPermBadge';
-import { Acl, AuthType, OnboardDiscover } from 'teleport/services/user';
+import cfg from 'teleport/config';
+import {
+  BASE_RESOURCES,
+  getResourcePretitle,
+} from 'teleport/Discover/SelectResource/resources';
 import {
   HeaderSubtitle,
   PermissionsErrorMessage,
   ResourceKind,
 } from 'teleport/Discover/Shared';
-import {
-  BASE_RESOURCES,
-  getResourcePretitle,
-} from 'teleport/Discover/SelectResource/resources';
-import AddApp from 'teleport/Apps/AddApp';
-import { useUser } from 'teleport/User/UserContext';
-import { storageService } from 'teleport/services/storageService';
-import cfg from 'teleport/config';
-
 import { resourceKindToPreferredResource } from 'teleport/Discover/Shared/ResourceKind';
-
-import { FeatureHeader, FeatureHeaderTitle } from 'teleport/components/Layout';
+import { storageService } from 'teleport/services/storageService';
+import { Acl, AuthType, OnboardDiscover } from 'teleport/services/user';
+import { useUser } from 'teleport/User/UserContext';
+import useTeleport from 'teleport/useTeleport';
 
 import { getMarketingTermMatches } from './getMarketingTermMatches';
 import { DiscoverIcon } from './icons';
-
-import { PrioritizedResources, SearchResource } from './types';
 import { SAML_APPLICATIONS } from './resourcesE';
-
-import type { ComponentPropsWithoutRef } from 'react';
-import type { ResourceSpec } from './types';
+import {
+  PrioritizedResources,
+  SearchResource,
+  type ResourceSpec,
+} from './types';
 
 interface SelectResourceProps {
   onSelect: (resource: ResourceSpec) => void;
diff --git a/web/packages/teleport/src/Discover/SelectResource/databases.tsx b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
index 2299f166ab105..a9f3d55112619 100644
--- a/web/packages/teleport/src/Discover/SelectResource/databases.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { DbProtocol } from 'shared/services/databases';
-
 import { Platform } from 'design/platform';
+import { DbProtocol } from 'shared/services/databases';
 
 import { DiscoverEventResource } from 'teleport/services/userEvent';
 
 import { ResourceKind } from '../Shared/ResourceKind';
-
-import { ResourceSpec, DatabaseLocation, DatabaseEngine } from './types';
+import { DatabaseEngine, DatabaseLocation, ResourceSpec } from './types';
 
 const baseDatabaseKeywords = ['db', 'database', 'databases'];
 const awsKeywords = [...baseDatabaseKeywords, 'aws', 'amazon web services'];
diff --git a/web/packages/teleport/src/Discover/SelectResource/resources.tsx b/web/packages/teleport/src/Discover/SelectResource/resources.tsx
index ed5d6c24587b2..e8d26e83a0e84 100644
--- a/web/packages/teleport/src/Discover/SelectResource/resources.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/resources.tsx
@@ -17,7 +17,6 @@
  */
 
 import { Platform } from 'design/platform';
-
 import { assertUnreachable } from 'shared/utils/assertUnreachable';
 
 import {
@@ -26,7 +25,6 @@ import {
 } from 'teleport/services/userEvent';
 
 import { ResourceKind } from '../Shared/ResourceKind';
-
 import {
   DATABASES,
   DATABASES_UNGUIDED,
diff --git a/web/packages/teleport/src/Discover/SelectResource/resourcesE.tsx b/web/packages/teleport/src/Discover/SelectResource/resourcesE.tsx
index b4f5cb43d851f..2cba11ef39d34 100644
--- a/web/packages/teleport/src/Discover/SelectResource/resourcesE.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/resourcesE.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { DiscoverEventResource } from 'teleport/services/userEvent';
 import { SamlServiceProviderPreset } from 'teleport/services/samlidp/types';
+import { DiscoverEventResource } from 'teleport/services/userEvent';
 
 import { ResourceKind } from '../Shared';
-
 import { ResourceSpec } from './types';
 
 export const SAML_APPLICATIONS: ResourceSpec[] = [
diff --git a/web/packages/teleport/src/Discover/SelectResource/types.ts b/web/packages/teleport/src/Discover/SelectResource/types.ts
index 151f01d98c9c7..697d6fb1d3acd 100644
--- a/web/packages/teleport/src/Discover/SelectResource/types.ts
+++ b/web/packages/teleport/src/Discover/SelectResource/types.ts
@@ -18,21 +18,18 @@
 
 import { Platform } from 'design/platform';
 import { ResourceIconName } from 'design/ResourceIcon';
-
 import { Resource } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
 
-import { AuthType } from 'teleport/services/user';
 import { RdsEngineIdentifier } from 'teleport/services/integrations';
-
-import { ResourceKind } from '../Shared/ResourceKind';
-
 import type { SamlServiceProviderPreset } from 'teleport/services/samlidp/types';
-
+import { AuthType } from 'teleport/services/user';
 import type {
   DiscoverDiscoveryConfigMethod,
   DiscoverEventResource,
 } from 'teleport/services/userEvent';
 
+import { ResourceKind } from '../Shared/ResourceKind';
+
 export enum DatabaseLocation {
   Aws,
   SelfHosted,
diff --git a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.story.tsx b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.story.tsx
index ebfad6984e91a..185575a1fc8e1 100644
--- a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.story.tsx
@@ -16,19 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { MemoryRouter } from 'react-router';
 
-import { http, HttpResponse, delay } from 'msw';
-
 import { Info } from 'design/Alert';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   Ec2InstanceConnectEndpoint,
   IntegrationKind,
diff --git a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.tsx b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.tsx
index bf543464491e0..b3f23146fcb84 100644
--- a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.tsx
+++ b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2Ice.tsx
@@ -16,32 +16,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
-import Table from 'design/DataTable';
-import { Box, Indicator, Text, Flex, H3 } from 'design';
-import { Warning } from 'design/Icon';
+import React, { useEffect, useState } from 'react';
+
+import { Box, Flex, H3, Indicator, Text } from 'design';
 import { Danger } from 'design/Alert';
+import Table from 'design/DataTable';
 import { FetchStatus } from 'design/DataTable/types';
-
+import { Warning } from 'design/Icon';
 import useAttempt, { Attempt } from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 
+import {
+  ActionButtons,
+  ButtonBlueText,
+  Header,
+  SecurityGroupPicker,
+} from 'teleport/Discover/Shared';
+import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
 import {
   AwsOidcDeployEc2InstanceConnectEndpointRequest,
-  SecurityGroup,
   integrationService,
+  SecurityGroup,
 } from 'teleport/services/integrations';
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
-import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
-import {
-  ActionButtons,
-  ButtonBlueText,
-  Header,
-  SecurityGroupPicker,
-} from 'teleport/Discover/Shared';
 
 import { CreateEc2IceDialog } from './CreateEc2IceDialog';
 
diff --git a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2IceDialog.tsx b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2IceDialog.tsx
index c26bcfcecf9b2..5751259bc2c19 100644
--- a/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2IceDialog.tsx
+++ b/web/packages/teleport/src/Discover/Server/CreateEc2Ice/CreateEc2IceDialog.tsx
@@ -16,37 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
 import {
-  Text,
-  Flex,
   AnimatedProgressBar,
+  Box,
   ButtonPrimary,
+  Flex,
   Link,
-  Box,
   Mark,
+  Text,
 } from 'design';
-import * as Icons from 'design/Icon';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
-
-import { getErrMessage } from 'shared/utils/errorType';
-
+import * as Icons from 'design/Icon';
 import useAttempt, { Attempt } from 'shared/hooks/useAttemptNext';
+import { getErrMessage } from 'shared/utils/errorType';
 
 import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
-
+import { TextIcon } from 'teleport/Discover/Shared';
+import { usePoll } from 'teleport/Discover/Shared/usePoll';
+import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
 import {
   Ec2InstanceConnectEndpoint,
   integrationService,
 } from 'teleport/services/integrations';
-import { TextIcon } from 'teleport/Discover/Shared';
-import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
-import { usePoll } from 'teleport/Discover/Shared/usePoll';
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
 export function CreateEc2IceDialog({
   nextStep,
diff --git a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigCreatedDialog.tsx b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigCreatedDialog.tsx
index b0e689741ce82..1acb4f3ee0718 100644
--- a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigCreatedDialog.tsx
+++ b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigCreatedDialog.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Flex, ButtonPrimary, Box } from 'design';
-import * as Icons from 'design/Icon';
+import { Box, ButtonPrimary, Flex, Text } from 'design';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import * as Icons from 'design/Icon';
 
 export function DiscoveryConfigCreatedDialog({
   toNextStep,
diff --git a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.story.tsx b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.story.tsx
index 94559e8a5f0bd..4deb03187e722 100644
--- a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.story.tsx
@@ -16,29 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { useEffect } from 'react';
 import { MemoryRouter } from 'react-router';
-import { http, HttpResponse, delay } from 'msw';
+
 import { Info } from 'design/Alert';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { ServerLocation } from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import {
-  DiscoverProvider,
-  DiscoverContextState,
   AutoDiscovery,
+  DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import {
   DiscoverDiscoveryConfigMethod,
   DiscoverEventResource,
 } from 'teleport/services/userEvent';
-import { ServerLocation } from 'teleport/Discover/SelectResource';
 
 import { DiscoveryConfigSsm } from './DiscoveryConfigSsm';
 
diff --git a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.tsx b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.tsx
index 6846a09779e53..42d1b89e869b3 100644
--- a/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.tsx
+++ b/web/packages/teleport/src/Discover/Server/DiscoveryConfigSsm/DiscoveryConfigSsm.tsx
@@ -16,51 +16,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useRef } from 'react';
+import React, { useRef, useState } from 'react';
+import styled from 'styled-components';
+
 import {
   Box,
+  ButtonSecondary,
   Link as ExternalLink,
-  Text,
   Flex,
-  ButtonSecondary,
-  Mark,
   H3,
+  Mark,
   Subtitle3,
+  Text,
 } from 'design';
-import styled from 'styled-components';
 import { Danger, Info } from 'design/Alert';
-import TextEditor from 'shared/components/TextEditor';
+import { P } from 'design/Text/Text';
 import { IconTooltip } from 'design/Tooltip';
 import FieldInput from 'shared/components/FieldInput';
-import { Rule } from 'shared/components/Validation/rules';
+import TextEditor from 'shared/components/TextEditor';
+import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
 import Validation, { Validator } from 'shared/components/Validation';
+import { Rule } from 'shared/components/Validation/rules';
 import { makeEmptyAttempt, useAsync } from 'shared/hooks/useAsync';
-import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
-
-import { P } from 'design/Text/Text';
 
 import cfg from 'teleport/config';
-import { useDiscover } from 'teleport/Discover/useDiscover';
-import { Regions } from 'teleport/services/integrations';
 import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
-import JoinTokenService, { JoinToken } from 'teleport/services/joinToken';
-
+import { useDiscover } from 'teleport/Discover/useDiscover';
 import {
-  DISCOVERY_GROUP_CLOUD,
   createDiscoveryConfig,
+  DISCOVERY_GROUP_CLOUD,
   InstallParamEnrollMode,
 } from 'teleport/services/discovery';
+import { Regions } from 'teleport/services/integrations';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
-import useStickyClusterId from 'teleport/useStickyClusterId';
+import JoinTokenService, { JoinToken } from 'teleport/services/joinToken';
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import { ActionButtons, Header, StyledBox } from '../../Shared';
-
 import { SingleEc2InstanceInstallation } from '../Shared';
-
 import { DiscoveryConfigCreatedDialog } from './DiscoveryConfigCreatedDialog';
 
 const IAM_POLICY_NAME = 'EC2DiscoverWithSSM';
diff --git a/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.story.tsx b/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.story.tsx
index fb51bc9fdd5b2..02f2b8e488127 100644
--- a/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.story.tsx
@@ -16,33 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { StoryObj } from '@storybook/react';
+import { delay, http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
 import { withoutQuery } from 'web/packages/build/storybook';
 
-import { http, HttpResponse, delay } from 'msw';
-
-import { Context as TeleportContext, ContextProvider } from 'teleport';
+import { ContextProvider, Context as TeleportContext } from 'teleport';
 import cfg from 'teleport/config';
-import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
+import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
+import {
+  DiscoverContextState,
+  DiscoverProvider,
+} from 'teleport/Discover/useDiscover';
 import { userContext } from 'teleport/Main/fixtures';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import {
-  DiscoverContextState,
-  DiscoverProvider,
-} from 'teleport/Discover/useDiscover';
-import { DiscoverEventResource } from 'teleport/services/userEvent';
-
-import { UserContextProvider } from 'teleport/User';
 import {
   INTERNAL_RESOURCE_ID_LABEL_KEY,
   JoinToken,
 } from 'teleport/services/joinToken';
+import { DiscoverEventResource } from 'teleport/services/userEvent';
+import { UserContextProvider } from 'teleport/User';
 
 import DownloadScript from './DownloadScript';
 
diff --git a/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx b/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx
index 3a7afb85ca7ca..9ce6b53edcb55 100644
--- a/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx
+++ b/web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx
@@ -18,41 +18,35 @@
 
 import React, { Suspense, useEffect, useState } from 'react';
 
-import { Box, Indicator, Text, Mark } from 'design';
+import { Box, Indicator, Mark, Text } from 'design';
 import * as Icons from 'design/Icon';
-
 import { P } from 'design/Text/Text';
 
-import cfg from 'teleport/config';
 import { CatchError } from 'teleport/components/CatchError';
-import {
-  clearCachedJoinTokenResult,
-  useJoinTokenSuspender,
-} from 'teleport/Discover/Shared/useJoinTokenSuspender';
-import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
-import { JoinToken } from 'teleport/services/joinToken';
-
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
-
+import cfg from 'teleport/config';
 import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
-
 import {
   HintBox,
   SuccessBox,
   WaitingInfo,
 } from 'teleport/Discover/Shared/HintBox';
-
-import { AgentStepProps } from '../../types';
+import { usePingTeleport } from 'teleport/Discover/Shared/PingTeleportContext';
+import {
+  clearCachedJoinTokenResult,
+  useJoinTokenSuspender,
+} from 'teleport/Discover/Shared/useJoinTokenSuspender';
+import { JoinToken } from 'teleport/services/joinToken';
+import type { Node } from 'teleport/services/nodes';
 
 import {
   ActionButtons,
-  HeaderSubtitle,
   Header,
+  HeaderSubtitle,
   ResourceKind,
   TextIcon,
 } from '../../Shared';
-
-import type { Node } from 'teleport/services/nodes';
+import { AgentStepProps } from '../../types';
 
 const SHOW_HINT_TIMEOUT = 1000 * 60 * 5; // 5 minutes
 
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx
index 72fceb18fda89..fa824991e2ac0 100644
--- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx
+++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx
@@ -22,10 +22,10 @@ import { FetchStatus } from 'design/DataTable/types';
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
 import {
-  RadioCell,
   DisableableCell as Cell,
-  Labels,
   labelMatcher,
+  Labels,
+  RadioCell,
 } from 'teleport/Discover/Shared';
 
 import { CheckedEc2Instance } from './EnrollEc2Instance';
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx
index 502fbef35f315..5ec6df825e5d7 100644
--- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { useEffect } from 'react';
 import { MemoryRouter } from 'react-router';
 
-import { http, HttpResponse, delay } from 'msw';
 import { Info } from 'design/Alert';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   Ec2InstanceConnectEndpoint,
   IntegrationKind,
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.test.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.test.tsx
index 20585021a9e4f..0c9ab2a958cf3 100644
--- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.test.tsx
+++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.test.tsx
@@ -17,39 +17,39 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import {
+  act,
+  fireEvent,
   render,
   screen,
-  fireEvent,
-  act,
   userEvent,
 } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-import {
-  Ec2InstanceConnectEndpoint,
-  IntegrationKind,
-  IntegrationStatusCode,
-  integrationService,
-} from 'teleport/services/integrations';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import cfg from 'teleport/config';
-import TeleportContext from 'teleport/teleportContext';
 import {
   DiscoverContextState,
   DiscoverProvider,
   NodeMeta,
 } from 'teleport/Discover/useDiscover';
 import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import * as discoveryApi from 'teleport/services/discovery/discovery';
+import { DEFAULT_DISCOVERY_GROUP_NON_CLOUD } from 'teleport/services/discovery/discovery';
+import {
+  Ec2InstanceConnectEndpoint,
+  IntegrationKind,
+  integrationService,
+  IntegrationStatusCode,
+} from 'teleport/services/integrations';
 import { Node } from 'teleport/services/nodes';
-
 import {
   DiscoverEvent,
   DiscoverEventStatus,
   userEventService,
 } from 'teleport/services/userEvent';
-import * as discoveryApi from 'teleport/services/discovery/discovery';
-import { DEFAULT_DISCOVERY_GROUP_NON_CLOUD } from 'teleport/services/discovery/discovery';
+import TeleportContext from 'teleport/teleportContext';
 
 import { EnrollEc2Instance } from './EnrollEc2Instance';
 
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.tsx
index a3b4e1721557b..e836c1e05d42c 100644
--- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.tsx
+++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.tsx
@@ -17,48 +17,45 @@
  */
 
 import { useState } from 'react';
-import { Box, Link as ExternalLink, Text, Toggle } from 'design';
 import { Link as InternalLink } from 'react-router-dom';
-import { FetchStatus } from 'design/DataTable/types';
-import useAttempt from 'shared/hooks/useAttemptNext';
+
+import { Box, Link as ExternalLink, Text, Toggle } from 'design';
 import { Danger } from 'design/Alert';
 import { OutlineInfo } from 'design/Alert/Alert';
-
-import { getErrMessage } from 'shared/utils/errorType';
+import { FetchStatus } from 'design/DataTable/types';
 import { IconTooltip } from 'design/Tooltip';
+import useAttempt from 'shared/hooks/useAttemptNext';
+import { getErrMessage } from 'shared/utils/errorType';
 
-import useTeleport from 'teleport/useTeleport';
 import cfg from 'teleport/config';
+import { ConfigureIamPerms } from 'teleport/Discover/Shared/Aws/ConfigureIamPerms';
+import {
+  getAttemptsOneOfErrorMsg,
+  isIamPermError,
+} from 'teleport/Discover/Shared/Aws/error';
+import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
+import { ConfigureDiscoveryServiceDirections } from 'teleport/Discover/Shared/ConfigureDiscoveryService';
 import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
+import {
+  createDiscoveryConfig,
+  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
+  DISCOVERY_GROUP_CLOUD,
+  DiscoveryConfig,
+} from 'teleport/services/discovery';
 import {
   Ec2InstanceConnectEndpoint,
-  Regions,
   integrationService,
+  Regions,
 } from 'teleport/services/integrations';
-import { AwsRegionSelector } from 'teleport/Discover/Shared/AwsRegionSelector';
 import { Node } from 'teleport/services/nodes';
-
 import {
   DiscoverEvent,
   DiscoverEventStatus,
 } from 'teleport/services/userEvent';
-import {
-  DISCOVERY_GROUP_CLOUD,
-  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
-  DiscoveryConfig,
-  createDiscoveryConfig,
-} from 'teleport/services/discovery';
-import {
-  getAttemptsOneOfErrorMsg,
-  isIamPermError,
-} from 'teleport/Discover/Shared/Aws/error';
-import { ConfigureIamPerms } from 'teleport/Discover/Shared/Aws/ConfigureIamPerms';
-import { ConfigureDiscoveryServiceDirections } from 'teleport/Discover/Shared/ConfigureDiscoveryService';
+import useTeleport from 'teleport/useTeleport';
 
 import { ActionButtons, Header } from '../../Shared';
-
 import { CreateEc2IceDialog } from '../CreateEc2Ice/CreateEc2IceDialog';
-
 import { Ec2InstanceList } from './Ec2InstanceList';
 import { NoEc2IceRequiredDialog } from './NoEc2IceRequiredDialog';
 
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/NoEc2IceRequiredDialog.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/NoEc2IceRequiredDialog.tsx
index 3eb700be5af43..f1050435df708 100644
--- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/NoEc2IceRequiredDialog.tsx
+++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/NoEc2IceRequiredDialog.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Flex, ButtonPrimary, Mark } from 'design';
-import * as Icons from 'design/Icon';
+import { ButtonPrimary, Flex, Mark, Text } from 'design';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
+import * as Icons from 'design/Icon';
 
 import { NodeMeta, useDiscover } from 'teleport/Discover/useDiscover';
 
diff --git a/web/packages/teleport/src/Discover/Server/ServerWrapper.tsx b/web/packages/teleport/src/Discover/Server/ServerWrapper.tsx
index 626226ef6a357..d6cf564b12b12 100644
--- a/web/packages/teleport/src/Discover/Server/ServerWrapper.tsx
+++ b/web/packages/teleport/src/Discover/Server/ServerWrapper.tsx
@@ -19,7 +19,6 @@
 import React, { useEffect } from 'react';
 
 import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
-
 import { clearCachedJoinTokenResult } from 'teleport/Discover/Shared/useJoinTokenSuspender';
 
 import { ResourceKind } from '../Shared';
diff --git a/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.story.tsx b/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.story.tsx
index 3691348a0367b..56d3454dafc5c 100644
--- a/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.story.tsx
@@ -18,12 +18,13 @@
 
 import { MemoryRouter } from 'react-router';
 
-import { initSelectedOptionsHelper } from 'teleport/Discover/Shared/SetupAccess';
+import {
+  initSelectedOptionsHelper,
+  type State,
+} from 'teleport/Discover/Shared/SetupAccess';
 
 import { SetupAccess } from './SetupAccess';
 
-import type { State } from 'teleport/Discover/Shared/SetupAccess';
-
 export default {
   title: 'Teleport/Discover/Server/SetupAccess',
 };
diff --git a/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.tsx b/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.tsx
index 6bca0db3f84ca..ba2822c7fdb80 100644
--- a/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.tsx
+++ b/web/packages/teleport/src/Discover/Server/SetupAccess/SetupAccess.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
+
 import { Box, Text } from 'design';
 
 import {
-  SelectCreatable,
   Option,
+  SelectCreatable,
 } from 'teleport/Discover/Shared/SelectCreatable';
 import {
-  useUserTraits,
   SetupAccessWrapper,
+  useUserTraits,
+  type State,
 } from 'teleport/Discover/Shared/SetupAccess';
 
-import type { State } from 'teleport/Discover/Shared/SetupAccess';
-
 export default function Container() {
   const state = useUserTraits();
   return <SetupAccess {...state} />;
diff --git a/web/packages/teleport/src/Discover/Server/SetupAccess/index.ts b/web/packages/teleport/src/Discover/Server/SetupAccess/index.ts
index 9dff28d2505a0..dff3646fb943b 100644
--- a/web/packages/teleport/src/Discover/Server/SetupAccess/index.ts
+++ b/web/packages/teleport/src/Discover/Server/SetupAccess/index.ts
@@ -17,4 +17,5 @@
  */
 
 import SetupAccess from './SetupAccess';
+
 export { SetupAccess };
diff --git a/web/packages/teleport/src/Discover/Server/Shared.tsx b/web/packages/teleport/src/Discover/Server/Shared.tsx
index 261fcd868e7b7..f113371fe433f 100644
--- a/web/packages/teleport/src/Discover/Server/Shared.tsx
+++ b/web/packages/teleport/src/Discover/Server/Shared.tsx
@@ -17,8 +17,9 @@
  */
 
 import { Link as InternalLink } from 'react-router-dom';
-import { OutlineInfo } from 'design/Alert/Alert';
+
 import { Mark } from 'design';
+import { OutlineInfo } from 'design/Alert/Alert';
 
 import cfg from 'teleport/config';
 
diff --git a/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.story.tsx b/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.story.tsx
index c6ca810395709..da5bc32f43c0e 100644
--- a/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.story.tsx
+++ b/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.story.tsx
@@ -20,12 +20,12 @@ import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { nodes } from 'teleport/Nodes/fixtures';
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import { nodes } from 'teleport/Nodes/fixtures';
 
 import { TestConnection } from './TestConnection';
 
diff --git a/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.tsx b/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.tsx
index 7569906b05cb3..a235bc8b40196 100644
--- a/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.tsx
+++ b/web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.tsx
@@ -17,29 +17,27 @@
  */
 
 import { useState } from 'react';
-import { ButtonSecondary, Box, LabelInput, H3, Subtitle3 } from 'design';
-import Select from 'shared/components/Select';
 
-import cfg from 'teleport/config';
+import { Box, ButtonSecondary, H3, LabelInput, Subtitle3 } from 'design';
+import Select, { type Option } from 'shared/components/Select';
+
 import ReAuthenticate from 'teleport/components/ReAuthenticate';
-import { openNewTab } from 'teleport/lib/util';
+import cfg from 'teleport/config';
 import {
-  useConnectionDiagnostic,
-  Header,
   ActionButtons,
-  HeaderSubtitle,
   ConnectionDiagnosticResult,
+  Header,
+  HeaderSubtitle,
   StyledBox,
+  useConnectionDiagnostic,
 } from 'teleport/Discover/Shared';
-import { sortNodeLogins } from 'teleport/services/nodes';
-
+import { openNewTab } from 'teleport/lib/util';
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
+import { sortNodeLogins } from 'teleport/services/nodes';
 
-import { NodeMeta } from '../../useDiscover';
-
-import type { Option } from 'shared/components/Select';
 import type { AgentStepProps } from '../../types';
-import type { MfaChallengeResponse } from 'teleport/services/mfa';
+import { NodeMeta } from '../../useDiscover';
 
 export function TestConnection(props: AgentStepProps) {
   const {
diff --git a/web/packages/teleport/src/Discover/Server/index.tsx b/web/packages/teleport/src/Discover/Server/index.tsx
index d06ec29ce0d4b..143344921839c 100644
--- a/web/packages/teleport/src/Discover/Server/index.tsx
+++ b/web/packages/teleport/src/Discover/Server/index.tsx
@@ -18,25 +18,23 @@
 
 import React from 'react';
 
+import cfg from 'teleport/config';
 import { ResourceViewConfig } from 'teleport/Discover/flow';
 import { DownloadScript } from 'teleport/Discover/Server/DownloadScript';
 import { SetupAccess } from 'teleport/Discover/Server/SetupAccess';
 import { TestConnection } from 'teleport/Discover/Server/TestConnection';
-import { AwsAccount, ResourceKind, Finished } from 'teleport/Discover/Shared';
+import { AwsAccount, Finished, ResourceKind } from 'teleport/Discover/Shared';
 import {
   DiscoverDiscoveryConfigMethod,
   DiscoverEvent,
 } from 'teleport/services/userEvent';
-import cfg from 'teleport/config';
 
 import { ResourceSpec, ServerLocation } from '../SelectResource';
 import { ConfigureDiscoveryService } from '../Shared/ConfigureDiscoveryService';
-
-import { EnrollEc2Instance } from './EnrollEc2Instance/EnrollEc2Instance';
 import { CreateEc2Ice } from './CreateEc2Ice/CreateEc2Ice';
-
-import { ServerWrapper } from './ServerWrapper';
 import { DiscoveryConfigSsm } from './DiscoveryConfigSsm/DiscoveryConfigSsm';
+import { EnrollEc2Instance } from './EnrollEc2Instance/EnrollEc2Instance';
+import { ServerWrapper } from './ServerWrapper';
 
 export const ServerResource: ResourceViewConfig<ResourceSpec> = {
   kind: ResourceKind.Server,
diff --git a/web/packages/teleport/src/Discover/Shared/ActionButtons.tsx b/web/packages/teleport/src/Discover/Shared/ActionButtons.tsx
index fad33610c498c..6b0ae7b297b31 100644
--- a/web/packages/teleport/src/Discover/Shared/ActionButtons.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ActionButtons.tsx
@@ -17,6 +17,7 @@
  */
 
 import React, { PropsWithChildren } from 'react';
+
 import { Box, ButtonPrimary, ButtonSecondary, ButtonText } from 'design';
 
 export const ActionButtons = ({
diff --git a/web/packages/teleport/src/Discover/Shared/Aws/ConfigureIamPerms.tsx b/web/packages/teleport/src/Discover/Shared/Aws/ConfigureIamPerms.tsx
index 88fea8f220452..cb4670e649f05 100644
--- a/web/packages/teleport/src/Discover/Shared/Aws/ConfigureIamPerms.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Aws/ConfigureIamPerms.tsx
@@ -17,17 +17,17 @@
  */
 
 import styled from 'styled-components';
-import { Flex, Link, Box, H3 } from 'design';
-import { assertUnreachable } from 'shared/utils/assertUnreachable';
-import TextEditor from 'shared/components/TextEditor';
-import { IconTooltip } from 'design/Tooltip';
 
+import { Box, Flex, H3, Link } from 'design';
 import { P } from 'design/Text/Text';
+import { IconTooltip } from 'design/Tooltip';
+import TextEditor from 'shared/components/TextEditor';
+import { assertUnreachable } from 'shared/utils/assertUnreachable';
 
-import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
-import { Regions } from 'teleport/services/integrations';
 import cfg from 'teleport/config';
+import { CommandBox } from 'teleport/Discover/Shared/CommandBox';
+import { Regions } from 'teleport/services/integrations';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 
 type AwsResourceKind = 'rds' | 'ec2' | 'eks';
diff --git a/web/packages/teleport/src/Discover/Shared/Aws/DisableableCell.tsx b/web/packages/teleport/src/Discover/Shared/Aws/DisableableCell.tsx
index 927669077757e..9c6e18b244cb4 100644
--- a/web/packages/teleport/src/Discover/Shared/Aws/DisableableCell.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Aws/DisableableCell.tsx
@@ -17,6 +17,7 @@
  */
 
 import React, { PropsWithChildren } from 'react';
+
 import { Cell } from 'design/DataTable';
 
 export const DisableableCell: React.FC<
diff --git a/web/packages/teleport/src/Discover/Shared/Aws/StatusCell.tsx b/web/packages/teleport/src/Discover/Shared/Aws/StatusCell.tsx
index 871004af440ae..e1554ccb43eb1 100644
--- a/web/packages/teleport/src/Discover/Shared/Aws/StatusCell.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Aws/StatusCell.tsx
@@ -20,7 +20,7 @@ import { Flex } from 'design';
 
 import { DisableableCell as Cell } from 'teleport/Discover/Shared';
 
-import { StatusLight, ItemStatus } from '../StatusLight';
+import { ItemStatus, StatusLight } from '../StatusLight';
 
 export const StatusCell = ({
   status,
diff --git a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.story.tsx b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.story.tsx
index 81889fa0702e8..96f779476b8e1 100644
--- a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.story.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { delay, http, HttpResponse } from 'msw';
 import { MemoryRouter } from 'react-router';
 
-import { http, HttpResponse, delay } from 'msw';
-
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 
 import { AwsAccount } from './AwsAccount';
 
diff --git a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.test.tsx b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.test.tsx
index 9747b7fa4c36e..bc2208f3feabd 100644
--- a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.test.tsx
+++ b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.test.tsx
@@ -17,33 +17,32 @@
  */
 
 import { MemoryRouter } from 'react-router';
-import { render, screen, fireEvent } from 'design/utils/testing';
+
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-import {
-  IntegrationKind,
-  IntegrationStatusCode,
-  integrationService,
-} from 'teleport/services/integrations';
-import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 import cfg from 'teleport/config';
-import TeleportContext from 'teleport/teleportContext';
+import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
+import { ResourceSpec } from 'teleport/Discover/SelectResource';
 import {
   DiscoverContextState,
   DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
 import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-
+import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
+import {
+  IntegrationKind,
+  integrationService,
+  IntegrationStatusCode,
+} from 'teleport/services/integrations';
+import ResourceService from 'teleport/services/resources';
 import {
   DiscoverEventResource,
   userEventService,
 } from 'teleport/services/userEvent';
-import ResourceService from 'teleport/services/resources';
-import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
-import { ResourceSpec } from 'teleport/Discover/SelectResource';
+import TeleportContext from 'teleport/teleportContext';
 
 import { ResourceKind } from '../ResourceKind';
-
 import { AwsAccount } from './AwsAccount';
 
 beforeEach(() => {
diff --git a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.tsx b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.tsx
index 3b4400d30cf7f..a436afc1d45d8 100644
--- a/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.tsx
+++ b/web/packages/teleport/src/Discover/Shared/AwsAccount/AwsAccount.tsx
@@ -16,47 +16,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState, useCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
+
 import {
+  Alert,
   Box,
-  ButtonText,
-  Text,
   ButtonPrimary,
-  Indicator,
-  Alert,
+  ButtonText,
   Flex,
+  Indicator,
+  Text,
 } from 'design';
 import { FieldSelect } from 'shared/components/FieldSelect';
-import { useAsync } from 'shared/hooks/useAsync';
 import { Option as BaseOption } from 'shared/components/Select';
+import TextEditor from 'shared/components/TextEditor';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import TextEditor from 'shared/components/TextEditor';
+import { useAsync } from 'shared/hooks/useAsync';
 
-import { App } from 'teleport/services/apps';
 import cfg from 'teleport/config';
+import {
+  integrationAndAppRW,
+  integrationRWE,
+  integrationRWEAndDbCU,
+  integrationRWEAndNodeRWE,
+} from 'teleport/Discover/yamlTemplates';
+import { App } from 'teleport/services/apps';
 import {
   Integration,
   IntegrationKind,
   integrationService,
 } from 'teleport/services/integrations';
-import {
-  integrationRWE,
-  integrationRWEAndNodeRWE,
-  integrationRWEAndDbCU,
-  integrationAndAppRW,
-} from 'teleport/Discover/yamlTemplates';
-import useTeleport from 'teleport/useTeleport';
 import ResourceService from 'teleport/services/resources';
+import useTeleport from 'teleport/useTeleport';
 
 import {
   ActionButtons,
-  HeaderSubtitle,
   Header,
+  HeaderSubtitle,
   ResourceKind,
 } from '../../Shared';
-
 import { DiscoverUrlLocationState, useDiscover } from '../../useDiscover';
 
 type Option = BaseOption<Integration>;
diff --git a/web/packages/teleport/src/Discover/Shared/AwsRegionSelector/AwsRegionSelector.tsx b/web/packages/teleport/src/Discover/Shared/AwsRegionSelector/AwsRegionSelector.tsx
index 8d94c412a3d1e..020fc232dfa65 100644
--- a/web/packages/teleport/src/Discover/Shared/AwsRegionSelector/AwsRegionSelector.tsx
+++ b/web/packages/teleport/src/Discover/Shared/AwsRegionSelector/AwsRegionSelector.tsx
@@ -17,9 +17,10 @@
  */
 
 import React, { useState } from 'react';
-import { Box, Flex, ButtonSecondary, LabelInput } from 'design';
-import Select, { Option } from 'shared/components/Select';
+
+import { Box, ButtonSecondary, Flex, LabelInput } from 'design';
 import { Refresh as RefreshIcon } from 'design/Icon';
+import Select, { Option } from 'shared/components/Select';
 
 import { awsRegionMap, Regions } from 'teleport/services/integrations';
 
diff --git a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.story.tsx b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.story.tsx
index 2302d45f13bac..d53d6afeac44c 100644
--- a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.story.tsx
@@ -18,25 +18,26 @@
 
 import { http, HttpResponse } from 'msw';
 import { MemoryRouter } from 'react-router';
+
 import { Info } from 'design/Alert';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { ServerLocation } from 'teleport/Discover/SelectResource';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import {
-  DiscoverProvider,
   DiscoverContextState,
+  DiscoverProvider,
 } from 'teleport/Discover/useDiscover';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   IntegrationKind,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { ResourceKind } from 'teleport/Discover/Shared';
 import {
   DiscoverDiscoveryConfigMethod,
   DiscoverEventResource,
 } from 'teleport/services/userEvent';
-import { ServerLocation } from 'teleport/Discover/SelectResource';
 
 import { ConfigureDiscoveryService as Comp } from './ConfigureDiscoveryService';
 
diff --git a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.tsx b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.tsx
index 3e5df17ec7920..32f7b9590bcb6 100644
--- a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryService.tsx
@@ -18,24 +18,23 @@
 
 import { useState } from 'react';
 import { Link as InternalLink } from 'react-router-dom';
-import { Box, Text, Mark } from 'design';
+
+import { Box, Mark, Text } from 'design';
 import { OutlineInfo } from 'design/Alert/Alert';
 import useAttempt from 'shared/hooks/useAttemptNext';
 import { getErrMessage } from 'shared/utils/errorType';
 
+import cfg from 'teleport/config';
 import { useDiscover } from 'teleport/Discover/useDiscover';
-import useTeleport from 'teleport/useTeleport';
-
 import {
-  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
   createDiscoveryConfig,
+  DEFAULT_DISCOVERY_GROUP_NON_CLOUD,
 } from 'teleport/services/discovery';
-import cfg from 'teleport/config';
+import useTeleport from 'teleport/useTeleport';
 
 import { ActionButtons, Header, ResourceKind } from '../../Shared';
-
-import { CreatedDiscoveryConfigDialog } from './CreatedDiscoveryConfigDialog';
 import { ConfigureDiscoveryServiceDirections } from './ConfigureDiscoveryServiceDirections';
+import { CreatedDiscoveryConfigDialog } from './CreatedDiscoveryConfigDialog';
 
 export function ConfigureDiscoveryService({
   withCreateConfig = false,
diff --git a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryServiceDirections.tsx b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryServiceDirections.tsx
index ab1f96fb42247..4dba0b6d46f60 100644
--- a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryServiceDirections.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/ConfigureDiscoveryServiceDirections.tsx
@@ -15,15 +15,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { Box, Flex, Input, Text, Mark, H3, Subtitle3 } from 'design';
 import styled from 'styled-components';
 
-import { IconTooltip } from 'design/Tooltip';
-
+import { Box, Flex, H3, Input, Mark, Subtitle3, Text } from 'design';
 import { P } from 'design/Text/Text';
+import { IconTooltip } from 'design/Tooltip';
 
-import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 import { Tabs } from 'teleport/components/Tabs';
+import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 
 const discoveryGroupToolTip = `Discovery group name is used to group discovered resources into different sets. \
 This parameter is used to prevent Discovery Agents watching different sets of cloud resources from \
diff --git a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/CreatedDiscoveryConfigDialog.tsx b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/CreatedDiscoveryConfigDialog.tsx
index 01721d58154ee..b5559fa6ab849 100644
--- a/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/CreatedDiscoveryConfigDialog.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConfigureDiscoveryService/CreatedDiscoveryConfigDialog.tsx
@@ -17,16 +17,15 @@
  */
 
 import {
-  Text,
-  Flex,
   AnimatedProgressBar,
   ButtonPrimary,
   ButtonSecondary,
+  Flex,
   Mark,
+  Text,
 } from 'design';
-import * as Icons from 'design/Icon';
 import Dialog, { DialogContent } from 'design/DialogConfirmation';
-
+import * as Icons from 'design/Icon';
 import type { Attempt } from 'shared/hooks/useAttemptNext';
 
 export type CreatedDiscoveryConfigDialog = {
diff --git a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.story.tsx b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.story.tsx
index ec40b556949c7..c7993cd2a26d5 100644
--- a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.story.tsx
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ConnectionDiagnosticResult } from './ConnectionDiagnosticResult';
-
-import type { Props } from './ConnectionDiagnosticResult';
 import type { ConnectionDiagnosticTrace } from 'teleport/services/agents';
 
+import {
+  ConnectionDiagnosticResult,
+  type Props,
+} from './ConnectionDiagnosticResult';
+
 export default {
   title: 'Teleport/Discover/Shared/ConnectionDiagnostic',
 };
diff --git a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.tsx b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.tsx
index 37609dc1b1f4c..16bd952746b7b 100644
--- a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/ConnectionDiagnosticResult.tsx
@@ -18,25 +18,25 @@
 
 import { useState } from 'react';
 import styled from 'styled-components';
+
 import {
-  ButtonSecondary,
-  Text,
   Box,
-  Flex,
+  ButtonSecondary,
   ButtonText,
-  Mark,
+  Flex,
   H3,
+  Mark,
   Subtitle3,
+  Text,
 } from 'design';
 import * as Icons from 'design/Icon';
+import type { Attempt } from 'shared/hooks/useAttemptNext';
 
 import { YamlReader } from 'teleport/Discover/Shared/SetupAccess/AccessInfo';
+import type { ConnectionDiagnostic } from 'teleport/services/agents';
 
 import { StyledBox, TextIcon } from '..';
 
-import type { Attempt } from 'shared/hooks/useAttemptNext';
-import type { ConnectionDiagnostic } from 'teleport/services/agents';
-
 export function ConnectionDiagnosticResult({
   attempt,
   diagnosis,
diff --git a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/useConnectionDiagnostic.ts b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/useConnectionDiagnostic.ts
index 3f5b7fc95097b..b47dbf3b7411a 100644
--- a/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/useConnectionDiagnostic.ts
+++ b/web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/useConnectionDiagnostic.ts
@@ -17,21 +17,23 @@
  */
 
 import { useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import useTeleport from 'teleport/useTeleport';
+import {
+  getDatabaseProtocol,
+  type ResourceSpec,
+} from 'teleport/Discover/SelectResource';
 import { useDiscover } from 'teleport/Discover/useDiscover';
-import { DiscoverEventStatus } from 'teleport/services/userEvent';
-import auth from 'teleport/services/auth/auth';
-import { getDatabaseProtocol } from 'teleport/Discover/SelectResource';
-import { agentService } from 'teleport/services/agents';
-
-import type {
-  ConnectionDiagnostic,
-  ConnectionDiagnosticRequest,
+import {
+  agentService,
+  type ConnectionDiagnostic,
+  type ConnectionDiagnosticRequest,
 } from 'teleport/services/agents';
+import auth from 'teleport/services/auth/auth';
 import type { MfaChallengeResponse } from 'teleport/services/mfa';
-import type { ResourceSpec } from 'teleport/Discover/SelectResource';
+import { DiscoverEventStatus } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
 export function useConnectionDiagnostic() {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Discover/Shared/CustomInputFieldForAsterisks.tsx b/web/packages/teleport/src/Discover/Shared/CustomInputFieldForAsterisks.tsx
index fdee3e124000d..b8076c5631da2 100644
--- a/web/packages/teleport/src/Discover/Shared/CustomInputFieldForAsterisks.tsx
+++ b/web/packages/teleport/src/Discover/Shared/CustomInputFieldForAsterisks.tsx
@@ -17,8 +17,8 @@
  */
 
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import { Option } from 'shared/components/Select';
+import { requiredField } from 'shared/components/Validation/rules';
 import { capitalizeFirstLetter } from 'shared/utils/text';
 
 import { WILD_CARD } from './const';
diff --git a/web/packages/teleport/src/Discover/Shared/Finished/Finished.story.tsx b/web/packages/teleport/src/Discover/Shared/Finished/Finished.story.tsx
index 92dc22bf66471..78e08aa30befb 100644
--- a/web/packages/teleport/src/Discover/Shared/Finished/Finished.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Finished/Finished.story.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Finished as Component } from './Finished';
-
 import type { AgentStepProps } from '../../types';
+import { Finished as Component } from './Finished';
 
 export default {
   title: 'Teleport/Discover/Shared',
diff --git a/web/packages/teleport/src/Discover/Shared/Finished/Finished.tsx b/web/packages/teleport/src/Discover/Shared/Finished/Finished.tsx
index 753a8d72878da..6dcb4d245b0dc 100644
--- a/web/packages/teleport/src/Discover/Shared/Finished/Finished.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Finished/Finished.tsx
@@ -17,14 +17,14 @@
  */
 
 import styled from 'styled-components';
-import { ButtonPrimary, Text, Flex, ButtonSecondary, Image, H2 } from 'design';
+
+import { ButtonPrimary, ButtonSecondary, Flex, H2, Image, Text } from 'design';
 
 import cfg from 'teleport/config';
 import history from 'teleport/services/history';
 
-import celebratePamPng from './celebrate-pam.png';
-
 import type { AgentStepProps } from '../../types';
+import celebratePamPng from './celebrate-pam.png';
 
 export function Finished(props: AgentStepProps) {
   let title = 'Resource Successfully Added';
diff --git a/web/packages/teleport/src/Discover/Shared/Header.tsx b/web/packages/teleport/src/Discover/Shared/Header.tsx
index 0632b64aadcd2..5bc3223957cec 100644
--- a/web/packages/teleport/src/Discover/Shared/Header.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Header.tsx
@@ -18,8 +18,8 @@
 
 import React, { PropsWithChildren } from 'react';
 
-import { ArrowBack } from 'design/Icon';
 import { ButtonIcon, Flex, H1, H2, Subtitle1 } from 'design';
+import { ArrowBack } from 'design/Icon';
 
 export const Header: React.FC<PropsWithChildren<unknown>> = ({ children }) => (
   <H1 my={1}>{children}</H1>
diff --git a/web/packages/teleport/src/Discover/Shared/HintBox.tsx b/web/packages/teleport/src/Discover/Shared/HintBox.tsx
index 5ada97b10aa93..16508b9826af7 100644
--- a/web/packages/teleport/src/Discover/Shared/HintBox.tsx
+++ b/web/packages/teleport/src/Discover/Shared/HintBox.tsx
@@ -20,7 +20,6 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Box, Flex, Text } from 'design';
-
 import * as Icons from 'design/Icon';
 
 import { TextIcon } from 'teleport/Discover/Shared/Text';
diff --git a/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.story.tsx b/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.story.tsx
index 7af57131265d2..7e5e0690df7a0 100644
--- a/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.story.tsx
@@ -20,7 +20,7 @@ import { useState } from 'react';
 
 import Validation from 'shared/components/Validation';
 
-import { LabelsCreater, DiscoverLabel } from './LabelsCreater';
+import { DiscoverLabel, LabelsCreater } from './LabelsCreater';
 
 export default {
   title: 'Teleport/Discover/Shared/LabelsCreator',
diff --git a/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.tsx b/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.tsx
index da86d0701cf06..dbf829e911fdd 100644
--- a/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.tsx
+++ b/web/packages/teleport/src/Discover/Shared/LabelsCreater/LabelsCreater.tsx
@@ -17,14 +17,14 @@
  */
 
 import React from 'react';
-import { Box, Flex, ButtonIcon, Text } from 'design';
+
+import { Box, ButtonIcon, Flex, Text } from 'design';
 import * as Icons from 'design/Icon';
+import { inputGeometry } from 'design/Input/Input';
+import { ButtonTextWithAddIcon } from 'shared/components/ButtonTextWithAddIcon';
 import FieldInput from 'shared/components/FieldInput';
 import { useValidation, Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import { ButtonTextWithAddIcon } from 'shared/components/ButtonTextWithAddIcon';
-
-import { inputGeometry } from 'design/Input/Input';
 
 import { ResourceLabel } from 'teleport/services/agents';
 
diff --git a/web/packages/teleport/src/Discover/Shared/PingTeleportContext.tsx b/web/packages/teleport/src/Discover/Shared/PingTeleportContext.tsx
index bd837052f70fa..167b98efdd89d 100644
--- a/web/packages/teleport/src/Discover/Shared/PingTeleportContext.tsx
+++ b/web/packages/teleport/src/Discover/Shared/PingTeleportContext.tsx
@@ -19,12 +19,12 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 
 import { useTeleport } from 'teleport';
+import { ResourceKind } from 'teleport/Discover/Shared/ResourceKind';
 import { usePoll } from 'teleport/Discover/Shared/usePoll';
 import {
   INTERNAL_RESOURCE_ID_LABEL_KEY,
   JoinToken,
 } from 'teleport/services/joinToken';
-import { ResourceKind } from 'teleport/Discover/Shared/ResourceKind';
 
 interface PingTeleportContextState<T> {
   active: boolean;
diff --git a/web/packages/teleport/src/Discover/Shared/ResourceLabelTooltip/ResourceLabelTooltip.tsx b/web/packages/teleport/src/Discover/Shared/ResourceLabelTooltip/ResourceLabelTooltip.tsx
index 2e7ad2d1980aa..4feb605ae4692 100644
--- a/web/packages/teleport/src/Discover/Shared/ResourceLabelTooltip/ResourceLabelTooltip.tsx
+++ b/web/packages/teleport/src/Discover/Shared/ResourceLabelTooltip/ResourceLabelTooltip.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import styled from 'styled-components';
+
 import Link from 'design/Link';
 import { MarkInverse } from 'design/Mark';
 import { Position } from 'design/Popover/Popover';
 import { IconTooltip } from 'design/Tooltip';
-import styled from 'styled-components';
 
 /**
  * Returns a IconTooltip component with its tip contents
diff --git a/web/packages/teleport/src/Discover/Shared/SecurityGroupPicker/SecurityGroupPicker.tsx b/web/packages/teleport/src/Discover/Shared/SecurityGroupPicker/SecurityGroupPicker.tsx
index 890eeee6cc60a..bb9912a3cf852 100644
--- a/web/packages/teleport/src/Discover/Shared/SecurityGroupPicker/SecurityGroupPicker.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SecurityGroupPicker/SecurityGroupPicker.tsx
@@ -19,16 +19,17 @@
 import React, { useState } from 'react';
 
 import { Flex, Link } from 'design';
-import Table, { Cell } from 'design/DataTable';
 import { Danger } from 'design/Alert';
 import { CheckboxInput } from 'design/Checkbox';
+import Table, { Cell } from 'design/DataTable';
 import { FetchStatus } from 'design/DataTable/types';
 import { IconTooltip } from 'design/Tooltip';
-
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
-import { SecurityGroup } from 'teleport/services/integrations';
-import { SecurityGroupRule } from 'teleport/services/integrations';
+import {
+  SecurityGroup,
+  SecurityGroupRule,
+} from 'teleport/services/integrations';
 
 import { SecurityGroupRulesDialog } from './SecurityGroupRulesDialog';
 
diff --git a/web/packages/teleport/src/Discover/Shared/SelectCreatable/SelectCreatable.tsx b/web/packages/teleport/src/Discover/Shared/SelectCreatable/SelectCreatable.tsx
index 01991a1afd1d5..e5f8e836af123 100644
--- a/web/packages/teleport/src/Discover/Shared/SelectCreatable/SelectCreatable.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SelectCreatable/SelectCreatable.tsx
@@ -17,8 +17,9 @@
  */
 
 import React from 'react';
-import { useTheme } from 'styled-components';
 import ReactSelectCreatable from 'react-select/creatable';
+import { useTheme } from 'styled-components';
+
 import { Cross } from 'design/Icon';
 
 export const styles = theme => ({
diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/AccessInfo.tsx b/web/packages/teleport/src/Discover/Shared/SetupAccess/AccessInfo.tsx
index 077471ad4b8e3..30bb669bd9f2a 100644
--- a/web/packages/teleport/src/Discover/Shared/SetupAccess/AccessInfo.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/AccessInfo.tsx
@@ -17,19 +17,20 @@
  */
 
 import React from 'react';
+
 import { Flex, Text } from 'design';
 import TextEditor from 'shared/components/TextEditor';
 
 import {
-  kubeAccessRW,
-  kubeAccessRO,
-  nodeAccessRO,
-  nodeAccessRW,
+  awsAppAccessRO,
+  awsAppAccessRW,
   connDiagRW,
   dbAccessRO,
   dbAccessRW,
-  awsAppAccessRO,
-  awsAppAccessRW,
+  kubeAccessRO,
+  kubeAccessRW,
+  nodeAccessRO,
+  nodeAccessRW,
 } from '../../yamlTemplates';
 
 export function AccessInfo({ accessKind, traitKind, traitDesc }: Props) {
diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.story.tsx b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.story.tsx
index e44581205ae81..b5629bea89dea 100644
--- a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.story.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.story.tsx
@@ -18,9 +18,7 @@
 
 import { MemoryRouter } from 'react-router';
 
-import { SetupAccessWrapper } from './SetupAccessWrapper';
-
-import type { Props } from './SetupAccessWrapper';
+import { SetupAccessWrapper, type Props } from './SetupAccessWrapper';
 
 export default {
   title: 'Teleport/Discover/Shared/SetupAccessWrapper',
diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx
index 3ef9af93c2b36..9d020f025bb6b 100644
--- a/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/SetupAccessWrapper.tsx
@@ -18,21 +18,19 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { Box, Indicator, Flex } from 'design';
-import * as Icons from 'design/Icon';
 
+import { Box, Flex, Indicator } from 'design';
+import * as Icons from 'design/Icon';
 import { P } from 'design/Text/Text';
 
 import {
-  Header,
-  HeaderSubtitle,
   ActionButtons,
   ButtonBlueText,
+  Header,
+  HeaderSubtitle,
 } from 'teleport/Discover/Shared';
 
-import { AccessInfo } from './AccessInfo';
-
-import type { TraitKind } from './AccessInfo';
+import { AccessInfo, type TraitKind } from './AccessInfo';
 import type { State } from './useUserTraits';
 
 export type Props = {
diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.test.tsx b/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.test.tsx
index d8e9d48e2c9ff..b38b48abc9de8 100644
--- a/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.test.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.test.tsx
@@ -16,36 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act, renderHook, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router';
-import { renderHook, act, waitFor } from '@testing-library/react';
+
 import { AwsRole } from 'shared/services/apps';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContextProvider } from 'teleport';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import { DiscoverProvider } from 'teleport/Discover/useDiscover';
 import cfg from 'teleport/config';
-import { userEventService } from 'teleport/services/userEvent';
+import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
 import {
   defaultDiscoverContext,
   defaultResourceSpec,
 } from 'teleport/Discover/Fixtures/fixtures';
-import TeleportContext from 'teleport/teleportContext';
-import { app } from 'teleport/Discover/AwsMangementConsole/fixtures';
+import {
+  DiscoverProvider,
+  type AppMeta,
+  type DbMeta,
+  type DiscoverContextState,
+  type KubeMeta,
+  type NodeMeta,
+} from 'teleport/Discover/useDiscover';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ExcludeUserField } from 'teleport/services/user';
+import { userEventService } from 'teleport/services/userEvent';
+import TeleportContext from 'teleport/teleportContext';
 
 import { ResourceKind } from '../ResourceKind';
-
 import { useUserTraits } from './useUserTraits';
 
-import type {
-  AppMeta,
-  DbMeta,
-  DiscoverContextState,
-  KubeMeta,
-  NodeMeta,
-} from 'teleport/Discover/useDiscover';
-
 describe('onProceed correctly deduplicates, removes static traits, updates meta, and calls updateUser', () => {
   const teleCtx = createTeleportContext();
   jest.spyOn(teleCtx.userService, 'fetchUser').mockResolvedValue(getMockUser());
diff --git a/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.ts b/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.ts
index 8687a64c1d7a1..a9b99149db7c6 100644
--- a/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.ts
+++ b/web/packages/teleport/src/Discover/Shared/SetupAccess/useUserTraits.ts
@@ -16,29 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import { arrayStrDiff } from 'teleport/lib/util';
-import useTeleport from 'teleport/useTeleport';
 import { Option } from 'teleport/Discover/Shared/SelectCreatable';
-import { useDiscover } from 'teleport/Discover/useDiscover';
+import {
+  useDiscover,
+  type AppMeta,
+  type DbMeta,
+  type KubeMeta,
+  type NodeMeta,
+} from 'teleport/Discover/useDiscover';
+import { arrayStrDiff } from 'teleport/lib/util';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 import {
   ExcludeUserField,
   type User,
   type UserTraits,
 } from 'teleport/services/user';
+import useTeleport from 'teleport/useTeleport';
 
 import { ResourceKind } from '../ResourceKind';
 
-import type {
-  AppMeta,
-  DbMeta,
-  KubeMeta,
-  NodeMeta,
-} from 'teleport/Discover/useDiscover';
-
 // useUserTraits handles:
 //  - retrieving the latest user (for the dynamic traits) from the backend
 //  - extracting traits into static traits (role-defined) and dynamic traits (user-defined)
diff --git a/web/packages/teleport/src/Discover/Shared/StatusLight.tsx b/web/packages/teleport/src/Discover/Shared/StatusLight.tsx
index c8737207d028b..6a5565899ca56 100644
--- a/web/packages/teleport/src/Discover/Shared/StatusLight.tsx
+++ b/web/packages/teleport/src/Discover/Shared/StatusLight.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box } from 'design';
 import styled from 'styled-components';
 
+import { Box } from 'design';
+
 export enum ItemStatus {
   Success,
   Warning,
diff --git a/web/packages/teleport/src/Discover/Shared/StepBox.tsx b/web/packages/teleport/src/Discover/Shared/StepBox.tsx
index d06a7135dade1..8775d0f0616a4 100644
--- a/web/packages/teleport/src/Discover/Shared/StepBox.tsx
+++ b/web/packages/teleport/src/Discover/Shared/StepBox.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
 export const StepBox = styled(Box)`
diff --git a/web/packages/teleport/src/Discover/Shared/StyledBox.ts b/web/packages/teleport/src/Discover/Shared/StyledBox.ts
index 185c5f9432e7f..8b047efde9459 100644
--- a/web/packages/teleport/src/Discover/Shared/StyledBox.ts
+++ b/web/packages/teleport/src/Discover/Shared/StyledBox.ts
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
 export const StyledBox = styled(Box).attrs({
diff --git a/web/packages/teleport/src/Discover/Shared/SubnetIdPicker/SubnetIdPicker.tsx b/web/packages/teleport/src/Discover/Shared/SubnetIdPicker/SubnetIdPicker.tsx
index b3e0c921f47fd..ca7b3faec54e0 100644
--- a/web/packages/teleport/src/Discover/Shared/SubnetIdPicker/SubnetIdPicker.tsx
+++ b/web/packages/teleport/src/Discover/Shared/SubnetIdPicker/SubnetIdPicker.tsx
@@ -18,13 +18,12 @@
 
 import React from 'react';
 
-import { Flex, Link, ButtonIcon } from 'design';
-import Table, { Cell } from 'design/DataTable';
+import { ButtonIcon, Flex, Link } from 'design';
 import { Danger } from 'design/Alert';
 import { CheckboxInput } from 'design/Checkbox';
+import Table, { Cell } from 'design/DataTable';
 import { FetchStatus } from 'design/DataTable/types';
 import { NewTab } from 'design/Icon';
-
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
 import { Regions, Subnet } from 'teleport/services/integrations';
diff --git a/web/packages/teleport/src/Discover/Shared/Text.tsx b/web/packages/teleport/src/Discover/Shared/Text.tsx
index 5179fa431e72f..d8f67f539c432 100644
--- a/web/packages/teleport/src/Discover/Shared/Text.tsx
+++ b/web/packages/teleport/src/Discover/Shared/Text.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, Text } from 'design';
-
 import styled from 'styled-components';
 
+import { Box, Text } from 'design';
+
 export const TextIcon = styled(Text)`
   display: flex;
 
diff --git a/web/packages/teleport/src/Discover/Shared/useJoinTokenSuspender.ts b/web/packages/teleport/src/Discover/Shared/useJoinTokenSuspender.ts
index b310c1e330858..18e7f9e3f007c 100644
--- a/web/packages/teleport/src/Discover/Shared/useJoinTokenSuspender.ts
+++ b/web/packages/teleport/src/Discover/Shared/useJoinTokenSuspender.ts
@@ -19,17 +19,15 @@
 import { useEffect, useState } from 'react';
 
 import { useTeleport } from 'teleport';
-
 import {
   ResourceKind,
   resourceKindToJoinRole,
 } from 'teleport/Discover/Shared/ResourceKind';
-
-import { useDiscover } from '../useDiscover';
-
 import type { ResourceLabel } from 'teleport/services/agents';
 import type { JoinMethod, JoinToken } from 'teleport/services/joinToken';
 
+import { useDiscover } from '../useDiscover';
+
 interface SuspendResult {
   promise?: Promise<any>;
   response?: JoinToken;
diff --git a/web/packages/teleport/src/Discover/flow.tsx b/web/packages/teleport/src/Discover/flow.tsx
index 723e47d11d24d..8d5e6e716ff04 100644
--- a/web/packages/teleport/src/Discover/flow.tsx
+++ b/web/packages/teleport/src/Discover/flow.tsx
@@ -18,10 +18,10 @@
 
 import React from 'react';
 
+import { BaseView } from 'teleport/components/Wizard/flow';
 import { ResourceKind } from 'teleport/Discover/Shared';
 import { AgentStepComponent } from 'teleport/Discover/types';
 import { DiscoverEvent } from 'teleport/services/userEvent';
-import { BaseView } from 'teleport/components/Wizard/flow';
 
 import { ResourceSpec } from './SelectResource';
 
diff --git a/web/packages/teleport/src/Discover/resourceViewConfigs.ts b/web/packages/teleport/src/Discover/resourceViewConfigs.ts
index 68a5b0ec3b3bb..fb5d5013c2696 100644
--- a/web/packages/teleport/src/Discover/resourceViewConfigs.ts
+++ b/web/packages/teleport/src/Discover/resourceViewConfigs.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ServerResource } from 'teleport/Discover/Server';
 import { AwsMangementConsole } from 'teleport/Discover/AwsMangementConsole';
+import { ConnectMyComputerResource } from 'teleport/Discover/ConnectMyComputer';
 import { DatabaseResource } from 'teleport/Discover/Database';
 import { KubernetesResource } from 'teleport/Discover/Kubernetes';
-import { ConnectMyComputerResource } from 'teleport/Discover/ConnectMyComputer';
+import { ServerResource } from 'teleport/Discover/Server';
 
 import { ResourceViewConfig } from './flow';
 
diff --git a/web/packages/teleport/src/Discover/types.ts b/web/packages/teleport/src/Discover/types.ts
index 5ac40920671d0..c155edb9963b8 100644
--- a/web/packages/teleport/src/Discover/types.ts
+++ b/web/packages/teleport/src/Discover/types.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { State } from './useDiscover';
 import { ResourceViewConfig } from './flow';
+import { State } from './useDiscover';
 
 export type AgentStepProps = {
   // agentMeta describes fields specific to an agent kind.
diff --git a/web/packages/teleport/src/Discover/useDiscover.test.tsx b/web/packages/teleport/src/Discover/useDiscover.test.tsx
index f293cd0acc20c..70aadf7ae2cd4 100644
--- a/web/packages/teleport/src/Discover/useDiscover.test.tsx
+++ b/web/packages/teleport/src/Discover/useDiscover.test.tsx
@@ -16,11 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act, renderHook } from '@testing-library/react';
 import { MemoryRouter } from 'react-router';
-import { renderHook, act } from '@testing-library/react';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContextProvider } from 'teleport';
+import cfg from 'teleport/config';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
+import api from 'teleport/services/api';
 import {
   DiscoverEvent,
   DiscoverEventResource,
@@ -29,12 +32,9 @@ import {
   DiscoverServiceDeployType,
   userEventService,
 } from 'teleport/services/userEvent';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
-import api from 'teleport/services/api';
-import cfg from 'teleport/config';
 
-import { useDiscover, DiscoverProvider } from './useDiscover';
 import { SERVERS } from './SelectResource/resources';
+import { DiscoverProvider, useDiscover } from './useDiscover';
 
 describe('emitting events', () => {
   const ctx = createTeleportContext();
diff --git a/web/packages/teleport/src/Discover/useDiscover.tsx b/web/packages/teleport/src/Discover/useDiscover.tsx
index 61e493aa3b44f..2b353eb0d4f3d 100644
--- a/web/packages/teleport/src/Discover/useDiscover.tsx
+++ b/web/packages/teleport/src/Discover/useDiscover.tsx
@@ -16,49 +16,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useContext, useState, useEffect, useCallback } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useHistory, useLocation } from 'react-router';
 
-import {
-  DiscoverEventStatus,
-  DiscoverEventStepStatus,
-  DiscoverEvent,
-  DiscoverEventResource,
-  userEventService,
-  DiscoverServiceDeployMethod,
-  DiscoverServiceDeploy,
-  DiscoverServiceDeployType,
-  DiscoverDiscoveryConfigMethod,
-} from 'teleport/services/userEvent';
-import cfg from 'teleport/config';
-import { DiscoveryConfig } from 'teleport/services/discovery';
 import {
   addIndexToViews,
   findViewAtIndex,
 } from 'teleport/components/Wizard/flow';
-
-import { ResourceViewConfig, View } from './flow';
-import { viewConfigs } from './resourceViewConfigs';
-import { EViewConfigs } from './types';
-import { ServiceDeployMethod } from './Database/common';
-
-import type { Node } from 'teleport/services/nodes';
+import cfg from 'teleport/config';
+import type { ResourceLabel } from 'teleport/services/agents';
 import type { App } from 'teleport/services/apps';
-import type { Kube } from 'teleport/services/kube';
 import type { Database } from 'teleport/services/databases';
-import type { ResourceLabel } from 'teleport/services/agents';
-import type { ResourceSpec } from './SelectResource';
+import { DiscoveryConfig } from 'teleport/services/discovery';
 import type {
   AwsRdsDatabase,
   Ec2InstanceConnectEndpoint,
   Integration,
   Regions,
 } from 'teleport/services/integrations';
-
+import type { Kube } from 'teleport/services/kube';
+import type { Node } from 'teleport/services/nodes';
 import type {
   SamlGcpWorkforce,
   SamlIdpServiceProvider,
 } from 'teleport/services/samlidp/types';
+import {
+  DiscoverDiscoveryConfigMethod,
+  DiscoverEvent,
+  DiscoverEventResource,
+  DiscoverEventStatus,
+  DiscoverEventStepStatus,
+  DiscoverServiceDeploy,
+  DiscoverServiceDeployMethod,
+  DiscoverServiceDeployType,
+  userEventService,
+} from 'teleport/services/userEvent';
+
+import { ServiceDeployMethod } from './Database/common';
+import { ResourceViewConfig, View } from './flow';
+import { viewConfigs } from './resourceViewConfigs';
+import type { ResourceSpec } from './SelectResource';
+import { EViewConfigs } from './types';
 
 export interface DiscoverContextState<T = any> {
   agentMeta: AgentMeta;
diff --git a/web/packages/teleport/src/Discover/yamlTemplates/index.ts b/web/packages/teleport/src/Discover/yamlTemplates/index.ts
index d354ccc7aada0..26b11e9117b98 100644
--- a/web/packages/teleport/src/Discover/yamlTemplates/index.ts
+++ b/web/packages/teleport/src/Discover/yamlTemplates/index.ts
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import nodeAccessRO from './nodeAccessRO.yaml?raw';
-import nodeAccessRW from './nodeAccessRW.yaml?raw';
+import awsAppAccessRO from './awsAppAccessRO.yaml?raw';
+import awsAppAccessRW from './awsAppAccessRW.yaml?raw';
 import connDiagRW from './connDiagRW.yaml?raw';
-import kubeAccessRW from './kubeAccessRW.yaml?raw';
-import kubeAccessRO from './kubeAccessRO.yaml?raw';
-import dbAccessRW from './dbAccessRW.yaml?raw';
 import dbAccessRO from './dbAccessRO.yaml?raw';
+import dbAccessRW from './dbAccessRW.yaml?raw';
 import dbCU from './dbCU.yaml?raw';
+import integrationAndAppRW from './integrationAndAppRW.yaml?raw';
 import integrationRWE from './integrationRWE.yaml?raw';
 import integrationRWEAndDbCU from './integrationRWEAndDbCU.yaml?raw';
 import integrationRWEAndNodeRWE from './integrationRWEAndNodeRWE.yaml?raw';
-import integrationAndAppRW from './integrationAndAppRW.yaml?raw';
-import awsAppAccessRW from './awsAppAccessRW.yaml?raw';
-import awsAppAccessRO from './awsAppAccessRO.yaml?raw';
+import kubeAccessRO from './kubeAccessRO.yaml?raw';
+import kubeAccessRW from './kubeAccessRW.yaml?raw';
+import nodeAccessRO from './nodeAccessRO.yaml?raw';
+import nodeAccessRW from './nodeAccessRW.yaml?raw';
 
 export {
   nodeAccessRO,
diff --git a/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.test.tsx b/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.test.tsx
index 4f5f36a1090e6..684517eeffec3 100644
--- a/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.test.tsx
+++ b/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.test.tsx
@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
-import { Route, Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Route, Router } from 'react-router';
+
+import { render, screen } from 'design/utils/testing';
 
-import { HeadlessRequest } from 'teleport/HeadlessRequest/HeadlessRequest';
 import cfg from 'teleport/config';
+import { HeadlessRequest } from 'teleport/HeadlessRequest/HeadlessRequest';
 import auth from 'teleport/services/auth';
 
 test('ip address should be visible', async () => {
diff --git a/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.tsx b/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.tsx
index 804f2201be20f..e59b5c6b11b57 100644
--- a/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.tsx
+++ b/web/packages/teleport/src/HeadlessRequest/HeadlessRequest.tsx
@@ -19,13 +19,13 @@
 import { useEffect, useState } from 'react';
 import styled from 'styled-components';
 
-import { Spinner } from 'design/Icon';
 import { Box, Flex, rotate360 } from 'design';
+import { Spinner } from 'design/Icon';
 
-import auth from 'teleport/services/auth';
-import { useParams } from 'teleport/components/Router';
 import HeadlessRequestDialog from 'teleport/components/HeadlessRequestDialog/HeadlessRequestDialog';
+import { useParams } from 'teleport/components/Router';
 import { CardAccept, CardDenied } from 'teleport/HeadlessRequest/Cards';
+import auth from 'teleport/services/auth';
 
 export function HeadlessRequest() {
   const { requestId } = useParams<{ requestId: string }>();
diff --git a/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.test.tsx b/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.test.tsx
index e75925d9ba211..f57b83fcab2bc 100644
--- a/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.test.tsx
+++ b/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.test.tsx
@@ -15,18 +15,19 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { useEffect } from 'react';
-import { render, screen, fireEvent, waitFor } from 'design/utils/testing';
 import userEvent from '@testing-library/user-event';
+import { useEffect } from 'react';
 import { MemoryRouter } from 'react-router';
 
+import { fireEvent, render, screen, waitFor } from 'design/utils/testing';
+
+import cfg from 'teleport/config';
 import {
   Integration,
   IntegrationKind,
   integrationService,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import cfg from 'teleport/config';
 
 import { EditAwsOidcIntegrationDialog } from './EditAwsOidcIntegrationDialog';
 import { useIntegrationOperation } from './Operations';
diff --git a/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.tsx b/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.tsx
index 9107dff46a441..594697f345b34 100644
--- a/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.tsx
+++ b/web/packages/teleport/src/Integrations/EditAwsOidcIntegrationDialog.tsx
@@ -18,39 +18,39 @@
 
 import { useState } from 'react';
 import styled from 'styled-components';
+
 import {
-  ButtonSecondary,
-  ButtonPrimary,
-  ButtonBorder,
   Alert,
-  Text,
   Box,
+  ButtonBorder,
+  ButtonPrimary,
+  ButtonSecondary,
   Link,
+  Text,
 } from 'design';
+import { OutlineInfo, OutlineWarn } from 'design/Alert/Alert';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/DialogConfirmation';
-import { OutlineInfo, OutlineWarn } from 'design/Alert/Alert';
+import { FieldCheckbox } from 'shared/components/FieldCheckbox';
 import FieldInput from 'shared/components/FieldInput';
+import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredRoleArn } from 'shared/components/Validation/rules';
-import { TextSelectCopyMulti } from 'shared/components/TextSelectCopy';
-
-import { FieldCheckbox } from 'shared/components/FieldCheckbox';
 import { useAsync } from 'shared/hooks/useAsync';
 
+import cfg from 'teleport/config';
 import {
-  Integration,
   AwsOidcPolicyPreset,
+  Integration,
 } from 'teleport/services/integrations';
-import cfg from 'teleport/config';
 import { splitAwsIamArn } from 'teleport/services/integrations/aws';
 
-import { EditableIntegrationFields } from './Operations/useIntegrationOperation';
 import { S3BucketConfiguration } from './Enroll/AwsOidc/S3BucketConfiguration';
+import { EditableIntegrationFields } from './Operations/useIntegrationOperation';
 
 type Props = {
   close(): void;
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.test.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.test.tsx
index 4fe6388f52627..882bf66d2a59b 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.test.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.test.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { MemoryRouter } from 'react-router';
+
 import {
   fireEvent,
   render,
@@ -23,12 +25,10 @@ import {
   userEvent,
   waitFor,
 } from 'design/utils/testing';
-import { MemoryRouter } from 'react-router';
-
-import { userEventService } from 'teleport/services/userEvent';
 
-import { integrationService } from 'teleport/services/integrations';
 import { ApiError } from 'teleport/services/api/parseError';
+import { integrationService } from 'teleport/services/integrations';
+import { userEventService } from 'teleport/services/userEvent';
 
 import { AwsOidc } from './AwsOidc';
 
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.tsx
index 88993d48efcac..a64dd2aac60e2 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/AwsOidc.tsx
@@ -16,28 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Link as InternalRouteLink } from 'react-router-dom';
+import styled from 'styled-components';
+
 import { Box, ButtonPrimary, ButtonSecondary, Flex, Link, Text } from 'design';
 import * as Icons from 'design/Icon';
-import { Link as InternalRouteLink } from 'react-router-dom';
 import FieldInput from 'shared/components/FieldInput';
 import Validation from 'shared/components/Validation';
 import { requiredIamRoleName } from 'shared/components/Validation/rules';
-import styled from 'styled-components';
 
 import { TextSelectCopyMulti } from 'teleport/components/TextSelectCopy';
 import cfg from 'teleport/config';
 import { Header } from 'teleport/Discover/Shared';
+import { AWS_RESOURCE_GROUPS_TAG_EDITOR_LINK } from 'teleport/Discover/Shared/const';
 import {
-  ShowConfigurationScript,
   RoleArnInput,
+  ShowConfigurationScript,
 } from 'teleport/Integrations/shared';
-import { AWS_RESOURCE_GROUPS_TAG_EDITOR_LINK } from 'teleport/Discover/Shared/const';
-import useStickyClusterId from 'teleport/useStickyClusterId';
 import { AwsOidcPolicyPreset } from 'teleport/services/integrations';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
+import { ConfigureAwsOidcSummary } from './ConfigureAwsOidcSummary';
 import { FinishDialog } from './FinishDialog';
 import { useAwsOidcIntegration } from './useAwsOidcIntegration';
-import { ConfigureAwsOidcSummary } from './ConfigureAwsOidcSummary';
 
 export function AwsOidc() {
   const {
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/ConfigureAwsOidcSummary.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/ConfigureAwsOidcSummary.tsx
index dfc16254c7263..6ae365fd7b760 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/ConfigureAwsOidcSummary.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/ConfigureAwsOidcSummary.tsx
@@ -17,9 +17,10 @@
  */
 
 import styled from 'styled-components';
-import { Flex, Box, H3, Text } from 'design';
-import TextEditor from 'shared/components/TextEditor';
+
+import { Box, Flex, H3, Text } from 'design';
 import { IconTooltip } from 'design/Tooltip';
+import TextEditor from 'shared/components/TextEditor';
 
 import useStickyClusterId from 'teleport/useStickyClusterId';
 
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/FinishDialog.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/FinishDialog.tsx
index b1fafdb9fde07..5fe4d0d699e6b 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/FinishDialog.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/FinishDialog.tsx
@@ -16,21 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from 'react';
 import { Location } from 'history';
+import React from 'react';
 import { useLocation } from 'react-router';
 import { Link } from 'react-router-dom';
-import { CircleCheck } from 'design/Icon';
-import { ButtonPrimary, ButtonSecondary, Text, Flex } from 'design';
+
+import { ButtonPrimary, ButtonSecondary, Flex, Text } from 'design';
 import Dialog, {
-  DialogHeader,
   DialogContent,
   DialogFooter,
+  DialogHeader,
 } from 'design/Dialog';
+import { CircleCheck } from 'design/Icon';
 
 import cfg from 'teleport/config';
-import { Integration } from 'teleport/services/integrations';
 import { DiscoverUrlLocationState } from 'teleport/Discover/useDiscover';
+import { Integration } from 'teleport/services/integrations';
 
 export function FinishDialog({ integration }: { integration: Integration }) {
   const location = useLocation<DiscoverUrlLocationState>();
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/S3BucketConfiguration.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/S3BucketConfiguration.tsx
index 6acdda272d825..9bd823c0fbc10 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/S3BucketConfiguration.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/S3BucketConfiguration.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Flex } from 'design';
-import FieldInput from 'shared/components/FieldInput';
+import { Flex, Text } from 'design';
 import { IconTooltip } from 'design/Tooltip';
+import FieldInput from 'shared/components/FieldInput';
 
 export function S3BucketConfiguration({
   s3Bucket,
diff --git a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/useAwsOidcIntegration.tsx b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/useAwsOidcIntegration.tsx
index fd74bfb937de5..e8b21f8e28c75 100644
--- a/web/packages/teleport/src/Integrations/Enroll/AwsOidc/useAwsOidcIntegration.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/AwsOidc/useAwsOidcIntegration.tsx
@@ -18,6 +18,7 @@
 
 import { useEffect, useState } from 'react';
 import { useLocation } from 'react-router';
+
 import { Validator } from 'shared/components/Validation';
 import {
   makeErrorAttempt,
@@ -25,23 +26,23 @@ import {
   useAsync,
 } from 'shared/hooks/useAsync';
 
-import { DiscoverUrlLocationState } from 'teleport/Discover/useDiscover';
-import {
-  IntegrationEnrollEvent,
-  IntegrationEnrollEventData,
-  IntegrationEnrollKind,
-  userEventService,
-} from 'teleport/services/userEvent';
 import cfg from 'teleport/config';
+import { DiscoverUrlLocationState } from 'teleport/Discover/useDiscover';
+import { ApiError } from 'teleport/services/api/parseError';
 import {
+  AwsOidcPolicyPreset,
   Integration,
   IntegrationCreateRequest,
   IntegrationKind,
   integrationService,
-  AwsOidcPolicyPreset,
 } from 'teleport/services/integrations';
+import {
+  IntegrationEnrollEvent,
+  IntegrationEnrollEventData,
+  IntegrationEnrollKind,
+  userEventService,
+} from 'teleport/services/userEvent';
 import useStickyClusterId from 'teleport/useStickyClusterId';
-import { ApiError } from 'teleport/services/api/parseError';
 
 type integrationConfig = {
   name: string;
diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.story.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.story.tsx
index 9f0574aed75df..04e71533b41dc 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.story.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.story.tsx
@@ -19,10 +19,8 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
-import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import cfg from 'teleport/config';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { IntegrationEnroll } from './IntegrationEnroll';
 
diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.tsx
index 1b34155c612ef..27e70dbf56cf7 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationEnroll.tsx
@@ -23,13 +23,13 @@ import {
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import cfg from 'teleport/config';
 import { Route, Switch } from 'teleport/components/Router';
+import cfg from 'teleport/config';
 
-import { MachineIDIntegrationSection } from './MachineIDIntegrationSection';
-import { IntegrationTiles } from './IntegrationTiles';
 import { NoCodeIntegrationDescription } from './common';
 import { getRoutesToEnrollIntegrations } from './IntegrationRoute';
+import { IntegrationTiles } from './IntegrationTiles';
+import { MachineIDIntegrationSection } from './MachineIDIntegrationSection';
 
 export function IntegrationEnroll() {
   return (
diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationRoute.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationRoute.tsx
index 5f9b427036e2e..7193424a150de 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationRoute.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationRoute.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import cfg from 'teleport/config';
 import { Route } from 'teleport/components/Router';
+import cfg from 'teleport/config';
 import { IntegrationKind } from 'teleport/services/integrations';
 
 import { AwsOidc } from './AwsOidc';
diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.test.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.test.tsx
index 6ebbde667d1bf..22f9fe0197674 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.test.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.test.tsx
@@ -17,6 +17,7 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import cfg from 'teleport/config';
diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
index fcbabd55cca47..5a8c4ac7f9897 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
@@ -17,16 +17,17 @@
  */
 
 import { Link } from 'react-router-dom';
-import { Text, Flex } from 'design';
 
-import cfg from 'teleport/config';
+import { Flex, Text } from 'design';
+
 import {
   BadgeTitle,
   ToolTipNoPermBadge,
 } from 'teleport/components/ToolTipNoPermBadge';
+import cfg from 'teleport/config';
 import { IntegrationKind } from 'teleport/services/integrations';
 
-import { IntegrationTile, IntegrationIcon } from './common';
+import { IntegrationIcon, IntegrationTile } from './common';
 
 export function IntegrationTiles({
   hasIntegrationAccess = true,
diff --git a/web/packages/teleport/src/Integrations/Enroll/MachineIDIntegrationSection.tsx b/web/packages/teleport/src/Integrations/Enroll/MachineIDIntegrationSection.tsx
index 4492a3415e23a..cf2d26a42b56d 100644
--- a/web/packages/teleport/src/Integrations/Enroll/MachineIDIntegrationSection.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/MachineIDIntegrationSection.tsx
@@ -17,7 +17,6 @@
  */
 
 import { Box, H2 } from 'design';
-
 import { P } from 'design/Text/Text';
 
 import { BotTiles } from 'teleport/Bots/Add/AddBotsPicker';
diff --git a/web/packages/teleport/src/Integrations/Enroll/common.tsx b/web/packages/teleport/src/Integrations/Enroll/common.tsx
index d387add42656e..2389b49bf066d 100644
--- a/web/packages/teleport/src/Integrations/Enroll/common.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/common.tsx
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, Flex, H2, ResourceIcon } from 'design';
 import styled from 'styled-components';
+
+import { Box, Flex, H2, ResourceIcon } from 'design';
 import { P } from 'design/Text/Text';
 
 export const IntegrationTile = styled(Flex)<{
diff --git a/web/packages/teleport/src/Integrations/IntegrationList.test.tsx b/web/packages/teleport/src/Integrations/IntegrationList.test.tsx
index 3012e356a4788..8d9614da50f54 100644
--- a/web/packages/teleport/src/Integrations/IntegrationList.test.tsx
+++ b/web/packages/teleport/src/Integrations/IntegrationList.test.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { fireEvent, render, screen, userEvent } from 'design/utils/testing';
-
+import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
 
-import { createMemoryHistory } from 'history';
+import { fireEvent, render, screen, userEvent } from 'design/utils/testing';
 
 import { IntegrationList } from 'teleport/Integrations/IntegrationList';
 import {
diff --git a/web/packages/teleport/src/Integrations/IntegrationList.tsx b/web/packages/teleport/src/Integrations/IntegrationList.tsx
index e4218347a0d59..dea55d08f205f 100644
--- a/web/packages/teleport/src/Integrations/IntegrationList.tsx
+++ b/web/packages/teleport/src/Integrations/IntegrationList.tsx
@@ -17,21 +17,21 @@
  */
 
 import React from 'react';
-import styled from 'styled-components';
 import { useHistory } from 'react-router';
 import { Link as InternalRouteLink } from 'react-router-dom';
+import styled from 'styled-components';
 
 import { Box, Flex } from 'design';
 import Table, { Cell } from 'design/DataTable';
-import { MenuButton, MenuItem } from 'shared/components/MenuAction';
+import { ResourceIcon } from 'design/ResourceIcon';
 import { IconTooltip } from 'design/Tooltip';
+import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 import { useAsync } from 'shared/hooks/useAsync';
-import { ResourceIcon } from 'design/ResourceIcon';
 import { saveOnDisk } from 'shared/utils/saveOnDisk';
 
-import useStickyClusterId from 'teleport/useStickyClusterId';
+import cfg from 'teleport/config';
+import { getStatus } from 'teleport/Integrations/helpers';
 import api from 'teleport/services/api';
-
 import {
   ExternalAuditStorageIntegration,
   getStatusCodeDescription,
@@ -41,9 +41,7 @@ import {
   IntegrationStatusCode,
   Plugin,
 } from 'teleport/services/integrations';
-import cfg from 'teleport/config';
-
-import { getStatus } from 'teleport/Integrations/helpers';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import { ExternalAuditStorageOpType } from './Operations/useIntegrationOperation';
 
diff --git a/web/packages/teleport/src/Integrations/IntegrationStatus.tsx b/web/packages/teleport/src/Integrations/IntegrationStatus.tsx
index 0fee51dc0782f..6119793a0d1a6 100644
--- a/web/packages/teleport/src/Integrations/IntegrationStatus.tsx
+++ b/web/packages/teleport/src/Integrations/IntegrationStatus.tsx
@@ -18,8 +18,8 @@
 
 import { useParams } from 'react-router';
 
-import { IntegrationKind, PluginKind } from 'teleport/services/integrations';
 import { AwsOidcRoutes } from 'teleport/Integrations/status/AwsOidc/AwsOidcRoutes';
+import { IntegrationKind, PluginKind } from 'teleport/services/integrations';
 
 export function IntegrationStatus() {
   const { type: integrationType } = useParams<{
diff --git a/web/packages/teleport/src/Integrations/Integrations.story.tsx b/web/packages/teleport/src/Integrations/Integrations.story.tsx
index 1f38b92b2bfe8..32cd1fa5fcb88 100644
--- a/web/packages/teleport/src/Integrations/Integrations.story.tsx
+++ b/web/packages/teleport/src/Integrations/Integrations.story.tsx
@@ -23,10 +23,10 @@ import {
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
 
+import { EditAwsOidcIntegrationDialog } from './EditAwsOidcIntegrationDialog';
+import { integrations, plugins } from './fixtures';
 import { IntegrationList } from './IntegrationList';
 import { DeleteIntegrationDialog } from './RemoveIntegrationDialog';
-import { EditAwsOidcIntegrationDialog } from './EditAwsOidcIntegrationDialog';
-import { plugins, integrations } from './fixtures';
 
 export default {
   title: 'Teleport/Integrations',
diff --git a/web/packages/teleport/src/Integrations/Integrations.tsx b/web/packages/teleport/src/Integrations/Integrations.tsx
index e1b71adde1713..4968a4eb40f84 100644
--- a/web/packages/teleport/src/Integrations/Integrations.tsx
+++ b/web/packages/teleport/src/Integrations/Integrations.tsx
@@ -16,23 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
+
+import { Alert, Box, Indicator } from 'design';
 import useAttempt from 'shared/hooks/useAttemptNext';
-import { Indicator, Box, Alert } from 'design';
 
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
+import {
+  integrationService,
+  type Integration,
+} from 'teleport/services/integrations';
 import useTeleport from 'teleport/useTeleport';
-import { integrationService } from 'teleport/services/integrations';
 
-import { IntegrationsAddButton } from './IntegrationsAddButton';
 import { IntegrationList } from './IntegrationList';
-import { useIntegrationOperation, IntegrationOperations } from './Operations';
-
-import type { Integration } from 'teleport/services/integrations';
+import { IntegrationsAddButton } from './IntegrationsAddButton';
+import { IntegrationOperations, useIntegrationOperation } from './Operations';
 import type { EditableIntegrationFields } from './Operations/useIntegrationOperation';
 
 export function Integrations() {
diff --git a/web/packages/teleport/src/Integrations/IntegrationsAddButton.test.tsx b/web/packages/teleport/src/Integrations/IntegrationsAddButton.test.tsx
index 6021f79e52a96..72421c822bc28 100644
--- a/web/packages/teleport/src/Integrations/IntegrationsAddButton.test.tsx
+++ b/web/packages/teleport/src/Integrations/IntegrationsAddButton.test.tsx
@@ -17,6 +17,7 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen } from 'design/utils/testing';
 
 import { IntegrationsAddButton } from './IntegrationsAddButton';
diff --git a/web/packages/teleport/src/Integrations/IntegrationsAddButton.tsx b/web/packages/teleport/src/Integrations/IntegrationsAddButton.tsx
index 7c00e1b7b5c5b..135581ab0aacf 100644
--- a/web/packages/teleport/src/Integrations/IntegrationsAddButton.tsx
+++ b/web/packages/teleport/src/Integrations/IntegrationsAddButton.tsx
@@ -17,6 +17,7 @@
  */
 
 import { Link } from 'react-router-dom';
+
 import { Button } from 'design';
 import { HoverTooltip } from 'design/Tooltip';
 import { MissingPermissionsTooltip } from 'shared/components/MissingPermissionsTooltip';
diff --git a/web/packages/teleport/src/Integrations/Operations/IntegrationOperations.tsx b/web/packages/teleport/src/Integrations/Operations/IntegrationOperations.tsx
index 0468586857206..9a60a42c1994c 100644
--- a/web/packages/teleport/src/Integrations/Operations/IntegrationOperations.tsx
+++ b/web/packages/teleport/src/Integrations/Operations/IntegrationOperations.tsx
@@ -18,12 +18,11 @@
 
 import { Integration } from 'teleport/services/integrations';
 
-import { DeleteIntegrationDialog } from '../RemoveIntegrationDialog';
 import { EditAwsOidcIntegrationDialog } from '../EditAwsOidcIntegrationDialog';
-
+import { DeleteIntegrationDialog } from '../RemoveIntegrationDialog';
 import {
-  OperationType,
   EditableIntegrationFields,
+  OperationType,
 } from './useIntegrationOperation';
 
 type Props = {
diff --git a/web/packages/teleport/src/Integrations/Operations/useIntegrationOperation.ts b/web/packages/teleport/src/Integrations/Operations/useIntegrationOperation.ts
index 252ad4ba65683..e8c19f4fe5dd2 100644
--- a/web/packages/teleport/src/Integrations/Operations/useIntegrationOperation.ts
+++ b/web/packages/teleport/src/Integrations/Operations/useIntegrationOperation.ts
@@ -21,11 +21,11 @@ import { useState } from 'react';
 import {
   IntegrationKind,
   integrationService,
+  type Integration,
+  type Plugin,
 } from 'teleport/services/integrations';
 import useStickyClusterId from 'teleport/useStickyClusterId';
 
-import type { Integration, Plugin } from 'teleport/services/integrations';
-
 export function useIntegrationOperation() {
   const { clusterId } = useStickyClusterId();
 
diff --git a/web/packages/teleport/src/Integrations/RemoveIntegrationDialog.tsx b/web/packages/teleport/src/Integrations/RemoveIntegrationDialog.tsx
index f2cc5d6ed051c..ddd45c7f54e41 100644
--- a/web/packages/teleport/src/Integrations/RemoveIntegrationDialog.tsx
+++ b/web/packages/teleport/src/Integrations/RemoveIntegrationDialog.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonSecondary, ButtonWarning, Text, Alert, P1 } from 'design';
+import { Alert, ButtonSecondary, ButtonWarning, P1, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/DialogConfirmation';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
diff --git a/web/packages/teleport/src/Integrations/fixtures.ts b/web/packages/teleport/src/Integrations/fixtures.ts
index 83a33648a6532..6eea91258efd0 100644
--- a/web/packages/teleport/src/Integrations/fixtures.ts
+++ b/web/packages/teleport/src/Integrations/fixtures.ts
@@ -19,12 +19,9 @@
 import {
   IntegrationKind,
   IntegrationStatusCode,
-} from 'teleport/services/integrations';
-
-import type {
-  Plugin,
-  Integration,
-  ExternalAuditStorage,
+  type ExternalAuditStorage,
+  type Integration,
+  type Plugin,
 } from 'teleport/services/integrations';
 
 export const plugins: Plugin[] = [
diff --git a/web/packages/teleport/src/Integrations/helpers.test.ts b/web/packages/teleport/src/Integrations/helpers.test.ts
index 86668ee0d5fe9..a33c427e239e0 100644
--- a/web/packages/teleport/src/Integrations/helpers.test.ts
+++ b/web/packages/teleport/src/Integrations/helpers.test.ts
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { getStatus, getStatusAndLabel } from 'teleport/Integrations/helpers';
+import { IntegrationLike, Status } from 'teleport/Integrations/IntegrationList';
 import {
   Integration,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { getStatus, getStatusAndLabel } from 'teleport/Integrations/helpers';
-import { IntegrationLike, Status } from 'teleport/Integrations/IntegrationList';
 
 test.each`
   type                        | code                                       | expected
diff --git a/web/packages/teleport/src/Integrations/helpers.ts b/web/packages/teleport/src/Integrations/helpers.ts
index 87690be4a421f..af41402c69fd8 100644
--- a/web/packages/teleport/src/Integrations/helpers.ts
+++ b/web/packages/teleport/src/Integrations/helpers.ts
@@ -18,12 +18,12 @@
 
 import { LabelKind } from 'design/Label';
 
+import { IntegrationLike, Status } from 'teleport/Integrations/IntegrationList';
 import {
   getStatusCodeTitle,
   Integration,
   IntegrationStatusCode,
 } from 'teleport/services/integrations';
-import { IntegrationLike, Status } from 'teleport/Integrations/IntegrationList';
 
 export function getStatus(item: IntegrationLike): Status {
   if (item.resourceType === 'integration') {
diff --git a/web/packages/teleport/src/Integrations/shared/RoleArnInput.story.tsx b/web/packages/teleport/src/Integrations/shared/RoleArnInput.story.tsx
index 7807e8d14ad5c..efd6dbe9fa3af 100644
--- a/web/packages/teleport/src/Integrations/shared/RoleArnInput.story.tsx
+++ b/web/packages/teleport/src/Integrations/shared/RoleArnInput.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useState } from 'react';
+
 import { ButtonSecondary } from 'design/Button';
 import Validation from 'shared/components/Validation';
 
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.story.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.story.tsx
index ddaf1e6590ee9..0540665408f80 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.story.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.story.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from 'react';
-
 import { addHours } from 'date-fns';
+import React from 'react';
 
 import { AwsOidcDashboard } from 'teleport/Integrations/status/AwsOidc/AwsOidcDashboard';
 import { MockAwsOidcStatusProvider } from 'teleport/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider';
+import { AwsOidcStatusContextState } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
 import {
   IntegrationKind,
   ResourceTypeSummary,
 } from 'teleport/services/integrations';
-import { AwsOidcStatusContextState } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
 
 export default {
   title: 'Teleport/Integrations/AwsOidc',
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.test.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.test.tsx
index 76d89d80ce166..580625fdacc74 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.test.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.test.tsx
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { within } from '@testing-library/react';
 import React from 'react';
-import { render, screen } from 'design/utils/testing';
 
-import { within } from '@testing-library/react';
+import { render, screen } from 'design/utils/testing';
 
+import { addHours } from 'teleport/components/BannerList/useAlerts';
 import { AwsOidcDashboard } from 'teleport/Integrations/status/AwsOidc/AwsOidcDashboard';
 import { MockAwsOidcStatusProvider } from 'teleport/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider';
 import { IntegrationKind } from 'teleport/services/integrations';
-import { addHours } from 'teleport/components/BannerList/useAlerts';
 
 test('renders header and stats cards', () => {
   render(
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
index e755de5bc75f8..491c93d3b0858 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
@@ -19,16 +19,15 @@
 import React from 'react';
 
 import { Flex, H2, Indicator } from 'design';
-
 import { Danger } from 'design/Alert';
 
-import { AwsOidcHeader } from 'teleport/Integrations/status/AwsOidc/AwsOidcHeader';
-import { useAwsOidcStatus } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
 import { FeatureBox } from 'teleport/components/Layout';
+import { AwsOidcHeader } from 'teleport/Integrations/status/AwsOidc/AwsOidcHeader';
 import {
   AwsResource,
   StatCard,
 } from 'teleport/Integrations/status/AwsOidc/StatCard';
+import { useAwsOidcStatus } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
 
 export function AwsOidcDashboard() {
   const { statsAttempt, integrationAttempt } = useAwsOidcStatus();
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcRoutes.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcRoutes.tsx
index b218fc905706d..470c4bf32e482 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcRoutes.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcRoutes.tsx
@@ -20,7 +20,6 @@ import React from 'react';
 
 import { Route, Switch } from 'teleport/components/Router';
 import cfg from 'teleport/config';
-
 import { AwsOidcStatusProvider } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
 
 import { AwsOidcDashboard } from './AwsOidcDashboard';
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/StatCard.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/StatCard.tsx
index 395debb99ed0f..5a3a5173376d1 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/StatCard.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/StatCard.tsx
@@ -16,14 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { formatDistanceStrict } from 'date-fns';
 import React from 'react';
 
 import { Card, Flex, H2, Text } from 'design';
-import { ResourceIcon } from 'design/ResourceIcon';
-
 import * as Icons from 'design/Icon';
-
-import { formatDistanceStrict } from 'date-fns';
+import { ResourceIcon } from 'design/ResourceIcon';
 
 import { ResourceTypeSummary } from 'teleport/services/integrations';
 
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider.tsx
index 4d29af57d0422..0a513d3d0b57f 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/testHelpers/mockAwsOidcStatusProvider.tsx
@@ -17,14 +17,13 @@
  */
 
 import React from 'react';
-
 import { MemoryRouter } from 'react-router';
 
+import { ContextProvider } from 'teleport';
 import {
   awsOidcStatusContext,
   AwsOidcStatusContextState,
 } from 'teleport/Integrations/status/AwsOidc/useAwsOidcStatus';
-import { ContextProvider } from 'teleport';
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 export const MockAwsOidcStatusProvider = ({
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/useAwsOidcStatus.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/useAwsOidcStatus.tsx
index f517f785595d9..0ad4db4740bc9 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/useAwsOidcStatus.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/useAwsOidcStatus.tsx
@@ -18,6 +18,7 @@
 
 import React, { createContext, useContext, useEffect } from 'react';
 import { useParams } from 'react-router';
+
 import { Attempt, useAsync } from 'shared/hooks/useAsync';
 
 import {
@@ -26,7 +27,6 @@ import {
   integrationService,
   IntegrationWithSummary,
 } from 'teleport/services/integrations';
-
 import useTeleport from 'teleport/useTeleport';
 
 export interface AwsOidcStatusContextState {
diff --git a/web/packages/teleport/src/JoinTokens/JoinTokenForms.tsx b/web/packages/teleport/src/JoinTokens/JoinTokenForms.tsx
index ba1eba785f487..940a8a2509fcc 100644
--- a/web/packages/teleport/src/JoinTokens/JoinTokenForms.tsx
+++ b/web/packages/teleport/src/JoinTokens/JoinTokenForms.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, Text, ButtonIcon, ButtonText } from 'design';
+import { ButtonIcon, ButtonText, Flex, Text } from 'design';
 import { Plus, Trash } from 'design/Icon';
-import { requiredField } from 'shared/components/Validation/rules';
 import FieldInput from 'shared/components/FieldInput';
 import { FieldSelectCreatable } from 'shared/components/FieldSelect';
+import { requiredField } from 'shared/components/Validation/rules';
 
 import { NewJoinTokenState, OptionGCP, RuleBox } from './UpsertJoinTokenDialog';
 
diff --git a/web/packages/teleport/src/JoinTokens/JoinTokens.story.tsx b/web/packages/teleport/src/JoinTokens/JoinTokens.story.tsx
index a3132cb89a0a8..8e9ef4c8003d7 100644
--- a/web/packages/teleport/src/JoinTokens/JoinTokens.story.tsx
+++ b/web/packages/teleport/src/JoinTokens/JoinTokens.story.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter } from 'react-router';
 import { http, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
 import cfg from 'teleport/config';
-import { JoinToken } from 'teleport/services/joinToken';
 import { createTeleportContext } from 'teleport/mocks/contexts';
+import { JoinToken } from 'teleport/services/joinToken';
 
 import { JoinTokens } from './JoinTokens';
 
diff --git a/web/packages/teleport/src/JoinTokens/JoinTokens.test.tsx b/web/packages/teleport/src/JoinTokens/JoinTokens.test.tsx
index 8b0962faabd7d..d96383a850a40 100644
--- a/web/packages/teleport/src/JoinTokens/JoinTokens.test.tsx
+++ b/web/packages/teleport/src/JoinTokens/JoinTokens.test.tsx
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { render, screen, fireEvent } from 'design/utils/testing';
 import userEvent from '@testing-library/user-event';
-
 import selectEvent from 'react-select-event';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
+import { fireEvent, render, screen } from 'design/utils/testing';
+
 import { ContextProvider } from 'teleport';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import makeJoinToken from 'teleport/services/joinToken/makeJoinToken';
 
 import { JoinTokens } from './JoinTokens';
diff --git a/web/packages/teleport/src/JoinTokens/JoinTokens.tsx b/web/packages/teleport/src/JoinTokens/JoinTokens.tsx
index 1dbcc8b725ad2..909f2c885605d 100644
--- a/web/packages/teleport/src/JoinTokens/JoinTokens.tsx
+++ b/web/packages/teleport/src/JoinTokens/JoinTokens.tsx
@@ -16,46 +16,46 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import styled from 'styled-components';
+import { addHours, isAfter } from 'date-fns';
 import { useEffect, useState } from 'react';
-import { isAfter, addHours } from 'date-fns';
+import styled from 'styled-components';
+
 import {
+  Alert,
   Box,
-  Text,
+  Button,
+  ButtonSecondary,
+  ButtonWarning,
   Flex,
   Indicator,
   Label,
-  Alert,
   Link,
   MenuItem,
-  ButtonWarning,
-  ButtonSecondary,
-  Button,
+  Text,
 } from 'design';
 import Table, { Cell } from 'design/DataTable';
-import { Warning } from 'design/Icon';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from 'design/Dialog';
-import { MenuButton } from 'shared/components/MenuAction';
-import { Attempt, useAsync } from 'shared/hooks/useAsync';
+import { Warning } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
+import { MenuButton } from 'shared/components/MenuAction';
 import { CopyButton } from 'shared/components/UnifiedResources/shared/CopyButton';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
 
 import { useTeleport } from 'teleport';
-import useResources from 'teleport/components/useResources';
-
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import { JoinToken } from 'teleport/services/joinToken';
-import { Resource, KindJoinToken } from 'teleport/services/resources';
 import ResourceEditor from 'teleport/components/ResourceEditor';
+import useResources from 'teleport/components/useResources';
+import { JoinToken } from 'teleport/services/joinToken';
+import { KindJoinToken, Resource } from 'teleport/services/resources';
 
 import { UpsertJoinTokenDialog } from './UpsertJoinTokenDialog';
 
diff --git a/web/packages/teleport/src/JoinTokens/UpsertJoinTokenDialog.tsx b/web/packages/teleport/src/JoinTokens/UpsertJoinTokenDialog.tsx
index 357c6a3d59471..02a352d986550 100644
--- a/web/packages/teleport/src/JoinTokens/UpsertJoinTokenDialog.tsx
+++ b/web/packages/teleport/src/JoinTokens/UpsertJoinTokenDialog.tsx
@@ -17,25 +17,25 @@
  */
 
 import { useState } from 'react';
+import styled from 'styled-components';
 
 import {
-  Flex,
-  Text,
+  Alert,
   Box,
   ButtonIcon,
-  ButtonText,
   ButtonPrimary,
   ButtonSecondary,
-  Alert,
+  ButtonText,
+  Flex,
+  Text,
 } from 'design';
-import styled from 'styled-components';
-import { HoverTooltip } from 'design/Tooltip';
 import { Cross } from 'design/Icon';
-import Validation from 'shared/components/Validation';
+import { HoverTooltip } from 'design/Tooltip';
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import { FieldSelect } from 'shared/components/FieldSelect';
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
+import { requiredField } from 'shared/components/Validation/rules';
 import { useAsync } from 'shared/hooks/useAsync';
 
 import { useTeleport } from 'teleport';
diff --git a/web/packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.tsx b/web/packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.tsx
index 9cfd088343692..596a753fc2b7c 100644
--- a/web/packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.tsx
+++ b/web/packages/teleport/src/Kubes/ConnectDialog/ConnectDialog.tsx
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Box, ButtonPrimary, ButtonSecondary, Flex, H3, Text } from 'design';
 import Dialog, {
+  DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogContent,
 } from 'design/Dialog';
-import { Text, Box, ButtonSecondary, ButtonPrimary, Flex, H3 } from 'design';
 
-import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
-import { AuthType } from 'teleport/services/user';
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
 import cfg from 'teleport/config';
+import { generateTshLoginCommand, openNewTab } from 'teleport/lib/util';
+import { AuthType } from 'teleport/services/user';
 
 function ConnectDialog(props: Props) {
   const {
diff --git a/web/packages/teleport/src/Kubes/ConnectDialog/index.ts b/web/packages/teleport/src/Kubes/ConnectDialog/index.ts
index 36057e0d81bec..739fa3d5ba5a6 100644
--- a/web/packages/teleport/src/Kubes/ConnectDialog/index.ts
+++ b/web/packages/teleport/src/Kubes/ConnectDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ConnectDialog from './ConnectDialog';
+
 export default ConnectDialog;
diff --git a/web/packages/teleport/src/LocksV2/Locks/DeleteLockDialogue.tsx b/web/packages/teleport/src/LocksV2/Locks/DeleteLockDialogue.tsx
index 0b8c1990e19ac..9cb7fe4369559 100644
--- a/web/packages/teleport/src/LocksV2/Locks/DeleteLockDialogue.tsx
+++ b/web/packages/teleport/src/LocksV2/Locks/DeleteLockDialogue.tsx
@@ -18,13 +18,13 @@
 
 import { ButtonSecondary, ButtonWarning, P1 } from 'design';
 import { Danger } from 'design/Alert';
-import useAttempt from 'shared/hooks/useAttemptNext';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/DialogConfirmation';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { Lock } from 'teleport/services/locks';
 
diff --git a/web/packages/teleport/src/LocksV2/Locks/Locks.test.tsx b/web/packages/teleport/src/LocksV2/Locks/Locks.test.tsx
index 89af1b730ba6c..ea2fd3ec0770c 100644
--- a/web/packages/teleport/src/LocksV2/Locks/Locks.test.tsx
+++ b/web/packages/teleport/src/LocksV2/Locks/Locks.test.tsx
@@ -17,7 +17,8 @@
  */
 
 import { MemoryRouter } from 'react-router';
-import { render, fireEvent, screen } from 'design/utils/testing';
+
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
 import { createTeleportContext } from 'teleport/mocks/contexts';
diff --git a/web/packages/teleport/src/LocksV2/Locks/Locks.tsx b/web/packages/teleport/src/LocksV2/Locks/Locks.tsx
index 3e62f2015e021..f83d0ea6543ee 100644
--- a/web/packages/teleport/src/LocksV2/Locks/Locks.tsx
+++ b/web/packages/teleport/src/LocksV2/Locks/Locks.tsx
@@ -16,28 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Fragment, useState, useEffect } from 'react';
-import { useLocation, useHistory } from 'react-router';
 import { formatRelative } from 'date-fns';
-import { Danger } from 'design/Alert';
+import { Fragment, useEffect, useState } from 'react';
+import { useHistory, useLocation } from 'react-router';
 
-import Table, { Cell } from 'design/DataTable';
 import { Button, Label as Pill } from 'design';
+import { Danger } from 'design/Alert';
+import Table, { Cell } from 'design/DataTable';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import cfg from 'teleport/config';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
 import { NavLink } from 'teleport/components/Router';
+import cfg from 'teleport/config';
+import { Lock, lockService, LockTarget } from 'teleport/services/locks';
 import useTeleport from 'teleport/useTeleport';
 
-import { lockService, Lock, LockTarget } from 'teleport/services/locks';
-
 import { TrashButton } from '../common';
-
 import { DeleteLockDialogue } from './DeleteLockDialogue';
 
 export function Locks() {
diff --git a/web/packages/teleport/src/LocksV2/NewLock/LockCheckout/LockCheckout.tsx b/web/packages/teleport/src/LocksV2/NewLock/LockCheckout/LockCheckout.tsx
index 4f7a1b088c657..a2d3f6303b058 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/LockCheckout/LockCheckout.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/LockCheckout/LockCheckout.tsx
@@ -16,32 +16,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useRef, useEffect, forwardRef } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
+import type { TransitionStatus } from 'react-transition-group';
 import styled from 'styled-components';
+
 import {
+  Alert,
   Box,
-  Flex,
-  ButtonText,
   ButtonPrimary,
+  ButtonText,
+  Flex,
+  H2,
   Image,
-  Text,
-  Alert,
   Input,
-  H2,
   Subtitle2,
+  Text,
 } from 'design';
-import { ArrowBack } from 'design/Icon';
 import Table, { Cell } from 'design/DataTable';
+import { ArrowBack } from 'design/Icon';
 import useAttempt from 'shared/hooks/useAttemptNext';
-import { pluralize } from 'shared/utils/text';
-
 import { mergeRefs } from 'shared/libs/mergeRefs';
+import { pluralize } from 'shared/utils/text';
 
+import shieldCheck from 'teleport/assets/shield-check.png';
 import cfg from 'teleport/config';
-import { lockService } from 'teleport/services/locks';
 import { TrashButton } from 'teleport/LocksV2/common';
-import shieldCheck from 'teleport/assets/shield-check.png';
+import { lockService } from 'teleport/services/locks';
 
 import {
   LockResource,
@@ -50,8 +51,6 @@ import {
   ToggleSelectResourceFn,
 } from '../common';
 
-import type { TransitionStatus } from 'react-transition-group';
-
 type Props = {
   onClose(): void;
   selectedResources: LockResourceMap;
diff --git a/web/packages/teleport/src/LocksV2/NewLock/NewLock.tsx b/web/packages/teleport/src/LocksV2/NewLock/NewLock.tsx
index 02de78ad45d12..a89fc903c35ac 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/NewLock.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/NewLock.tsx
@@ -20,38 +20,39 @@ import { useRef, useState } from 'react';
 import { Prompt } from 'react-router';
 import { Link } from 'react-router-dom';
 import { Transition } from 'react-transition-group';
-import { Box, Flex, ButtonSecondary, Text, ButtonPrimary } from 'design';
+
+import { Box, ButtonPrimary, ButtonSecondary, Flex, Text } from 'design';
+import { ArrowBack } from 'design/Icon';
 import Select from 'shared/components/Select';
 import useAttempt from 'shared/hooks/useAttemptNext';
-import { ArrowBack } from 'design/Icon';
 
+import ErrorMessage from 'teleport/components/AgentErrorMessage';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import ErrorMessage from 'teleport/components/AgentErrorMessage';
 import cfg from 'teleport/config';
 
-import { LockCheckout } from './LockCheckout/LockCheckout';
 import {
-  SimpleList,
-  SimpleListOpts,
-} from './ResourceList/SimpleList/SimpleList';
-import { ServerSideSupportedList } from './ResourceList/ServerSideSupportedList/ServerSideSupportedList';
-import { Logins } from './ResourceList/Logins';
+  baseResourceKindOpts,
+  CommonListProps,
+  getEmptyResourceMap,
+  LockResource,
+  LockResourceMap,
+  LockResourceOption,
+} from './common';
+import { LockCheckout } from './LockCheckout/LockCheckout';
 import {
   HybridList,
   HybridListOpts,
 } from './ResourceList/HybridList/HybridList';
+import { Logins } from './ResourceList/Logins';
+import { ServerSideSupportedList } from './ResourceList/ServerSideSupportedList/ServerSideSupportedList';
 import {
-  CommonListProps,
-  LockResourceMap,
-  LockResourceOption,
-  getEmptyResourceMap,
-  baseResourceKindOpts,
-  LockResource,
-} from './common';
+  SimpleList,
+  SimpleListOpts,
+} from './ResourceList/SimpleList/SimpleList';
 
 const PAGE_SIZE = 10;
 
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/HybridList/HybridList.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/HybridList/HybridList.tsx
index 3becc4a34c714..899cf71945b0a 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/HybridList/HybridList.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/HybridList/HybridList.tsx
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
+
 import { FetchStatus } from 'design/DataTable/types';
 
 import { UrlResourcesParams } from 'teleport/config';
 
-import { TableWrapper, HybridListProps } from '../common';
 import { CommonListProps, LockResourceKind } from '../../common';
+import { HybridListProps, TableWrapper } from '../common';
 
 export type HybridListOpts = {
   getFetchFn(
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/Logins.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/Logins.tsx
index 7e54d1cd079b0..c5c2fbbf67afa 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/Logins.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/Logins.tsx
@@ -17,10 +17,11 @@
  */
 
 import React, { useState } from 'react';
-import Table from 'design/DataTable';
+
 import { Box, ButtonSecondary, Flex, Input, Text } from 'design';
+import Table from 'design/DataTable';
 
-import { renderActionCell, LoginsProps } from './common';
+import { LoginsProps, renderActionCell } from './common';
 
 export function Logins(props: LoginsProps) {
   const [loginInput, setLoginInput] = useState('');
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Desktops.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Desktops.tsx
index 14df805248c62..c27d9f6ec246e 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Desktops.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Desktops.tsx
@@ -20,7 +20,7 @@ import { ClickableLabelCell } from 'design/DataTable';
 
 import { Desktop } from 'teleport/services/desktops';
 
-import { ServerSideListProps, StyledTable, renderActionCell } from '../common';
+import { renderActionCell, ServerSideListProps, StyledTable } from '../common';
 
 export function Desktops(props: ServerSideListProps & { desktops: Desktop[] }) {
   const {
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Nodes.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Nodes.tsx
index a56826ac296b3..0cb4c9438058d 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Nodes.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/Nodes.tsx
@@ -20,7 +20,7 @@ import { Cell, ClickableLabelCell } from 'design/DataTable';
 
 import { Node } from 'teleport/services/nodes';
 
-import { ServerSideListProps, StyledTable, renderActionCell } from '../common';
+import { renderActionCell, ServerSideListProps, StyledTable } from '../common';
 
 export function Nodes(props: ServerSideListProps & { nodes: Node[] }) {
   const {
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/ServerSideSupportedList.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/ServerSideSupportedList.tsx
index f59a9d624bb5e..3042c8ea22c24 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/ServerSideSupportedList.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/ServerSideSupportedList/ServerSideSupportedList.tsx
@@ -16,38 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useMemo } from 'react';
-import { SortType } from 'design/DataTable/types';
+import { useEffect, useMemo, useState } from 'react';
+
 import { Flex } from 'design';
-import { StyledPanel } from 'design/DataTable/StyledTable';
-import { SearchPanel } from 'shared/components/Search';
 import { StyledArrowBtn } from 'design/DataTable/Pager/StyledPager';
+import { StyledPanel } from 'design/DataTable/StyledTable';
+import { SortType } from 'design/DataTable/types';
 import { CircleArrowLeft, CircleArrowRight } from 'design/Icon';
-
+import { SearchPanel } from 'shared/components/Search';
 import { makeAdvancedSearchQueryForLabel } from 'shared/utils/advancedSearchLabelQuery';
 
-import { Desktop } from 'teleport/services/desktops';
-import { Node } from 'teleport/services/nodes';
 import { useServerSidePagination } from 'teleport/components/hooks';
-import useTeleport from 'teleport/useTeleport';
 import cfg, { UrlResourcesParams } from 'teleport/config';
-import Ctx from 'teleport/teleportContext';
-
+import type {
+  ResourceFilter,
+  ResourceLabel,
+  ResourcesResponse,
+} from 'teleport/services/agents';
+import { Desktop } from 'teleport/services/desktops';
+import { Node } from 'teleport/services/nodes';
 import { RoleResource } from 'teleport/services/resources';
+import Ctx from 'teleport/teleportContext';
+import useTeleport from 'teleport/useTeleport';
 
-import { TableWrapper, ServerSideListProps } from '../common';
 import { CommonListProps, LockResourceKind } from '../../common';
-
-import { Nodes } from './Nodes';
+import { ServerSideListProps, TableWrapper } from '../common';
 import { Desktops } from './Desktops';
+import { Nodes } from './Nodes';
 import { Roles } from './Roles';
 
-import type {
-  ResourceLabel,
-  ResourceFilter,
-  ResourcesResponse,
-} from 'teleport/services/agents';
-
 export function ServerSideSupportedList(props: CommonListProps) {
   const ctx = useTeleport();
 
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/MfaDevices.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/MfaDevices.tsx
index fb6740b3fa006..6e82fbbca5c61 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/MfaDevices.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/MfaDevices.tsx
@@ -18,8 +18,8 @@
 
 import { Text } from 'design';
 import Table, { Cell } from 'design/DataTable';
-import { dateMatcher } from 'design/utils/match';
 import { displayDate } from 'design/datetime';
+import { dateMatcher } from 'design/utils/match';
 
 import { MfaDevice } from 'teleport/services/mfa/types';
 
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/SimpleList.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/SimpleList.tsx
index 3b4fe0586cd7a..c293c75e5c937 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/SimpleList.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/SimpleList/SimpleList.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
-import useTeleport from 'teleport/useTeleport';
-import { User } from 'teleport/services/user';
 import { MfaDevice } from 'teleport/services/mfa';
+import { User } from 'teleport/services/user';
+import useTeleport from 'teleport/useTeleport';
 
-import { TableWrapper, SimpleListProps } from '../common';
 import { CommonListProps, LockResourceKind } from '../../common';
-
-import Users from './Users';
+import { SimpleListProps, TableWrapper } from '../common';
 import { MfaDevices } from './MfaDevices';
+import Users from './Users';
 
 export type SimpleListOpts = {
   getFetchFn(
diff --git a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/common.tsx b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/common.tsx
index 8d01be29c95f2..f5482132a20a2 100644
--- a/web/packages/teleport/src/LocksV2/NewLock/ResourceList/common.tsx
+++ b/web/packages/teleport/src/LocksV2/NewLock/ResourceList/common.tsx
@@ -17,7 +17,8 @@
  */
 
 import styled from 'styled-components';
-import { Box, ButtonPrimary, ButtonBorder } from 'design';
+
+import { Box, ButtonBorder, ButtonPrimary } from 'design';
 import Table, { Cell } from 'design/DataTable';
 import {
   CustomSort,
diff --git a/web/packages/teleport/src/LocksV2/common.tsx b/web/packages/teleport/src/LocksV2/common.tsx
index 0eb436fbef9de..ece5d6e92ea66 100644
--- a/web/packages/teleport/src/LocksV2/common.tsx
+++ b/web/packages/teleport/src/LocksV2/common.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Trash } from 'design/Icon';
 
 export const TrashButton = styled(Trash)`
diff --git a/web/packages/teleport/src/Login/Login.story.tsx b/web/packages/teleport/src/Login/Login.story.tsx
index 45ae413e8bfd0..c578d9367c323 100644
--- a/web/packages/teleport/src/Login/Login.story.tsx
+++ b/web/packages/teleport/src/Login/Login.story.tsx
@@ -17,17 +17,15 @@
  */
 
 import { useEffect } from 'react';
-
 import { MemoryRouter } from 'react-router';
 
 import { Route } from 'teleport/components/Router';
-
 import cfg from 'teleport/config';
 
+import { LoginComponent as Login } from './Login';
+import { LoginFailedComponent as LoginFailed } from './LoginFailed';
 import { LoginSuccess } from './LoginSuccess';
 import { LoginTerminalRedirect } from './LoginTerminalRedirect';
-import { LoginFailedComponent as LoginFailed } from './LoginFailed';
-import { LoginComponent as Login } from './Login';
 import { State } from './useLogin';
 
 const defaultEdition = cfg.edition;
diff --git a/web/packages/teleport/src/Login/Login.test.tsx b/web/packages/teleport/src/Login/Login.test.tsx
index 619b317df8e67..c728d3689ed35 100644
--- a/web/packages/teleport/src/Login/Login.test.tsx
+++ b/web/packages/teleport/src/Login/Login.test.tsx
@@ -18,12 +18,13 @@
 
 import { userEvent, UserEvent } from '@testing-library/user-event';
 import selectEvent from 'react-select-event';
-import { render, fireEvent, screen, waitFor } from 'design/utils/testing';
 
+import { fireEvent, render, screen, waitFor } from 'design/utils/testing';
+
+import cfg from 'teleport/config';
 import auth from 'teleport/services/auth/auth';
 import history from 'teleport/services/history';
 import session from 'teleport/services/websession';
-import cfg from 'teleport/config';
 
 import { Login } from './Login';
 
diff --git a/web/packages/teleport/src/Login/Login.tsx b/web/packages/teleport/src/Login/Login.tsx
index 173e707bbba05..12e401f024b8e 100644
--- a/web/packages/teleport/src/Login/Login.tsx
+++ b/web/packages/teleport/src/Login/Login.tsx
@@ -19,16 +19,15 @@
 import { useState } from 'react';
 import styled from 'styled-components';
 
-import { Box, Text, Link, Flex, ButtonPrimary, H1 } from 'design';
-
+import { Box, ButtonPrimary, Flex, H1, Link, Text } from 'design';
 import { FieldCheckbox } from 'shared/components/FieldCheckbox';
 
 import FormLogin from 'teleport/components/FormLogin';
 import { LogoHero } from 'teleport/components/LogoHero';
 import cfg from 'teleport/config';
 
-import useLogin, { State } from './useLogin';
 import Motd from './Motd';
+import useLogin, { State } from './useLogin';
 
 export function Login() {
   const state = useLogin();
diff --git a/web/packages/teleport/src/Login/LoginClose.tsx b/web/packages/teleport/src/Login/LoginClose.tsx
index 0272b220cce02..13167ea304b98 100644
--- a/web/packages/teleport/src/Login/LoginClose.tsx
+++ b/web/packages/teleport/src/Login/LoginClose.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useEffect } from 'react';
+
 import { Card } from 'design';
 
 export function LoginClose() {
diff --git a/web/packages/teleport/src/Login/LoginFailed.tsx b/web/packages/teleport/src/Login/LoginFailed.tsx
index 219ef8df85085..3cff3a221fd13 100644
--- a/web/packages/teleport/src/Login/LoginFailed.tsx
+++ b/web/packages/teleport/src/Login/LoginFailed.tsx
@@ -18,8 +18,8 @@
 
 import { LoginFailed as CardFailed } from 'design/CardError';
 
-import { Route, Switch } from 'teleport/components/Router';
 import { LogoHero } from 'teleport/components/LogoHero';
+import { Route, Switch } from 'teleport/components/Router';
 import cfg from 'teleport/config';
 
 export function LoginFailed() {
diff --git a/web/packages/teleport/src/Login/Motd/Motd.tsx b/web/packages/teleport/src/Login/Motd/Motd.tsx
index 7bf17d63b38fd..353c40885603c 100644
--- a/web/packages/teleport/src/Login/Motd/Motd.tsx
+++ b/web/packages/teleport/src/Login/Motd/Motd.tsx
@@ -18,7 +18,7 @@
 
 import styled from 'styled-components';
 
-import { Card, Box, Text, ButtonPrimary } from 'design';
+import { Box, ButtonPrimary, Card, Text } from 'design';
 
 export function Motd({ message, onClick }: Props) {
   return (
diff --git a/web/packages/teleport/src/Login/useLogin.ts b/web/packages/teleport/src/Login/useLogin.ts
index f9e3012c3a858..43b67e1ef9ff7 100644
--- a/web/packages/teleport/src/Login/useLogin.ts
+++ b/web/packages/teleport/src/Login/useLogin.ts
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { matchPath } from 'react-router';
+
+import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 import { useAttempt } from 'shared/hooks';
 import { AuthProvider } from 'shared/services';
-import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 
-import session from 'teleport/services/websession';
-import history from 'teleport/services/history';
 import cfg from 'teleport/config';
 import auth, { UserCredentials } from 'teleport/services/auth';
+import history from 'teleport/services/history';
 import { storageService } from 'teleport/services/storageService';
+import session from 'teleport/services/websession';
 
 export default function useLogin() {
   const [attempt, attemptActions] = useAttempt({ isProcessing: false });
diff --git a/web/packages/teleport/src/Login/uselogin.test.tsx b/web/packages/teleport/src/Login/uselogin.test.tsx
index 24487d5528910..798c63c043abd 100644
--- a/web/packages/teleport/src/Login/uselogin.test.tsx
+++ b/web/packages/teleport/src/Login/uselogin.test.tsx
@@ -18,9 +18,9 @@
 
 import { renderHook } from '@testing-library/react';
 
+import cfg from 'teleport/config';
 import history from 'teleport/services/history';
 import session from 'teleport/services/websession';
-import cfg from 'teleport/config';
 
 import useLogin from './useLogin';
 
diff --git a/web/packages/teleport/src/Main/LayoutContext.tsx b/web/packages/teleport/src/Main/LayoutContext.tsx
index 49a8bf48c7017..7af9aeec0fc21 100644
--- a/web/packages/teleport/src/Main/LayoutContext.tsx
+++ b/web/packages/teleport/src/Main/LayoutContext.tsx
@@ -20,9 +20,9 @@ import {
   createContext,
   PropsWithChildren,
   useContext,
-  useState,
   useEffect,
   useRef,
+  useState,
 } from 'react';
 
 interface LayoutContextValue {
diff --git a/web/packages/teleport/src/Main/Main.test.tsx b/web/packages/teleport/src/Main/Main.test.tsx
index 3ac982e32fc2e..b19970fd6ae54 100644
--- a/web/packages/teleport/src/Main/Main.test.tsx
+++ b/web/packages/teleport/src/Main/Main.test.tsx
@@ -17,23 +17,24 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import { render, screen } from 'design/utils/testing';
 
-import { getOSSFeatures } from 'teleport/features';
 import { Context, ContextProvider } from 'teleport';
+import { apps } from 'teleport/Apps/fixtures';
 import { events } from 'teleport/Audit/fixtures';
 import { clusters } from 'teleport/Clusters/fixtures';
-import { nodes } from 'teleport/Nodes/fixtures';
-import { sessions } from 'teleport/Sessions/fixtures';
-import { apps } from 'teleport/Apps/fixtures';
-import { kubes } from 'teleport/Kubes/fixtures';
 import { databases } from 'teleport/Databases/fixtures';
 import { desktops } from 'teleport/Desktops/fixtures';
+import { getOSSFeatures } from 'teleport/features';
+import { kubes } from 'teleport/Kubes/fixtures';
 import { userContext } from 'teleport/Main/fixtures';
 import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
-import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
-import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
+import { nodes } from 'teleport/Nodes/fixtures';
+import { sessions } from 'teleport/Sessions/fixtures';
 import TeleportContext from 'teleport/teleportContext';
+import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
+import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
 
 import { Main, MainProps } from './Main';
 
diff --git a/web/packages/teleport/src/Main/Main.tsx b/web/packages/teleport/src/Main/Main.tsx
index 8bdf8943a67f7..4f2ed3f4f3449 100644
--- a/web/packages/teleport/src/Main/Main.tsx
+++ b/web/packages/teleport/src/Main/Main.tsx
@@ -26,44 +26,40 @@ import React, {
   useMemo,
   useState,
 } from 'react';
+import { matchPath, useHistory } from 'react-router';
 import styled from 'styled-components';
+
 import { Box, Flex, Indicator } from 'design';
 import { Failed } from 'design/CardError';
-
-import useAttempt from 'shared/hooks/useAttemptNext';
-
-import { matchPath, useHistory } from 'react-router';
-
 import Dialog from 'design/Dialog';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
-import { Redirect, Route, Switch } from 'teleport/components/Router';
+import { BannerList } from 'teleport/components/BannerList';
+import type { BannerType } from 'teleport/components/BannerList/BannerList';
+import { useAlerts } from 'teleport/components/BannerList/useAlerts';
 import { CatchError } from 'teleport/components/CatchError';
+import { Redirect, Route, Switch } from 'teleport/components/Router';
 import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
-import { TopBar } from 'teleport/TopBar';
-import { TopBar as TopBarSideNav } from 'teleport/TopBar/TopBarSideNav';
-import { BannerList } from 'teleport/components/BannerList';
-import { storageService } from 'teleport/services/storageService';
+import { FeaturesContextProvider, useFeatures } from 'teleport/FeaturesContext';
+import { Navigation } from 'teleport/Navigation';
+import { Navigation as SideNavigation } from 'teleport/Navigation/SideNavigation/Navigation';
 import {
   ClusterAlert,
-  LINK_TEXT_LABEL,
   LINK_DESTINATION_LABEL,
+  LINK_TEXT_LABEL,
 } from 'teleport/services/alerts/alerts';
-import { useAlerts } from 'teleport/components/BannerList/useAlerts';
-import { FeaturesContextProvider, useFeatures } from 'teleport/FeaturesContext';
-
-import { Navigation as SideNavigation } from 'teleport/Navigation/SideNavigation/Navigation';
-import { Navigation } from 'teleport/Navigation';
+import { storageService } from 'teleport/services/storageService';
+import { TopBar } from 'teleport/TopBar';
 import { TopBarProps } from 'teleport/TopBar/TopBar';
+import { TopBar as TopBarSideNav } from 'teleport/TopBar/TopBarSideNav';
+import type { LockedFeatures, TeleportFeature } from 'teleport/types';
 import { useUser } from 'teleport/User/UserContext';
+import useTeleport from 'teleport/useTeleport';
 import { QuestionnaireProps } from 'teleport/Welcome/NewCredentials';
 
 import { MainContainer } from './MainContainer';
 import { OnboardDiscover } from './OnboardDiscover';
 
-import type { BannerType } from 'teleport/components/BannerList/BannerList';
-import type { LockedFeatures, TeleportFeature } from 'teleport/types';
-
 export interface MainProps {
   initialAlerts?: ClusterAlert[];
   customBanners?: ReactNode[];
diff --git a/web/packages/teleport/src/Main/OnboardDiscover/OnboardDiscover.tsx b/web/packages/teleport/src/Main/OnboardDiscover/OnboardDiscover.tsx
index 476173c3cc530..0e7d9e2d0046d 100644
--- a/web/packages/teleport/src/Main/OnboardDiscover/OnboardDiscover.tsx
+++ b/web/packages/teleport/src/Main/OnboardDiscover/OnboardDiscover.tsx
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonPrimary, ButtonText, Image, Text } from 'design';
+import { ButtonPrimary, ButtonText, H2, Image, Text } from 'design';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
 } from 'design/Dialog';
 
-import { H2 } from 'design';
-
-import { CaptureEvent } from 'teleport/services/userEvent/types';
 import { userEventService } from 'teleport/services/userEvent';
+import { CaptureEvent } from 'teleport/services/userEvent/types';
 
 import resourcesPng from './resources.png';
 
diff --git a/web/packages/teleport/src/Navigation/Navigation.tsx b/web/packages/teleport/src/Navigation/Navigation.tsx
index 8e8085c6eaf85..5db8655cb2da4 100644
--- a/web/packages/teleport/src/Navigation/Navigation.tsx
+++ b/web/packages/teleport/src/Navigation/Navigation.tsx
@@ -16,22 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type * as history from 'history';
+import { matchPath, useHistory, useLocation } from 'react-router';
 import styled, { useTheme } from 'styled-components';
-import { matchPath, useLocation, useHistory } from 'react-router';
-import { Box, Text, Flex } from 'design';
 
+import { Box, Flex, Text } from 'design';
 import { IconTooltip } from 'design/Tooltip';
 
 import cfg from 'teleport/config';
+import { useFeatures } from 'teleport/FeaturesContext';
 import {
   NAVIGATION_CATEGORIES,
   NavigationCategory,
 } from 'teleport/Navigation/categories';
-import { useFeatures } from 'teleport/FeaturesContext';
 import { NavigationCategoryContainer } from 'teleport/Navigation/NavigationCategoryContainer';
-
-import type * as history from 'history';
-
 import type { TeleportFeature } from 'teleport/types';
 
 const NavigationContainer = styled.div`
diff --git a/web/packages/teleport/src/Navigation/NavigationCategoryContainer.tsx b/web/packages/teleport/src/Navigation/NavigationCategoryContainer.tsx
index a0321a3e68168..e8c66e055b497 100644
--- a/web/packages/teleport/src/Navigation/NavigationCategoryContainer.tsx
+++ b/web/packages/teleport/src/Navigation/NavigationCategoryContainer.tsx
@@ -18,14 +18,14 @@
 
 import styled from 'styled-components';
 
+import { useFeatures } from 'teleport/FeaturesContext';
 import {
   MANAGEMENT_NAVIGATION_SECTIONS,
   NavigationCategory,
 } from 'teleport/Navigation/categories';
-import { useFeatures } from 'teleport/FeaturesContext';
+import { NavigationItemSize } from 'teleport/Navigation/common';
 import { NavigationItem } from 'teleport/Navigation/NavigationItem';
 import { NavigationSection } from 'teleport/Navigation/NavigationSection';
-import { NavigationItemSize } from 'teleport/Navigation/common';
 
 interface NavigationCategoryProps {
   category: NavigationCategory;
diff --git a/web/packages/teleport/src/Navigation/NavigationDropdown.tsx b/web/packages/teleport/src/Navigation/NavigationDropdown.tsx
index ff71f33503d15..1fc7aab8df544 100644
--- a/web/packages/teleport/src/Navigation/NavigationDropdown.tsx
+++ b/web/packages/teleport/src/Navigation/NavigationDropdown.tsx
@@ -16,27 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { Location } from 'history';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import { NavLink } from 'react-router-dom';
-
 import { matchPath, useHistory } from 'react-router';
+import { NavLink } from 'react-router-dom';
+import styled from 'styled-components';
 
 import { ChevronRight } from 'design/Icon';
 
+import { useTeleport } from 'teleport';
+import { useFeatures } from 'teleport/FeaturesContext';
 import {
   commonNavigationItemStyles,
   LinkContent,
   NavigationItemSize,
 } from 'teleport/Navigation/common';
-import { useFeatures } from 'teleport/FeaturesContext';
 import { getIcon } from 'teleport/Navigation/utils';
-
-import { useTeleport } from 'teleport';
-
-import type { Location } from 'history';
-
 import type { TeleportFeature } from 'teleport/types';
 
 interface NavigationDropdownProps {
diff --git a/web/packages/teleport/src/Navigation/NavigationItem.test.tsx b/web/packages/teleport/src/Navigation/NavigationItem.test.tsx
index a8d4e4b26f3f7..9cb96204fec45 100644
--- a/web/packages/teleport/src/Navigation/NavigationItem.test.tsx
+++ b/web/packages/teleport/src/Navigation/NavigationItem.test.tsx
@@ -16,25 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
-
-import { Server } from 'design/Icon';
-
-import { generatePath, Router } from 'react-router';
-
-import { createMemoryHistory, MemoryHistory } from 'history';
-
 import { act } from '@testing-library/react';
+import { createMemoryHistory, MemoryHistory } from 'history';
+import { generatePath, Router } from 'react-router';
 
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import TeleportContext from 'teleport/teleportContext';
+import { Server } from 'design/Icon';
+import { render, screen } from 'design/utils/testing';
 
-import { TeleportFeature, NavTitle } from 'teleport/types';
 import { NavigationCategory } from 'teleport/Navigation/categories';
-import { NavigationItem } from 'teleport/Navigation/NavigationItem';
 import { NavigationItemSize } from 'teleport/Navigation/common';
-import { makeUserContext } from 'teleport/services/user';
+import { NavigationItem } from 'teleport/Navigation/NavigationItem';
 import { LocalNotificationKind } from 'teleport/services/notifications';
+import { makeUserContext } from 'teleport/services/user';
+import TeleportContext from 'teleport/teleportContext';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
+import { NavTitle, TeleportFeature } from 'teleport/types';
 
 class MockUserFeature implements TeleportFeature {
   category = NavigationCategory.Resources;
diff --git a/web/packages/teleport/src/Navigation/NavigationItem.tsx b/web/packages/teleport/src/Navigation/NavigationItem.tsx
index 0267441c28703..68873f4b54162 100644
--- a/web/packages/teleport/src/Navigation/NavigationItem.tsx
+++ b/web/packages/teleport/src/Navigation/NavigationItem.tsx
@@ -17,30 +17,28 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import styled, { css, keyframes } from 'styled-components';
-
 import { NavLink, useLocation } from 'react-router-dom';
+import styled, { css, keyframes } from 'styled-components';
 
 import { ArrowSquareOut } from 'design/Icon';
 
-import { getIcon } from 'teleport/Navigation/utils';
-import { NavigationDropdown } from 'teleport/Navigation/NavigationDropdown';
+import { useTeleport } from 'teleport';
 import {
   commonNavigationItemStyles,
   LinkContent,
   NavigationItemSize,
 } from 'teleport/Navigation/common';
-import useStickyClusterId from 'teleport/useStickyClusterId';
-import { storageService } from 'teleport/services/storageService';
+import { NavigationDropdown } from 'teleport/Navigation/NavigationDropdown';
+import { getIcon } from 'teleport/Navigation/utils';
 import { LocalNotificationKind } from 'teleport/services/notifications';
-import { useTeleport } from 'teleport';
-
-import { NavTitle, RecommendationStatus } from 'teleport/types';
-
-import type {
-  TeleportFeature,
-  TeleportFeatureNavigationItem,
+import { storageService } from 'teleport/services/storageService';
+import {
+  NavTitle,
+  RecommendationStatus,
+  type TeleportFeature,
+  type TeleportFeatureNavigationItem,
 } from 'teleport/types';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 interface NavigationItemProps {
   feature: TeleportFeature;
diff --git a/web/packages/teleport/src/Navigation/NavigationSection.tsx b/web/packages/teleport/src/Navigation/NavigationSection.tsx
index 73849244da17f..670e80f643095 100644
--- a/web/packages/teleport/src/Navigation/NavigationSection.tsx
+++ b/web/packages/teleport/src/Navigation/NavigationSection.tsx
@@ -18,9 +18,8 @@
 
 import styled from 'styled-components';
 
-import { NavigationItem } from 'teleport/Navigation/NavigationItem';
 import { NavigationItemSize } from 'teleport/Navigation/common';
-
+import { NavigationItem } from 'teleport/Navigation/NavigationItem';
 import type { TeleportFeature } from 'teleport/types';
 
 interface NavigationSectionProps {
diff --git a/web/packages/teleport/src/Navigation/RecentHistory.tsx b/web/packages/teleport/src/Navigation/RecentHistory.tsx
index 8b3941135cfa7..9037e98322202 100644
--- a/web/packages/teleport/src/Navigation/RecentHistory.tsx
+++ b/web/packages/teleport/src/Navigation/RecentHistory.tsx
@@ -16,18 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useRef } from 'react';
-import styled from 'styled-components';
+import { useEffect, useRef, useState } from 'react';
 import { matchPath } from 'react-router';
 import { NavLink } from 'react-router-dom';
-import { Flex, Text, H4, P3, ButtonIcon } from 'design';
+import styled from 'styled-components';
+
+import { ButtonIcon, Flex, H4, P3, Text } from 'design';
 import { Cross } from 'design/Icon';
 
-import { TeleportFeature } from 'teleport/types';
 import { useFeatures } from 'teleport/FeaturesContext';
+import { TeleportFeature } from 'teleport/types';
 
-import { getSubsectionStyles } from './SideNavigation/Section';
 import { SidenavCategory } from './SideNavigation/categories';
+import { getSubsectionStyles } from './SideNavigation/Section';
 
 export type RecentHistoryItem = {
   category?: SidenavCategory;
diff --git a/web/packages/teleport/src/Navigation/SideNavigation/Navigation.tsx b/web/packages/teleport/src/Navigation/SideNavigation/Navigation.tsx
index 74817bd51e66d..763cd6b2490cf 100644
--- a/web/packages/teleport/src/Navigation/SideNavigation/Navigation.tsx
+++ b/web/packages/teleport/src/Navigation/SideNavigation/Navigation.tsx
@@ -16,38 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type * as history from 'history';
 import React, {
-  useState,
   useCallback,
   useEffect,
-  useRef,
   useMemo,
+  useRef,
+  useState,
 } from 'react';
-import styled from 'styled-components';
 import { matchPath, useHistory } from 'react-router';
-import { Flex, Box } from 'design';
+import styled from 'styled-components';
 
+import { Box, Flex } from 'design';
 import { SideNavDrawerMode } from 'gen-proto-ts/teleport/userpreferences/v1/sidenav_preferences_pb';
 
 import cfg from 'teleport/config';
-
 import { useFeatures } from 'teleport/FeaturesContext';
-import useStickyClusterId from 'teleport/useStickyClusterId';
+import type { TeleportFeature } from 'teleport/types';
 import { useUser } from 'teleport/User/UserContext';
-
-import { DefaultSection, rightPanelWidth } from './Section';
-import { zIndexMap } from './zIndexMap';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import {
   CustomNavigationSubcategory,
   NAVIGATION_CATEGORIES,
   SidenavCategory,
 } from './categories';
-import { SearchSection } from './Search';
 import { getResourcesSection, ResourcesSection } from './ResourcesSection';
-
-import type * as history from 'history';
-import type { TeleportFeature } from 'teleport/types';
+import { SearchSection } from './Search';
+import { DefaultSection, rightPanelWidth } from './Section';
+import { zIndexMap } from './zIndexMap';
 
 const SideNavContainer = styled(Flex).attrs({
   gap: 2,
diff --git a/web/packages/teleport/src/Navigation/SideNavigation/ResourcesSection.tsx b/web/packages/teleport/src/Navigation/SideNavigation/ResourcesSection.tsx
index f1d2859098439..33b9dd11f04f6 100644
--- a/web/packages/teleport/src/Navigation/SideNavigation/ResourcesSection.tsx
+++ b/web/packages/teleport/src/Navigation/SideNavigation/ResourcesSection.tsx
@@ -16,31 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import styled from 'styled-components';
 import { matchPath } from 'react-router';
+import styled from 'styled-components';
 
 import { Box, Flex, Text } from 'design';
 import * as Icons from 'design/Icon';
-
 import { DefaultTab } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
-import cfg from 'teleport/config';
-import useStickyClusterId from 'teleport/useStickyClusterId';
 import { encodeUrlQueryParams } from 'teleport/components/hooks/useUrlFiltering';
 import { EncodeUrlQueryParamsProps } from 'teleport/components/hooks/useUrlFiltering/encodeUrlQueryParams';
+import cfg from 'teleport/config';
 import { ResourceIdKind } from 'teleport/services/agents';
 import { useUser } from 'teleport/User/UserContext';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
-import { NavigationSubsection, NavigationSection } from './Navigation';
+import { CustomNavigationSubcategory, NavigationCategory } from './categories';
+import { NavigationSection, NavigationSubsection } from './Navigation';
 import {
   CustomChildrenSection,
   RightPanel,
-  verticalPadding,
-  SubsectionItem,
   RightPanelHeader,
+  SubsectionItem,
+  verticalPadding,
 } from './Section';
-import { CustomNavigationSubcategory, NavigationCategory } from './categories';
 
 /**
  * getResourcesSection returns a NavigationSection for resources,
diff --git a/web/packages/teleport/src/Navigation/SideNavigation/Search.tsx b/web/packages/teleport/src/Navigation/SideNavigation/Search.tsx
index 567e727af771d..78d4f677f8c63 100644
--- a/web/packages/teleport/src/Navigation/SideNavigation/Search.tsx
+++ b/web/packages/teleport/src/Navigation/SideNavigation/Search.tsx
@@ -16,25 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { NavLink } from 'react-router-dom';
 import styled from 'styled-components';
 
 import { Box, Flex, P3, Text } from 'design';
-import { height, space, color } from 'design/system';
+import { color, height, space } from 'design/system';
 
 import { storageService } from 'teleport/services/storageService';
 
 import { RecentHistory, RecentHistoryItem } from '../RecentHistory';
-
+import { CustomNavigationCategory } from './categories';
 import { NavigationSection, NavigationSubsection } from './Navigation';
 import {
   CustomChildrenSection,
-  RightPanel,
   getSubsectionStyles,
+  RightPanel,
   RightPanelHeader,
 } from './Section';
-import { CustomNavigationCategory } from './categories';
 
 export function SearchSection({
   navigationSections,
diff --git a/web/packages/teleport/src/Navigation/SideNavigation/Section.tsx b/web/packages/teleport/src/Navigation/SideNavigation/Section.tsx
index 35a74b3af8378..b1143fbc95efd 100644
--- a/web/packages/teleport/src/Navigation/SideNavigation/Section.tsx
+++ b/web/packages/teleport/src/Navigation/SideNavigation/Section.tsx
@@ -21,15 +21,15 @@ import { NavLink } from 'react-router-dom';
 import styled, { css, useTheme } from 'styled-components';
 
 import { Box, ButtonIcon, Flex, P2, Text } from 'design';
-import { Theme } from 'design/theme';
 import { ArrowLineLeft } from 'design/Icon';
+import { Theme } from 'design/theme';
 import { HoverTooltip, IconTooltip } from 'design/Tooltip';
 
 import cfg from 'teleport/config';
 
+import { CategoryIcon } from './CategoryIcon';
 import { NavigationSection, NavigationSubsection } from './Navigation';
 import { zIndexMap } from './zIndexMap';
-import { CategoryIcon } from './CategoryIcon';
 
 type SharedSectionProps = {
   section: NavigationSection;
diff --git a/web/packages/teleport/src/Navigation/utils.tsx b/web/packages/teleport/src/Navigation/utils.tsx
index 14b745d311e8b..f5c9643b125a2 100644
--- a/web/packages/teleport/src/Navigation/utils.tsx
+++ b/web/packages/teleport/src/Navigation/utils.tsx
@@ -21,7 +21,6 @@ import {
   NavigationItemSize,
   SmallIcon,
 } from 'teleport/Navigation/common';
-
 import type { TeleportFeature } from 'teleport/types';
 
 export function getIcon(feature: TeleportFeature, size: NavigationItemSize) {
diff --git a/web/packages/teleport/src/Notifications/Notification.story.tsx b/web/packages/teleport/src/Notifications/Notification.story.tsx
index 012472b3a9579..31dad46776ca3 100644
--- a/web/packages/teleport/src/Notifications/Notification.story.tsx
+++ b/web/packages/teleport/src/Notifications/Notification.story.tsx
@@ -16,25 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { subDays, subHours, subMinutes, subSeconds } from 'date-fns';
+import { delay, http, HttpResponse } from 'msw';
 import { MemoryRouter } from 'react-router';
-import { subSeconds, subMinutes, subHours, subDays } from 'date-fns';
-import { http, HttpResponse, delay } from 'msw';
 import { withoutQuery } from 'web/packages/build/storybook';
 
 import { Flex, H2 } from 'design';
 
+import cfg from 'teleport/config';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import {
   NotificationSubKind,
   UpsertNotificationStateRequest,
 } from 'teleport/services/notifications';
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import cfg from 'teleport/config';
 
 import { ContextProvider } from '..';
-
+import { notifications as mockNotifications } from './fixtures';
 import { Notification } from './Notification';
 import { Notifications as NotificationsListComponent } from './Notifications';
-import { notifications as mockNotifications } from './fixtures';
 
 const notificationsPathWithoutQuery = withoutQuery(cfg.api.notificationsPath);
 
diff --git a/web/packages/teleport/src/Notifications/Notification.tsx b/web/packages/teleport/src/Notifications/Notification.tsx
index 45f0d9ad38149..4f8717fd78720 100644
--- a/web/packages/teleport/src/Notifications/Notification.tsx
+++ b/web/packages/teleport/src/Notifications/Notification.tsx
@@ -16,37 +16,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { formatDistanceToNowStrict } from 'date-fns';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { formatDistanceToNowStrict } from 'date-fns';
 
-import * as Icons from 'design/Icon';
-
-import Text, { P3 } from 'design/Text';
 import { ButtonSecondary } from 'design/Button';
-
-import { MenuIcon, MenuItem } from 'shared/components/MenuAction';
-import { IGNORE_CLICK_CLASSNAME } from 'shared/hooks/useRefClickOutside/useRefClickOutside';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from 'design/Dialog';
+import * as Icons from 'design/Icon';
+import Text, { P3 } from 'design/Text';
 import { Theme } from 'design/theme/themes/types';
-
+import { MenuIcon, MenuItem } from 'shared/components/MenuAction';
 import { useAsync } from 'shared/hooks/useAsync';
+import { IGNORE_CLICK_CLASSNAME } from 'shared/hooks/useRefClickOutside/useRefClickOutside';
 
+import history from 'teleport/services/history';
 import {
-  Notification as NotificationType,
   NotificationState,
+  Notification as NotificationType,
 } from 'teleport/services/notifications';
-import history from 'teleport/services/history';
-
 import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import { useTeleport } from '..';
-
 import { NotificationContent } from './notificationContentFactory';
 import { View } from './Notifications';
 
diff --git a/web/packages/teleport/src/Notifications/Notifications.test.tsx b/web/packages/teleport/src/Notifications/Notifications.test.tsx
index 4b2ed2157e050..5d2afd737173a 100644
--- a/web/packages/teleport/src/Notifications/Notifications.test.tsx
+++ b/web/packages/teleport/src/Notifications/Notifications.test.tsx
@@ -19,16 +19,16 @@
 import { subMinutes, subSeconds } from 'date-fns';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
-import { render, screen } from 'design/utils/testing';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
+import { render, screen } from 'design/utils/testing';
 
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 import { getOSSFeatures } from 'teleport/features';
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import TeleportContext from 'teleport/teleportContext';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import { NotificationSubKind } from 'teleport/services/notifications';
+import TeleportContext from 'teleport/teleportContext';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
 import { Notifications } from './Notifications';
 
diff --git a/web/packages/teleport/src/Notifications/Notifications.tsx b/web/packages/teleport/src/Notifications/Notifications.tsx
index b64d1460e8041..f81df41610cd6 100644
--- a/web/packages/teleport/src/Notifications/Notifications.tsx
+++ b/web/packages/teleport/src/Notifications/Notifications.tsx
@@ -16,40 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useMemo, useEffect, useCallback } from 'react';
-import { isBefore, isAfter, formatDistanceToNowStrict } from 'date-fns';
+import { formatDistanceToNowStrict, isAfter, isBefore } from 'date-fns';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { Alert, Box, Flex, Indicator, Text } from 'design';
 
-import { Notification as NotificationIcon, BellRinging } from 'design/Icon';
-import Logger from 'shared/libs/logger';
-import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
+import { Alert, Box, Flex, Indicator, Text } from 'design';
+import { BellRinging, Notification as NotificationIcon } from 'design/Icon';
 import { HoverTooltip } from 'design/Tooltip';
-
 import {
   useInfiniteScroll,
   useKeyBasedPagination,
 } from 'shared/hooks/useInfiniteScroll';
+import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
 import { IGNORE_CLICK_CLASSNAME } from 'shared/hooks/useRefClickOutside/useRefClickOutside';
-
+import Logger from 'shared/libs/logger';
 import { useStore } from 'shared/libs/stores';
 
 import { useTeleport } from 'teleport';
-import useStickyClusterId from 'teleport/useStickyClusterId';
 import { Dropdown } from 'teleport/components/Dropdown';
-
-import { ButtonIconContainer } from 'teleport/TopBar/Shared';
-
 import {
   LocalNotificationGroupedKind,
   LocalNotificationKind,
   Notification as NotificationType,
 } from 'teleport/services/notifications';
-
 import {
   Notification as AccessListNotification,
   LocalNotificationStates,
 } from 'teleport/stores/storeNotifications';
+import { ButtonIconContainer } from 'teleport/TopBar/Shared';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import { Notification } from './Notification';
 
diff --git a/web/packages/teleport/src/Notifications/fixtures.ts b/web/packages/teleport/src/Notifications/fixtures.ts
index f64483f4bc086..798230906a402 100644
--- a/web/packages/teleport/src/Notifications/fixtures.ts
+++ b/web/packages/teleport/src/Notifications/fixtures.ts
@@ -16,10 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { subSeconds, subMinutes, subHours, subMonths } from 'date-fns';
+import { subHours, subMinutes, subMonths, subSeconds } from 'date-fns';
 
-import { NotificationSubKind } from 'teleport/services/notifications';
-import { Notification } from 'teleport/services/notifications';
+import {
+  Notification,
+  NotificationSubKind,
+} from 'teleport/services/notifications';
 
 export const notifications: Notification[] = [
   {
diff --git a/web/packages/teleport/src/Notifications/notificationContentFactory.tsx b/web/packages/teleport/src/Notifications/notificationContentFactory.tsx
index 6b453357acd90..1cbcf04235641 100644
--- a/web/packages/teleport/src/Notifications/notificationContentFactory.tsx
+++ b/web/packages/teleport/src/Notifications/notificationContentFactory.tsx
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React from 'react';
+
 import * as Icons from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
-import React from 'react';
 
 import {
-  Notification as NotificationType,
   NotificationSubKind,
+  Notification as NotificationType,
 } from 'teleport/services/notifications';
 import { Label } from 'teleport/types';
 
diff --git a/web/packages/teleport/src/Player/ActionBar/ActionBar.tsx b/web/packages/teleport/src/Player/ActionBar/ActionBar.tsx
index 0776791f30a86..c5c915cc9e6d0 100644
--- a/web/packages/teleport/src/Player/ActionBar/ActionBar.tsx
+++ b/web/packages/teleport/src/Player/ActionBar/ActionBar.tsx
@@ -17,9 +17,10 @@
  */
 
 import { NavLink } from 'react-router-dom';
-import { Flex, ButtonPrimary } from 'design';
-import { MenuIcon, MenuItem, MenuItemIcon } from 'shared/components/MenuAction';
+
+import { ButtonPrimary, Flex } from 'design';
 import * as Icons from 'design/Icon';
+import { MenuIcon, MenuItem, MenuItemIcon } from 'shared/components/MenuAction';
 
 import cfg from 'teleport/config';
 
diff --git a/web/packages/teleport/src/Player/ActionBar/index.ts b/web/packages/teleport/src/Player/ActionBar/index.ts
index 68780db3589b9..9d87648f34b85 100644
--- a/web/packages/teleport/src/Player/ActionBar/index.ts
+++ b/web/packages/teleport/src/Player/ActionBar/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ActionBar from './ActionBar';
+
 export default ActionBar;
diff --git a/web/packages/teleport/src/Player/DesktopPlayer.tsx b/web/packages/teleport/src/Player/DesktopPlayer.tsx
index 5d164929d6766..b26db1f8a1242 100644
--- a/web/packages/teleport/src/Player/DesktopPlayer.tsx
+++ b/web/packages/teleport/src/Player/DesktopPlayer.tsx
@@ -16,21 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useMemo, useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { Indicator, Box, Alert, Flex } from 'design';
 
+import { Alert, Box, Flex, Indicator } from 'design';
+
+import TdpClientCanvas from 'teleport/components/TdpClientCanvas';
 import cfg from 'teleport/config';
-import { StatusEnum, formatDisplayTime } from 'teleport/lib/player';
+import { formatDisplayTime, StatusEnum } from 'teleport/lib/player';
 import { PlayerClient, TdpClient } from 'teleport/lib/tdp';
+import type { BitmapFrame } from 'teleport/lib/tdp/client';
+import type { ClientScreenSpec, PngFrame } from 'teleport/lib/tdp/codec';
 import { getHostName } from 'teleport/services/api';
-import TdpClientCanvas from 'teleport/components/TdpClientCanvas';
 
 import ProgressBar from './ProgressBar';
 
-import type { PngFrame, ClientScreenSpec } from 'teleport/lib/tdp/codec';
-import type { BitmapFrame } from 'teleport/lib/tdp/client';
-
 const reload = () => window.location.reload();
 const handleContextMenu = () => true;
 const PROGRESS_BAR_ID = 'progressBarDesktop';
diff --git a/web/packages/teleport/src/Player/Player.story.tsx b/web/packages/teleport/src/Player/Player.story.tsx
index b1871fb9aba14..a9dd35b112b5e 100644
--- a/web/packages/teleport/src/Player/Player.story.tsx
+++ b/web/packages/teleport/src/Player/Player.story.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex } from 'design';
-
 import { createMemoryHistory } from 'history';
 
-import { Router, Route } from 'teleport/components/Router';
+import { Flex } from 'design';
+
+import { Route, Router } from 'teleport/components/Router';
 
 import { Player } from './Player';
 
diff --git a/web/packages/teleport/src/Player/Player.tsx b/web/packages/teleport/src/Player/Player.tsx
index 7d26a785d1830..608abef2d33cf 100644
--- a/web/packages/teleport/src/Player/Player.tsx
+++ b/web/packages/teleport/src/Player/Player.tsx
@@ -19,23 +19,21 @@
 import { useCallback, useEffect } from 'react';
 import styled from 'styled-components';
 
-import { Flex, Box, Indicator } from 'design';
+import { Box, Flex, Indicator } from 'design';
 import { Danger } from 'design/Alert';
-
 import { makeSuccessAttempt, useAsync } from 'shared/hooks/useAsync';
 
-import { useParams, useLocation } from 'teleport/components/Router';
-import session from 'teleport/services/websession';
+import { useLocation, useParams } from 'teleport/components/Router';
 import { UrlPlayerParams } from 'teleport/config';
 import { getUrlParameter } from 'teleport/services/history';
 import { RecordingType } from 'teleport/services/recordings';
-
+import session from 'teleport/services/websession';
 import useTeleport from 'teleport/useTeleport';
 
 import ActionBar from './ActionBar';
 import { DesktopPlayer } from './DesktopPlayer';
-import SshPlayer from './SshPlayer';
 import Tabs, { TabItem } from './PlayerTabs';
+import SshPlayer from './SshPlayer';
 
 const validRecordingTypes = ['ssh', 'k8s', 'desktop', 'database'];
 
diff --git a/web/packages/teleport/src/Player/PlayerTabs/PlayerTabs.tsx b/web/packages/teleport/src/Player/PlayerTabs/PlayerTabs.tsx
index 8c590415ec2ba..c7fe1ffcf655b 100644
--- a/web/packages/teleport/src/Player/PlayerTabs/PlayerTabs.tsx
+++ b/web/packages/teleport/src/Player/PlayerTabs/PlayerTabs.tsx
@@ -17,8 +17,9 @@
  */
 
 import styled from 'styled-components';
+
+import { Box, Flex } from 'design';
 import { typography } from 'design/system';
-import { Flex, Box } from 'design';
 
 const Tabs = props => {
   return (
diff --git a/web/packages/teleport/src/Player/PlayerTabs/index.ts b/web/packages/teleport/src/Player/PlayerTabs/index.ts
index 6032eb2aae681..a19c1efcd57d7 100644
--- a/web/packages/teleport/src/Player/PlayerTabs/index.ts
+++ b/web/packages/teleport/src/Player/PlayerTabs/index.ts
@@ -17,6 +17,7 @@
  */
 
 import Tabs, { TabItem } from './PlayerTabs';
+
 export { TabItem };
 
 export default Tabs;
diff --git a/web/packages/teleport/src/Player/ProgressBar/Slider/Slider.jsx b/web/packages/teleport/src/Player/ProgressBar/Slider/Slider.jsx
index 89b896e52fe47..31cbe4f2b5d67 100644
--- a/web/packages/teleport/src/Player/ProgressBar/Slider/Slider.jsx
+++ b/web/packages/teleport/src/Player/ProgressBar/Slider/Slider.jsx
@@ -23,9 +23,9 @@ THE SOFTWARE.
 
 */
 
-import { Children, createElement } from 'react';
-import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
+import PropTypes from 'prop-types';
+import { Children, createElement } from 'react';
 
 /**
  * To prevent text selection while dragging.
diff --git a/web/packages/teleport/src/Player/ProgressBar/Slider/index.js b/web/packages/teleport/src/Player/ProgressBar/Slider/index.js
index ff665088461dc..3e04f8db1478a 100644
--- a/web/packages/teleport/src/Player/ProgressBar/Slider/index.js
+++ b/web/packages/teleport/src/Player/ProgressBar/Slider/index.js
@@ -17,4 +17,5 @@
  */
 
 import Slider from './Slider';
+
 export default Slider;
diff --git a/web/packages/teleport/src/Player/SshPlayer.tsx b/web/packages/teleport/src/Player/SshPlayer.tsx
index 5b833924558d3..9163890118e77 100644
--- a/web/packages/teleport/src/Player/SshPlayer.tsx
+++ b/web/packages/teleport/src/Player/SshPlayer.tsx
@@ -16,14 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useMemo, useEffect } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { Indicator, Flex, Box } from 'design';
+
+import { Box, Flex, Indicator } from 'design';
 import { Danger } from 'design/Alert';
 
 import cfg from 'teleport/config';
-import TtyPlayer from 'teleport/lib/term/ttyPlayer';
 import { formatDisplayTime, StatusEnum } from 'teleport/lib/player';
+import TtyPlayer from 'teleport/lib/term/ttyPlayer';
 import { getAccessToken, getHostName } from 'teleport/services/api';
 
 import ProgressBar from './ProgressBar';
diff --git a/web/packages/teleport/src/Player/Xterm/Xterm.tsx b/web/packages/teleport/src/Player/Xterm/Xterm.tsx
index 8e5404b40562c..407fc3c65e08e 100644
--- a/web/packages/teleport/src/Player/Xterm/Xterm.tsx
+++ b/web/packages/teleport/src/Player/Xterm/Xterm.tsx
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useCallback, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import styled, { useTheme } from 'styled-components';
 
 import { getPlatformType } from 'design/platform';
-import styled, { useTheme } from 'styled-components';
 import { TerminalSearch } from 'shared/components/TerminalSearch';
 
+import StyledXterm from 'teleport/Console/StyledXterm';
+import { TermEvent } from 'teleport/lib/term/enums';
 import Terminal from 'teleport/lib/term/terminal';
 import Tty from 'teleport/lib/term/tty';
-import { TermEvent } from 'teleport/lib/term/enums';
-import StyledXterm from 'teleport/Console/StyledXterm';
 
 export default function Xterm({ tty }: { tty: Tty }) {
   const refContainer = useRef<HTMLDivElement>();
diff --git a/web/packages/teleport/src/Recordings/Recordings.story.tsx b/web/packages/teleport/src/Recordings/Recordings.story.tsx
index d801bdc7399f2..135342f7aa2e0 100644
--- a/web/packages/teleport/src/Recordings/Recordings.story.tsx
+++ b/web/packages/teleport/src/Recordings/Recordings.story.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Router } from 'react-router';
 
 import { Context, ContextProvider } from 'teleport';
-
 import { makeRecording } from 'teleport/services/recordings/makeRecording';
 
 import { RecordingsContainer as Recordings } from './Recordings';
diff --git a/web/packages/teleport/src/Recordings/Recordings.tsx b/web/packages/teleport/src/Recordings/Recordings.tsx
index bf3d08a8a98fa..38e6c70d71873 100644
--- a/web/packages/teleport/src/Recordings/Recordings.tsx
+++ b/web/packages/teleport/src/Recordings/Recordings.tsx
@@ -18,10 +18,11 @@
 
 import { useState } from 'react';
 
+import { Box, Indicator } from 'design';
 import { Danger } from 'design/Alert';
-import { Indicator, Box } from 'design';
 import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
 
+import { ExternalAuditStorageCta } from '@gravitational/teleport/src/components/ExternalAuditStorageCta';
 import RangePicker from 'teleport/components/EventRangePicker';
 import {
   FeatureBox,
@@ -30,10 +31,7 @@ import {
 } from 'teleport/components/Layout';
 import useTeleport from 'teleport/useTeleport';
 
-import { ExternalAuditStorageCta } from '@gravitational/teleport/src/components/ExternalAuditStorageCta';
-
 import RecordingsList from './RecordingsList';
-
 import useRecordings, { State } from './useRecordings';
 
 export function RecordingsContainer() {
diff --git a/web/packages/teleport/src/Recordings/RecordingsList.tsx b/web/packages/teleport/src/Recordings/RecordingsList.tsx
index f0615ffacdae9..2950ffb3bf977 100644
--- a/web/packages/teleport/src/Recordings/RecordingsList.tsx
+++ b/web/packages/teleport/src/Recordings/RecordingsList.tsx
@@ -18,9 +18,8 @@
 
 import { ButtonPrimary } from 'design';
 import Table, { Cell, TextCell } from 'design/DataTable';
-import { dateTimeMatcher } from 'design/utils/match';
-
 import * as Icons from 'design/Icon';
+import { dateTimeMatcher } from 'design/utils/match';
 
 import cfg from 'teleport/config';
 import { Recording, RecordingType } from 'teleport/services/recordings';
diff --git a/web/packages/teleport/src/Recordings/useRecordings.ts b/web/packages/teleport/src/Recordings/useRecordings.ts
index 687781e88bf3f..46e49ca63bb60 100644
--- a/web/packages/teleport/src/Recordings/useRecordings.ts
+++ b/web/packages/teleport/src/Recordings/useRecordings.ts
@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
-import Ctx from 'teleport/teleportContext';
-import useStickyClusterId from 'teleport/useStickyClusterId';
 import {
-  getRangeOptions,
   EventRange,
+  getRangeOptions,
 } from 'teleport/components/EventRangePicker';
 import { Recording } from 'teleport/services/recordings';
+import Ctx from 'teleport/teleportContext';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 export default function useRecordings(ctx: Ctx) {
   const { clusterId } = useStickyClusterId();
diff --git a/web/packages/teleport/src/Roles/DeleteRole/DeleteRole.tsx b/web/packages/teleport/src/Roles/DeleteRole/DeleteRole.tsx
index c6fb6637c3545..fcc20a730396a 100644
--- a/web/packages/teleport/src/Roles/DeleteRole/DeleteRole.tsx
+++ b/web/packages/teleport/src/Roles/DeleteRole/DeleteRole.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonSecondary, ButtonWarning, Text, Alert, P1 } from 'design';
+import { Alert, ButtonSecondary, ButtonWarning, P1, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/DialogConfirmation';
 import useAttempt from 'shared/hooks/useAttemptNext';
 
diff --git a/web/packages/teleport/src/Roles/DeleteRole/index.ts b/web/packages/teleport/src/Roles/DeleteRole/index.ts
index 083b4807949fb..56d6a40423a05 100644
--- a/web/packages/teleport/src/Roles/DeleteRole/index.ts
+++ b/web/packages/teleport/src/Roles/DeleteRole/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DeleteRole from './DeleteRole';
+
 export default DeleteRole;
diff --git a/web/packages/teleport/src/Roles/RoleEditor/EditorHeader.tsx b/web/packages/teleport/src/Roles/RoleEditor/EditorHeader.tsx
index 16c85c844df4a..0738e74523943 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/EditorHeader.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/EditorHeader.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, H2, Indicator, Box, ButtonIcon } from 'design';
+import { Box, ButtonIcon, Flex, H2, Indicator } from 'design';
 import { Cross } from 'design/Icon';
 
 import { Role } from 'teleport/services/resources';
diff --git a/web/packages/teleport/src/Roles/RoleEditor/EditorTabs.tsx b/web/packages/teleport/src/Roles/RoleEditor/EditorTabs.tsx
index a39fddea3e085..0ca7e2dc4e6fd 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/EditorTabs.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/EditorTabs.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { SlideTabs } from 'design/SlideTabs';
 import * as Icon from 'design/Icon';
+import { SlideTabs } from 'design/SlideTabs';
 
 export enum EditorTab {
   Standard,
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
index 9fc5ba22f78ce..c85c6449eb4b3 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.story.tsx
@@ -16,23 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState } from 'react';
 import { StoryObj } from '@storybook/react';
 import { delay, http, HttpResponse } from 'msw';
+import { useEffect, useState } from 'react';
+
 import { Info } from 'design/Alert';
-import Flex from 'design/Flex';
 import { ButtonPrimary } from 'design/Button';
+import Flex from 'design/Flex';
 
-import { createTeleportContext } from 'teleport/mocks/contexts';
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
+import useResources from 'teleport/components/useResources';
 import cfg from 'teleport/config';
-import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 import { Access } from 'teleport/services/user';
-import useResources from 'teleport/components/useResources';
+import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
-import { withDefaults } from './StandardEditor/withDefaults';
 import { RoleEditor } from './RoleEditor';
 import { RoleEditorDialog } from './RoleEditorDialog';
+import { withDefaults } from './StandardEditor/withDefaults';
 
 const defaultIsPolicyEnabled = cfg.isPolicyEnabled;
 
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
index aeec6288e2431..2b1787df44ed9 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.test.tsx
@@ -16,19 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import { within } from '@testing-library/react';
 import { UserEvent } from '@testing-library/user-event';
 
-import { Role } from 'teleport/services/resources';
+import { render, screen, userEvent } from 'design/utils/testing';
+
 import { createTeleportContext } from 'teleport/mocks/contexts';
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
+import { Role } from 'teleport/services/resources';
+import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 import { yamlService } from 'teleport/services/yaml';
 import {
   YamlStringifyRequest,
   YamlSupportedResourceKind,
 } from 'teleport/services/yaml/types';
-import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
 import { RoleEditor, RoleEditorProps } from './RoleEditor';
 import { defaultOptions, withDefaults } from './StandardEditor/withDefaults';
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
index 2eeb3dc9cc9ad..596edbb06c332 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
@@ -16,28 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Alert, Box, Flex } from 'design';
 import { useId, useState } from 'react';
-import { useAsync } from 'shared/hooks/useAsync';
 
+import { Alert, Box, Flex } from 'design';
 import Validation, { Validator } from 'shared/components/Validation';
+import { useAsync } from 'shared/hooks/useAsync';
 
 import { Role, RoleWithYaml } from 'teleport/services/resources';
+import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 import { yamlService } from 'teleport/services/yaml';
 import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
-import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 
+import { EditorHeader } from './EditorHeader';
+import { EditorTab } from './EditorTabs';
+import { StandardEditor } from './StandardEditor/StandardEditor';
 import {
-  roleEditorModelToRole,
   newRole,
+  roleEditorModelToRole,
+  roleToRoleEditorModel,
   StandardEditorModel,
-  roleToRoleEditorModel as roleToRoleEditorModel,
 } from './StandardEditor/standardmodel';
-import { YamlEditorModel } from './yamlmodel';
-import { EditorTab } from './EditorTabs';
-import { EditorHeader } from './EditorHeader';
-import { StandardEditor } from './StandardEditor/StandardEditor';
 import { YamlEditor } from './YamlEditor';
+import { YamlEditorModel } from './yamlmodel';
 
 export type RoleEditorProps = {
   /**
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditorAdapter.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditorAdapter.tsx
index 3f03f3d269f19..7cf5eab849620 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditorAdapter.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditorAdapter.tsx
@@ -16,29 +16,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Danger } from 'design/Alert';
-import Flex from 'design/Flex';
-import { Indicator } from 'design/Indicator';
 import React, { useEffect } from 'react';
-import { useAsync } from 'shared/hooks/useAsync';
 import { useTheme } from 'styled-components';
-import { H1 } from 'design/Text';
+
+import { Danger } from 'design/Alert';
 import Box from 'design/Box';
-import { H3, P, P3 } from 'design/Text/Text';
 import { ButtonSecondary } from 'design/Button';
+import Flex from 'design/Flex';
+import { ChevronLeft, ChevronRight } from 'design/Icon';
 import Image from 'design/Image';
-
+import { Indicator } from 'design/Indicator';
 import { StepComponentProps, StepSlider } from 'design/StepSlider';
+import { H1 } from 'design/Text';
+import { H3, P, P3 } from 'design/Text/Text';
+import { useAsync } from 'shared/hooks/useAsync';
 
-import { ChevronLeft, ChevronRight } from 'design/Icon';
-
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import { State as ResourcesState } from 'teleport/components/useResources';
+import cfg from 'teleport/config';
 import { Role, RoleWithYaml } from 'teleport/services/resources';
 import { yamlService } from 'teleport/services/yaml';
 import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
-
-import cfg from 'teleport/config';
 
 import { RoleEditor } from './RoleEditor';
 import tagpromo from './tagpromo.png';
diff --git a/web/packages/teleport/src/Roles/RoleEditor/RoleEditorDialog.tsx b/web/packages/teleport/src/Roles/RoleEditor/RoleEditorDialog.tsx
index 74216fcbaeabe..d4d61217e3c98 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/RoleEditorDialog.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/RoleEditorDialog.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Dialog from 'design/Dialog';
 import { forwardRef, useRef } from 'react';
 import { Transition, TransitionStatus } from 'react-transition-group';
 import { css } from 'styled-components';
 
+import Dialog from 'design/Dialog';
+
 import { State as ResourcesState } from 'teleport/components/useResources';
 import { RoleWithYaml } from 'teleport/services/resources';
 
diff --git a/web/packages/teleport/src/Roles/RoleEditor/Shared.tsx b/web/packages/teleport/src/Roles/RoleEditor/Shared.tsx
index 8948d3b627c88..cee440e390b6c 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/Shared.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/Shared.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { useTheme } from 'styled-components';
+
 import { Box, ButtonPrimary, ButtonSecondary, Flex } from 'design';
 import { HoverTooltip } from 'design/Tooltip';
-import { useTheme } from 'styled-components';
 
 import useTeleport from 'teleport/useTeleport';
 
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.test.tsx
index e6d898fd0e8b2..b943938c68cd5 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.test.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.test.tsx
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import { act } from '@testing-library/react';
-import { Validator } from 'shared/components/Validation';
 import selectEvent from 'react-select-event';
 
+import { render, screen, userEvent } from 'design/utils/testing';
+import { Validator } from 'shared/components/Validation';
+
 import { ResourceKind } from 'teleport/services/resources';
 
-import { RuleModel } from './standardmodel';
-import { AccessRuleValidationResult, validateAccessRule } from './validation';
 import { AccessRules } from './AccessRules';
+import { RuleModel } from './standardmodel';
 import { StatefulSection } from './StatefulSection';
+import { AccessRuleValidationResult, validateAccessRule } from './validation';
 
 describe('AccessRules', () => {
   const setup = () => {
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.tsx
index dc42ed12bd12a..eeacafce05d0d 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/AccessRules.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Flex from 'design/Flex';
+import { components, MultiValueProps } from 'react-select';
+import styled from 'styled-components';
 
 import { ButtonSecondary } from 'design/Button';
+import Flex from 'design/Flex';
 import { Plus } from 'design/Icon';
+import { HoverTooltip } from 'design/Tooltip';
 import {
   FieldSelect,
   FieldSelectCreatable,
 } from 'shared/components/FieldSelect';
 import { precomputed } from 'shared/components/Validation/rules';
-import { components, MultiValueProps } from 'react-select';
-import { HoverTooltip } from 'design/Tooltip';
-import styled from 'styled-components';
 
-import { AccessRuleValidationResult } from './validation';
+import { SectionBox, SectionProps } from './sections';
 import {
   newRuleModel,
   ResourceKindOption,
@@ -38,7 +38,7 @@ import {
   RuleModel,
   verbOptions,
 } from './standardmodel';
-import { SectionBox, SectionProps } from './sections';
+import { AccessRuleValidationResult } from './validation';
 
 export function AccessRules({
   value,
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/MetadataSection.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/MetadataSection.tsx
index 40a199bad0cb9..eed7048b54a1c 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/MetadataSection.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/MetadataSection.tsx
@@ -16,12 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Text from 'design/Text';
 import FieldInput from 'shared/components/FieldInput';
-
 import { precomputed } from 'shared/components/Validation/rules';
 
-import Text from 'design/Text';
-
 import { LabelsInput } from 'teleport/components/LabelsInput';
 
 import { SectionBox, SectionProps } from './sections';
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Options.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Options.tsx
index cf510a5050aad..0cd0fc61b1f16 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Options.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Options.tsx
@@ -16,23 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { useId } from 'react';
+import styled, { useTheme } from 'styled-components';
+
 import Box from 'design/Box';
 import Input from 'design/Input';
 import LabelInput from 'design/LabelInput';
 import { RadioGroup } from 'design/RadioGroup';
 import { H4 } from 'design/Text';
-import { useId } from 'react';
-import styled, { useTheme } from 'styled-components';
-
 import Select from 'shared/components/Select';
 
 import { SectionProps } from './sections';
 import {
+  createDBUserModeOptions,
+  createHostUserModeOptions,
   OptionsModel,
   requireMFATypeOptions,
   sessionRecordingModeOptions,
-  createHostUserModeOptions,
-  createDBUserModeOptions,
 } from './standardmodel';
 
 export function Options({
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx
index 67780c3e4ecbc..d09c6fee1a668 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/RequiresResetToStandard.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Info } from 'design/Alert/Alert';
 import { Text } from 'design';
+import { Info } from 'design/Alert/Alert';
 
 export const RequiresResetToStandard = () => (
   <Info>
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.test.tsx
index a866d881b040b..2c57c2c7efc47 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.test.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.test.tsx
@@ -16,31 +16,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
 import { act, within } from '@testing-library/react';
-import { Validator } from 'shared/components/Validation';
 import selectEvent from 'react-select-event';
 
+import { render, screen, userEvent } from 'design/utils/testing';
+import { Validator } from 'shared/components/Validation';
+
+import {
+  AppAccessSection,
+  DatabaseAccessSection,
+  KubernetesAccessSection,
+  ServerAccessSection,
+  WindowsDesktopAccessSection,
+} from './Resources';
 import {
-  ServerAccess,
-  newResourceAccess,
-  KubernetesAccess,
   AppAccess,
   DatabaseAccess,
+  KubernetesAccess,
+  newResourceAccess,
+  ServerAccess,
   WindowsDesktopAccess,
 } from './standardmodel';
+import { StatefulSection } from './StatefulSection';
 import {
   ResourceAccessValidationResult,
   validateResourceAccess,
 } from './validation';
-import {
-  ServerAccessSection,
-  KubernetesAccessSection,
-  AppAccessSection,
-  DatabaseAccessSection,
-  WindowsDesktopAccessSection,
-} from './Resources';
-import { StatefulSection } from './StatefulSection';
 
 describe('ServerAccessSection', () => {
   const setup = () => {
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.tsx
index 65f1281e64baa..84b077c090a16 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/Resources.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import styled, { useTheme } from 'styled-components';
+
 import Box from 'design/Box';
 import { ButtonSecondary } from 'design/Button';
 import ButtonIcon from 'design/ButtonIcon';
@@ -29,31 +31,30 @@ import FieldSelect, {
   FieldSelectCreatable,
 } from 'shared/components/FieldSelect';
 import { precomputed } from 'shared/components/Validation/rules';
-import styled, { useTheme } from 'styled-components';
 
 import { LabelsInput } from 'teleport/components/LabelsInput';
 
-import { SectionProps, SectionBox } from './sections';
+import { SectionBox, SectionProps } from './sections';
 import {
-  ResourceAccessKind,
-  ResourceAccess,
-  ServerAccess,
+  AppAccess,
+  DatabaseAccess,
   KubernetesAccess,
-  newKubernetesResourceModel,
-  KubernetesResourceModel,
   kubernetesResourceKindOptions,
+  KubernetesResourceModel,
   kubernetesVerbOptions,
-  AppAccess,
-  DatabaseAccess,
+  newKubernetesResourceModel,
+  ResourceAccess,
+  ResourceAccessKind,
+  ServerAccess,
   WindowsDesktopAccess,
 } from './standardmodel';
 import {
-  ResourceAccessValidationResult,
-  ServerAccessValidationResult,
-  KubernetesAccessValidationResult,
-  KubernetesResourceValidationResult,
   AppAccessValidationResult,
   DatabaseAccessValidationResult,
+  KubernetesAccessValidationResult,
+  KubernetesResourceValidationResult,
+  ResourceAccessValidationResult,
+  ServerAccessValidationResult,
   WindowsDesktopAccessValidationResult,
 } from './validation';
 
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx
index 44d360ddeaf34..6732dd604225d 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.test.tsx
@@ -16,20 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, userEvent } from 'design/utils/testing';
-import { useState } from 'react';
 import { within } from '@testing-library/react';
+import { useState } from 'react';
+
+import { render, screen, userEvent } from 'design/utils/testing';
 import Validation from 'shared/components/Validation';
 
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
 import { createTeleportContext } from 'teleport/mocks/contexts';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
+import { StandardEditor, StandardEditorProps } from './StandardEditor';
 import {
   newRole,
   roleToRoleEditorModel,
   StandardEditorModel,
 } from './standardmodel';
-import { StandardEditor, StandardEditorProps } from './StandardEditor';
 
 const TestStandardEditor = (props: Partial<StandardEditorProps>) => {
   const ctx = createTeleportContext();
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
index d70c88f52e983..86f9a86103cb4 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/StandardEditor.tsx
@@ -17,34 +17,34 @@
  */
 
 import { useId, useState } from 'react';
+import styled from 'styled-components';
+
 import { Box, Flex } from 'design';
-import { useValidation } from 'shared/components/Validation';
 import * as Icon from 'design/Icon';
-import styled from 'styled-components';
-import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 import { SlideTabs } from 'design/SlideTabs';
+import { MenuButton, MenuItem } from 'shared/components/MenuAction';
+import { useValidation } from 'shared/components/Validation';
 
 import { Role, RoleWithYaml } from 'teleport/services/resources';
 
 import { EditorSaveCancelButton } from '../Shared';
-
+import { AccessRules } from './AccessRules';
+import { MetadataSection } from './MetadataSection';
+import { Options } from './Options';
+import { RequiresResetToStandard } from './RequiresResetToStandard';
+import { ResourceAccessSection, resourceAccessSections } from './Resources';
 import {
-  roleEditorModelToRole,
   hasModifiedFields,
-  RoleEditorModel,
-  StandardEditorModel,
-  ResourceAccessKind,
-  ResourceAccess,
   newResourceAccess,
-  RuleModel,
   OptionsModel,
+  ResourceAccess,
+  ResourceAccessKind,
+  RoleEditorModel,
+  roleEditorModelToRole,
+  RuleModel,
+  StandardEditorModel,
 } from './standardmodel';
 import { validateRoleEditorModel } from './validation';
-import { RequiresResetToStandard } from './RequiresResetToStandard';
-import { MetadataSection } from './MetadataSection';
-import { ResourceAccessSection, resourceAccessSections } from './Resources';
-import { AccessRules } from './AccessRules';
-import { Options } from './Options';
 
 export type StandardEditorProps = {
   originalRole: RoleWithYaml;
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/sections.tsx b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/sections.tsx
index 2af2808516f6c..d99d8dd5fde26 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/sections.tsx
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/sections.tsx
@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { useState } from 'react';
+import { useTheme } from 'styled-components';
+
 import Box from 'design/Box';
 import ButtonIcon from 'design/ButtonIcon';
 import Flex from 'design/Flex';
 import { Minus, Plus, Trash } from 'design/Icon';
 import { H3 } from 'design/Text';
-import { IconTooltip, HoverTooltip } from 'design/Tooltip';
-import { useState } from 'react';
+import { HoverTooltip, IconTooltip } from 'design/Tooltip';
 import { useValidation } from 'shared/components/Validation';
 import { ValidationResult } from 'shared/components/Validation/rules';
-import { useTheme } from 'styled-components';
 
 export type SectionProps<Model, ValidationResult> = {
   value: Model;
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts
index 14ab1fbdc19b5..572f9b2595f0c 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.test.ts
@@ -16,10 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Label as UILabel } from 'teleport/components/LabelsInput/LabelsInput';
 import {
   CreateDBUserMode,
   CreateHostUserMode,
   KubernetesResource,
+  Labels,
   RequireMFAType,
   ResourceKind,
   Role,
@@ -27,10 +29,6 @@ import {
   SessionRecordingMode,
 } from 'teleport/services/resources';
 
-import { Label as UILabel } from 'teleport/components/LabelsInput/LabelsInput';
-
-import { Labels } from 'teleport/services/resources';
-
 import {
   KubernetesAccess,
   labelsModelToLabels,
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts
index 64d3296e0e1a0..d941faac3435c 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/standardmodel.ts
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { equalsDeep } from 'shared/utils/highbar';
 import { Option } from 'shared/components/Select';
+import { equalsDeep } from 'shared/utils/highbar';
 
+import { Label as UILabel } from 'teleport/components/LabelsInput/LabelsInput';
 import {
   KubernetesResource,
   Labels,
   Role,
   RoleConditions,
 } from 'teleport/services/resources';
-import { Label as UILabel } from 'teleport/components/LabelsInput/LabelsInput';
 import {
   CreateDBUserMode,
   CreateHostUserMode,
diff --git a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts
index d90414360ca4f..2e4d5865ecd95 100644
--- a/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts
+++ b/web/packages/teleport/src/Roles/RoleEditor/StandardEditor/validation.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Option } from 'shared/components/Select';
 import {
   arrayOf,
   requiredField,
@@ -24,16 +25,13 @@ import {
   ValidationResult,
 } from 'shared/components/Validation/rules';
 
-import { Option } from 'shared/components/Select';
-
-import { KubernetesResourceKind } from 'teleport/services/resources';
-
 import { nonEmptyLabels } from 'teleport/components/LabelsInput/LabelsInput';
+import { KubernetesResourceKind } from 'teleport/services/resources';
 
 import {
-  ResourceAccess,
   KubernetesResourceModel,
   MetadataModel,
+  ResourceAccess,
   RoleEditorModel,
   RuleModel,
 } from './standardmodel';
diff --git a/web/packages/teleport/src/Roles/RoleList/RoleList.tsx b/web/packages/teleport/src/Roles/RoleList/RoleList.tsx
index 4a96dde54e060..baf15b596c534 100644
--- a/web/packages/teleport/src/Roles/RoleList/RoleList.tsx
+++ b/web/packages/teleport/src/Roles/RoleList/RoleList.tsx
@@ -18,7 +18,6 @@
 
 import Table, { Cell } from 'design/DataTable';
 import { MenuButton, MenuItem } from 'shared/components/MenuAction';
-
 import { SearchPanel } from 'shared/components/Search';
 
 import { SeversidePagination } from 'teleport/components/hooks/useServersidePagination';
diff --git a/web/packages/teleport/src/Roles/Roles.test.tsx b/web/packages/teleport/src/Roles/Roles.test.tsx
index 1edae5ee235e6..1a4338cac036e 100644
--- a/web/packages/teleport/src/Roles/Roles.test.tsx
+++ b/web/packages/teleport/src/Roles/Roles.test.tsx
@@ -17,7 +17,8 @@
  */
 
 import { MemoryRouter } from 'react-router';
-import { render, screen, fireEvent, waitFor } from 'design/utils/testing';
+
+import { fireEvent, render, screen, waitFor } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
 import { createTeleportContext } from 'teleport/mocks/contexts';
diff --git a/web/packages/teleport/src/Roles/Roles.tsx b/web/packages/teleport/src/Roles/Roles.tsx
index 1de64f31ae18b..fd138d323d91f 100644
--- a/web/packages/teleport/src/Roles/Roles.tsx
+++ b/web/packages/teleport/src/Roles/Roles.tsx
@@ -17,37 +17,36 @@
  */
 
 import { useEffect, useState } from 'react';
+import styled from 'styled-components';
+
 import { Alert, Box, Button, Flex, H3, Link } from 'design';
 import { P } from 'design/Text/Text';
-import { MissingPermissionsTooltip } from 'shared/components/MissingPermissionsTooltip';
 import { HoverTooltip } from 'design/Tooltip';
-
+import { MissingPermissionsTooltip } from 'shared/components/MissingPermissionsTooltip';
 import {
   Notification,
   NotificationItem,
   NotificationSeverity,
 } from 'shared/components/Notification';
 
-import styled from 'styled-components';
-
+import { useServerSidePagination } from 'teleport/components/hooks';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
 import ResourceEditor from 'teleport/components/ResourceEditor';
-import useTeleport from 'teleport/useTeleport';
-import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
-import { useServerSidePagination } from 'teleport/components/hooks';
-import { storageService } from 'teleport/services/storageService';
-import { RoleWithYaml, RoleResource } from 'teleport/services/resources';
 import useResources from 'teleport/components/useResources';
+import { RoleResource, RoleWithYaml } from 'teleport/services/resources';
+import { storageService } from 'teleport/services/storageService';
+import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
-import { RoleList } from './RoleList';
 import DeleteRole from './DeleteRole';
-import { useRoles, State } from './useRoles';
-import templates from './templates';
 import { RoleEditorDialog } from './RoleEditor/RoleEditorDialog';
+import { RoleList } from './RoleList';
+import templates from './templates';
+import { State, useRoles } from './useRoles';
 
 export function RolesContainer() {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Roles/useRoles.ts b/web/packages/teleport/src/Roles/useRoles.ts
index 6c4e9cc5f0f47..f7a43a627de5e 100644
--- a/web/packages/teleport/src/Roles/useRoles.ts
+++ b/web/packages/teleport/src/Roles/useRoles.ts
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import TeleportContext from 'teleport/teleportContext';
+import type { UrlListRolesParams } from 'teleport/config';
 import { RoleWithYaml } from 'teleport/services/resources';
 import { yamlService } from 'teleport/services/yaml';
 import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
-
-import type { UrlListRolesParams } from 'teleport/config';
+import TeleportContext from 'teleport/teleportContext';
 
 export function useRoles(ctx: TeleportContext) {
   const rolesAcl = ctx.storeUser.getRoleAccess();
diff --git a/web/packages/teleport/src/SamlApplications/useSamlAppActions.tsx b/web/packages/teleport/src/SamlApplications/useSamlAppActions.tsx
index 929f4ff149e78..5a4026f376f8c 100644
--- a/web/packages/teleport/src/SamlApplications/useSamlAppActions.tsx
+++ b/web/packages/teleport/src/SamlApplications/useSamlAppActions.tsx
@@ -17,12 +17,12 @@
  */
 
 import React, { createContext, useContext } from 'react';
+
 import { Attempt } from 'shared/hooks/useAsync';
 
+import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
 import { SamlMeta } from 'teleport/Discover/useDiscover';
-
 import type { SamlAppToDelete } from 'teleport/services/samlidp/types';
-import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
 import type { Access } from 'teleport/services/user';
 
 /**
diff --git a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.test.tsx b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.test.tsx
index 5f90c33767767..f10ec0da8f4bd 100644
--- a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.test.tsx
+++ b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.test.tsx
@@ -19,7 +19,6 @@
 import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
-
 import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { SessionJoinBtn } from './SessionJoinBtn';
diff --git a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
index 05e824fb2fa24..d5297b9d5ab81 100644
--- a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
+++ b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
@@ -21,9 +21,9 @@ import React, { useState } from 'react';
 import { Box, ButtonBorder, Flex, H3, Menu, MenuItem, Text } from 'design';
 import { ChevronDown, Warning } from 'design/Icon';
 
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import cfg from 'teleport/config';
 import { ParticipantMode } from 'teleport/services/session';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import { CtaEvent } from 'teleport/services/userEvent';
 
 export const SessionJoinBtn = ({
diff --git a/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx b/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
index dd2bc3046b38b..02c8c15f36286 100644
--- a/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
+++ b/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import styled from 'styled-components';
+
 import Table, { Cell } from 'design/DataTable';
 import * as Icons from 'design/Icon';
-import styled from 'styled-components';
 
 import { Participant, Session, SessionKind } from 'teleport/services/session';
 
diff --git a/web/packages/teleport/src/Sessions/SessionList/index.ts b/web/packages/teleport/src/Sessions/SessionList/index.ts
index d9db5f0f53103..9eb026c8b3b1a 100644
--- a/web/packages/teleport/src/Sessions/SessionList/index.ts
+++ b/web/packages/teleport/src/Sessions/SessionList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import SessionList from './SessionList';
+
 export default SessionList;
diff --git a/web/packages/teleport/src/Sessions/Sessions.story.tsx b/web/packages/teleport/src/Sessions/Sessions.story.tsx
index 7ecfd1fe58538..2fac134e601c3 100644
--- a/web/packages/teleport/src/Sessions/Sessions.story.tsx
+++ b/web/packages/teleport/src/Sessions/Sessions.story.tsx
@@ -19,12 +19,11 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
 import { createTeleportContext } from 'teleport/mocks/contexts';
 import useSessions from 'teleport/Sessions/useSessions';
 
-import { Sessions } from './Sessions';
 import { sessions } from './fixtures';
+import { Sessions } from './Sessions';
 
 export default {
   title: 'Teleport/ActiveSessions',
diff --git a/web/packages/teleport/src/Sessions/Sessions.tsx b/web/packages/teleport/src/Sessions/Sessions.tsx
index 475b4a9c09dce..fd19a344f67b3 100644
--- a/web/packages/teleport/src/Sessions/Sessions.tsx
+++ b/web/packages/teleport/src/Sessions/Sessions.tsx
@@ -17,19 +17,20 @@
  */
 
 import { useState } from 'react';
+
 import { Box, Indicator } from 'design';
 import { Danger } from 'design/Alert';
 import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
 
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import useTeleport from 'teleport/useTeleport';
-import useStickerClusterId from 'teleport/useStickyClusterId';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import { CtaEvent } from 'teleport/services/userEvent';
+import useStickerClusterId from 'teleport/useStickyClusterId';
+import useTeleport from 'teleport/useTeleport';
 
 import SessionList from './SessionList';
 import useSessions from './useSessions';
diff --git a/web/packages/teleport/src/Sessions/useSessions.ts b/web/packages/teleport/src/Sessions/useSessions.ts
index 15c647ccad097..6cfade918c409 100644
--- a/web/packages/teleport/src/Sessions/useSessions.ts
+++ b/web/packages/teleport/src/Sessions/useSessions.ts
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { context, trace } from '@opentelemetry/api';
 import { useEffect, useState } from 'react';
-import { useAttempt } from 'shared/hooks';
 
-import { context, trace } from '@opentelemetry/api';
+import { useAttempt } from 'shared/hooks';
 
+import cfg from 'teleport/config';
 import { Session } from 'teleport/services/session';
-
 import Ctx from 'teleport/teleportContext';
-import cfg from 'teleport/config';
 
 const tracer = trace.getTracer('userSessions');
 
diff --git a/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.story.tsx b/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.story.tsx
index 0bc03aade0e61..27ef7d1fa5e3a 100644
--- a/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.story.tsx
+++ b/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Router } from 'react-router';
 
 import { SingleLogoutFailed } from './SingleLogoutFailed';
 
diff --git a/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.tsx b/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.tsx
index 478e5f0cd3b9d..5bb88060f2d16 100644
--- a/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.tsx
+++ b/web/packages/teleport/src/SingleLogoutFailed/SingleLogoutFailed.tsx
@@ -17,6 +17,7 @@
  */
 
 import { useLocation } from 'react-router';
+
 import { LogoutFailed } from 'design/CardError';
 
 import { LogoHero } from 'teleport/components/LogoHero';
diff --git a/web/packages/teleport/src/Support/Support.story.tsx b/web/packages/teleport/src/Support/Support.story.tsx
index 14578454e38bf..771be9b3905d9 100644
--- a/web/packages/teleport/src/Support/Support.story.tsx
+++ b/web/packages/teleport/src/Support/Support.story.tsx
@@ -19,9 +19,8 @@
 import { MemoryRouter } from 'react-router';
 
 import { ContextProvider } from 'teleport';
-
-import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContentMinWidth } from 'teleport/Main/Main';
+import { createTeleportContext } from 'teleport/mocks/contexts';
 
 import { Props, Support } from './Support';
 
diff --git a/web/packages/teleport/src/Support/Support.tsx b/web/packages/teleport/src/Support/Support.tsx
index 7bff9ae9e7ec9..3ddfa1eda7792 100644
--- a/web/packages/teleport/src/Support/Support.tsx
+++ b/web/packages/teleport/src/Support/Support.tsx
@@ -18,22 +18,22 @@
 
 import React from 'react';
 import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
 import { Box, Flex, H2, H3, Text } from 'design';
 import * as Icons from 'design/Icon';
 import { MultiRowBox, Row } from 'design/MultiRowBox';
 
-import styled from 'styled-components';
-
+import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
 import {
   FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
-import useTeleport from 'teleport/useTeleport';
 import cfg from 'teleport/config';
-import { ButtonLockedFeature } from 'teleport/components/ButtonLockedFeature';
-import { CtaEvent } from 'teleport/services/userEvent';
 import { useNoMinWidth } from 'teleport/Main';
+import { CtaEvent } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
 export function SupportContainer({ children }: { children?: React.ReactNode }) {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/Teleport.tsx b/web/packages/teleport/src/Teleport.tsx
index 713de321151b1..0c1e35918c24e 100644
--- a/web/packages/teleport/src/Teleport.tsx
+++ b/web/packages/teleport/src/Teleport.tsx
@@ -16,40 +16,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { History } from 'history';
 import React, { Suspense, useEffect } from 'react';
 
-import { ThemeProvider, updateFavicon } from 'teleport/ThemeProvider';
-import { Route, Router, Switch } from 'teleport/components/Router';
-import { CatchError } from 'teleport/components/CatchError';
 import Authenticated from 'teleport/components/Authenticated';
-
+import { CatchError } from 'teleport/components/CatchError';
+import { Route, Router, Switch } from 'teleport/components/Router';
 import { getOSSFeatures } from 'teleport/features';
-
 import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
+import { ThemeProvider, updateFavicon } from 'teleport/ThemeProvider';
 import { UserContextProvider } from 'teleport/User';
 import { NewCredentials } from 'teleport/Welcome/NewCredentials';
 
-import TeleportContextProvider from './TeleportContextProvider';
-import TeleportContext from './teleportContext';
-import cfg from './config';
 import { AppLauncher } from './AppLauncher';
-import { LoginFailedComponent as LoginFailed } from './Login/LoginFailed';
-import { LoginSuccess } from './Login/LoginSuccess';
-import { LoginTerminalRedirect } from './Login/LoginTerminalRedirect';
-import { LoginClose } from './Login/LoginClose';
-import { Login } from './Login';
-import { Welcome } from './Welcome';
-import { SingleLogoutFailed } from './SingleLogoutFailed';
-
+import cfg from './config';
 import { ConsoleWithContext as Console } from './Console';
-import { Player } from './Player';
 import { DesktopSessionContainer as DesktopSession } from './DesktopSession';
-
 import { HeadlessRequest } from './HeadlessRequest';
-
+import { Login } from './Login';
+import { LoginClose } from './Login/LoginClose';
+import { LoginFailedComponent as LoginFailed } from './Login/LoginFailed';
+import { LoginSuccess } from './Login/LoginSuccess';
+import { LoginTerminalRedirect } from './Login/LoginTerminalRedirect';
 import { Main } from './Main';
-
-import type { History } from 'history';
+import { Player } from './Player';
+import { SingleLogoutFailed } from './SingleLogoutFailed';
+import TeleportContext from './teleportContext';
+import TeleportContextProvider from './TeleportContextProvider';
+import { Welcome } from './Welcome';
 
 const Teleport: React.FC<Props> = props => {
   const { ctx, history } = props;
diff --git a/web/packages/teleport/src/ThemeProvider.tsx b/web/packages/teleport/src/ThemeProvider.tsx
index 8ce6fc071dbaa..b5825e407cef9 100644
--- a/web/packages/teleport/src/ThemeProvider.tsx
+++ b/web/packages/teleport/src/ThemeProvider.tsx
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, ReactNode } from 'react';
+import { ReactNode, useEffect, useState } from 'react';
+
+import { bblpTheme, darkTheme, lightTheme, Theme } from 'design/theme';
 import { ConfiguredThemeProvider } from 'design/ThemeProvider';
-import { bblpTheme, lightTheme, darkTheme, Theme } from 'design/theme';
 import { Theme as ThemePreference } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
 
 import cfg from 'teleport/config';
-import { storageService, KeysEnum } from 'teleport/services/storageService';
+import { KeysEnum, storageService } from 'teleport/services/storageService';
 
 const customThemes = {
   bblp: bblpTheme,
diff --git a/web/packages/teleport/src/TopBar/ClusterSelector/ClusterSelector.tsx b/web/packages/teleport/src/TopBar/ClusterSelector/ClusterSelector.tsx
index 268a24eba0840..6509b0496c392 100644
--- a/web/packages/teleport/src/TopBar/ClusterSelector/ClusterSelector.tsx
+++ b/web/packages/teleport/src/TopBar/ClusterSelector/ClusterSelector.tsx
@@ -19,6 +19,7 @@
 import { useState } from 'react';
 import { components, ValueContainerProps } from 'react-select';
 import styled from 'styled-components';
+
 import { Box, Flex, Text } from 'design';
 import { SelectAsync } from 'shared/components/Select';
 
diff --git a/web/packages/teleport/src/TopBar/ClusterSelector/index.ts b/web/packages/teleport/src/TopBar/ClusterSelector/index.ts
index 64b0d10663aa4..28daa8b80a9fb 100644
--- a/web/packages/teleport/src/TopBar/ClusterSelector/index.ts
+++ b/web/packages/teleport/src/TopBar/ClusterSelector/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ClusterSelector from './ClusterSelector';
+
 export default ClusterSelector;
diff --git a/web/packages/teleport/src/TopBar/DeviceTrustIcon.tsx b/web/packages/teleport/src/TopBar/DeviceTrustIcon.tsx
index c888896d5fb5c..4c0a25de81c9d 100644
--- a/web/packages/teleport/src/TopBar/DeviceTrustIcon.tsx
+++ b/web/packages/teleport/src/TopBar/DeviceTrustIcon.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Flex } from 'design';
 import { ShieldCheck, ShieldWarning } from 'design/Icon';
 import { IconProps } from 'design/Icon/Icon';
diff --git a/web/packages/teleport/src/TopBar/DeviceTrustStatus.tsx b/web/packages/teleport/src/TopBar/DeviceTrustStatus.tsx
index 30bceb079f10b..a16834e65ad6c 100644
--- a/web/packages/teleport/src/TopBar/DeviceTrustStatus.tsx
+++ b/web/packages/teleport/src/TopBar/DeviceTrustStatus.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Flex, Text } from 'design';
 
 import session from 'teleport/services/websession';
diff --git a/web/packages/teleport/src/TopBar/TopBar.story.tsx b/web/packages/teleport/src/TopBar/TopBar.story.tsx
index b033d3b552c63..d74078aff4a49 100644
--- a/web/packages/teleport/src/TopBar/TopBar.story.tsx
+++ b/web/packages/teleport/src/TopBar/TopBar.story.tsx
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
+import { Router } from 'react-router';
 
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 import { getOSSFeatures } from 'teleport/features';
-import TeleportContext from 'teleport/teleportContext';
-import { makeUserContext } from 'teleport/services/user';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
 import { LocalNotificationKind } from 'teleport/services/notifications';
+import { makeUserContext } from 'teleport/services/user';
+import TeleportContext from 'teleport/teleportContext';
 import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
 
 import { TopBar } from './TopBar';
 
diff --git a/web/packages/teleport/src/TopBar/TopBar.test.tsx b/web/packages/teleport/src/TopBar/TopBar.test.tsx
index 990c2d3cb23ac..0073094caf578 100644
--- a/web/packages/teleport/src/TopBar/TopBar.test.tsx
+++ b/web/packages/teleport/src/TopBar/TopBar.test.tsx
@@ -17,27 +17,26 @@
  */
 
 import { act } from '@testing-library/react';
-import { subSeconds, subMinutes } from 'date-fns';
-import { render, screen, userEvent } from 'design/utils/testing';
-import { Router } from 'react-router';
+import { subMinutes, subSeconds } from 'date-fns';
 import { createMemoryHistory } from 'history';
 import { mockIntersectionObserver } from 'jsdom-testing-mocks';
+import { Router } from 'react-router';
 
-import session from 'teleport/services/websession';
-import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { render, screen, userEvent } from 'design/utils/testing';
+
+import { clusters } from 'teleport/Clusters/fixtures';
 import { getOSSFeatures } from 'teleport/features';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
+import { NotificationSubKind } from 'teleport/services/notifications';
+import { makeUserContext } from 'teleport/services/user';
+import session from 'teleport/services/websession';
 import TeleportContext, {
   disabledFeatureFlags,
 } from 'teleport/teleportContext';
-import { makeUserContext } from 'teleport/services/user';
-import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
-
-import { clusters } from 'teleport/Clusters/fixtures';
-
-import { NotificationSubKind } from 'teleport/services/notifications';
+import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
 
 import { TopBar } from './TopBar';
 
diff --git a/web/packages/teleport/src/TopBar/TopBar.tsx b/web/packages/teleport/src/TopBar/TopBar.tsx
index e19e71ca780cd..696cdff2cbd42 100644
--- a/web/packages/teleport/src/TopBar/TopBar.tsx
+++ b/web/packages/teleport/src/TopBar/TopBar.tsx
@@ -16,32 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useEffect, useCallback, useState } from 'react';
-import styled, { useTheme } from 'styled-components';
+import type * as history from 'history';
+import React, { useCallback, useEffect, useState } from 'react';
+import { matchPath, useHistory } from 'react-router';
 import { Link } from 'react-router-dom';
+import styled, { useTheme } from 'styled-components';
+
 import { Flex, Image, Text, TopNav } from 'design';
-import { matchPath, useHistory } from 'react-router';
-import { Theme } from 'design/theme/themes/types';
 import { ArrowLeft, Download, Server, SlidersVertical } from 'design/Icon';
+import { Theme } from 'design/theme/themes/types';
 import { HoverTooltip } from 'design/Tooltip';
 
-import useTeleport from 'teleport/useTeleport';
+import { logos } from 'teleport/components/LogoHero/LogoHero';
 import { UserMenuNav } from 'teleport/components/UserMenuNav';
-import { useFeatures } from 'teleport/FeaturesContext';
-import { NavigationCategory } from 'teleport/Navigation/categories';
-import useStickyClusterId from 'teleport/useStickyClusterId';
 import cfg from 'teleport/config';
-import { TeleportFeature } from 'teleport/types';
+import { useFeatures } from 'teleport/FeaturesContext';
 import { useLayout } from 'teleport/Main/LayoutContext';
+import { NavigationCategory } from 'teleport/Navigation/categories';
 import { getFirstRouteForCategory } from 'teleport/Navigation/Navigation';
-import { logos } from 'teleport/components/LogoHero/LogoHero';
-
 import { Notifications } from 'teleport/Notifications';
+import { TeleportFeature } from 'teleport/types';
+import useStickyClusterId from 'teleport/useStickyClusterId';
+import useTeleport from 'teleport/useTeleport';
 
 import { ButtonIconContainer } from './Shared';
 
-import type * as history from 'history';
-
 function getCategoryForRoute(
   features: TeleportFeature[],
   route: history.Location<unknown> | Location
diff --git a/web/packages/teleport/src/TopBar/TopBarSideNav.tsx b/web/packages/teleport/src/TopBar/TopBarSideNav.tsx
index 54b8b95bcd8e2..900a77d4b97eb 100644
--- a/web/packages/teleport/src/TopBar/TopBarSideNav.tsx
+++ b/web/packages/teleport/src/TopBar/TopBarSideNav.tsx
@@ -17,22 +17,22 @@
  */
 
 import React from 'react';
-import styled, { useTheme } from 'styled-components';
+import { matchPath, useHistory } from 'react-router';
 import { Link } from 'react-router-dom';
+import styled, { useTheme } from 'styled-components';
+
 import { Flex, Image, TopNav } from 'design';
-import { matchPath, useHistory } from 'react-router';
 import { Theme } from 'design/theme/themes/types';
 import { HoverTooltip } from 'design/Tooltip';
 
-import useTeleport from 'teleport/useTeleport';
+import { logos } from 'teleport/components/LogoHero/LogoHero';
 import { UserMenuNav } from 'teleport/components/UserMenuNav';
-import { useFeatures } from 'teleport/FeaturesContext';
 import cfg from 'teleport/config';
+import { useFeatures } from 'teleport/FeaturesContext';
 import { useLayout } from 'teleport/Main/LayoutContext';
-import { logos } from 'teleport/components/LogoHero/LogoHero';
-
-import { Notifications } from 'teleport/Notifications';
 import { zIndexMap } from 'teleport/Navigation/SideNavigation/zIndexMap';
+import { Notifications } from 'teleport/Notifications';
+import useTeleport from 'teleport/useTeleport';
 
 export function TopBar({ CustomLogo }: TopBarProps) {
   const ctx = useTeleport();
diff --git a/web/packages/teleport/src/TrustedClusters/DeleteTrust/DeleteTrust.tsx b/web/packages/teleport/src/TrustedClusters/DeleteTrust/DeleteTrust.tsx
index fec36108208ff..71776af86d3f2 100644
--- a/web/packages/teleport/src/TrustedClusters/DeleteTrust/DeleteTrust.tsx
+++ b/web/packages/teleport/src/TrustedClusters/DeleteTrust/DeleteTrust.tsx
@@ -18,13 +18,13 @@
 
 import { ButtonSecondary, ButtonWarning, P1, Text } from 'design';
 import * as Alerts from 'design/Alert';
-import useAttempt from 'shared/hooks/useAttemptNext';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/DialogConfirmation';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
 export default function DeleteTrustedClusterDialog(props: Props) {
   const { name, onClose, onDelete } = props;
diff --git a/web/packages/teleport/src/TrustedClusters/DeleteTrust/index.ts b/web/packages/teleport/src/TrustedClusters/DeleteTrust/index.ts
index 9c699d70cf36e..7423062b702d7 100644
--- a/web/packages/teleport/src/TrustedClusters/DeleteTrust/index.ts
+++ b/web/packages/teleport/src/TrustedClusters/DeleteTrust/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DeleteTrust from './DeleteTrust';
+
 export default DeleteTrust;
diff --git a/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx b/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx
index 1e78f6538141a..006f3018026b0 100644
--- a/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx
+++ b/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Box, Button, ButtonPrimary, Flex, H3, Indicator, Link } from 'design';
 import { Danger } from 'design/Alert';
-import { Indicator, Box, Flex, ButtonPrimary, Link, Button, H3 } from 'design';
 import Card from 'design/Card';
 import Image from 'design/Image';
-
 import { P } from 'design/Text/Text';
 
 import {
@@ -29,14 +28,13 @@ import {
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
 import ResourceEditor from 'teleport/components/ResourceEditor';
-
 import useResources from 'teleport/components/useResources';
 
+import { emptyPng } from './assets';
 import DeleteTrust from './DeleteTrust';
 import templates from './templates';
 import TrustedList from './TrustedList';
 import useTrustedClusters from './useTrustedClusters';
-import { emptyPng } from './assets';
 
 export default function TrustedClusters() {
   const { items, canCreate, remove, save, attempt } = useTrustedClusters();
diff --git a/web/packages/teleport/src/TrustedClusters/TrustedList/TrustedListItem.tsx b/web/packages/teleport/src/TrustedClusters/TrustedList/TrustedListItem.tsx
index 504a135c3dd58..6ab8bc9ff3ad9 100644
--- a/web/packages/teleport/src/TrustedClusters/TrustedList/TrustedListItem.tsx
+++ b/web/packages/teleport/src/TrustedClusters/TrustedList/TrustedListItem.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Flex, ButtonPrimary } from 'design';
+import { ButtonPrimary, Flex, Text } from 'design';
 import * as Icons from 'design/Icon';
 import { MenuIcon, MenuItem } from 'shared/components/MenuAction';
 
diff --git a/web/packages/teleport/src/TrustedClusters/TrustedList/index.ts b/web/packages/teleport/src/TrustedClusters/TrustedList/index.ts
index f50cbed6ddc11..c0c6e499a1a83 100644
--- a/web/packages/teleport/src/TrustedClusters/TrustedList/index.ts
+++ b/web/packages/teleport/src/TrustedClusters/TrustedList/index.ts
@@ -17,4 +17,5 @@
  */
 
 import TrustedList from './TrustedList';
+
 export default TrustedList;
diff --git a/web/packages/teleport/src/TrustedClusters/assets.js b/web/packages/teleport/src/TrustedClusters/assets.js
index d12d94fd97f34..1f60a17c5df11 100644
--- a/web/packages/teleport/src/TrustedClusters/assets.js
+++ b/web/packages/teleport/src/TrustedClusters/assets.js
@@ -1,2 +1,3 @@
 import emptyPng from './empty.png';
+
 export { emptyPng };
diff --git a/web/packages/teleport/src/TrustedClusters/index.ts b/web/packages/teleport/src/TrustedClusters/index.ts
index 524131c67109d..869d57cdc9a5d 100644
--- a/web/packages/teleport/src/TrustedClusters/index.ts
+++ b/web/packages/teleport/src/TrustedClusters/index.ts
@@ -17,4 +17,5 @@
  */
 
 import TrustedClusters from './TrustedClusters';
+
 export { TrustedClusters };
diff --git a/web/packages/teleport/src/TrustedClusters/useTrustedClusters.ts b/web/packages/teleport/src/TrustedClusters/useTrustedClusters.ts
index 5866d80b5d58b..e3ffcb7083433 100644
--- a/web/packages/teleport/src/TrustedClusters/useTrustedClusters.ts
+++ b/web/packages/teleport/src/TrustedClusters/useTrustedClusters.ts
@@ -17,6 +17,7 @@
  */
 
 import { useEffect, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import { Resource } from 'teleport/services/resources';
diff --git a/web/packages/teleport/src/UnifiedResources/ResourceActionButton.tsx b/web/packages/teleport/src/UnifiedResources/ResourceActionButton.tsx
index 448c9802936b1..01a880c3b82ea 100644
--- a/web/packages/teleport/src/UnifiedResources/ResourceActionButton.tsx
+++ b/web/packages/teleport/src/UnifiedResources/ResourceActionButton.tsx
@@ -17,32 +17,32 @@
  */
 
 import React, { useState } from 'react';
+
 import { ButtonBorder, ButtonWithMenu, MenuItem } from 'design';
+import { AwsLaunchButton } from 'shared/components/AwsLaunchButton';
 import {
   LoginItem,
   MenuInputType,
   MenuLogin,
 } from 'shared/components/MenuLogin';
-import { AwsLaunchButton } from 'shared/components/AwsLaunchButton';
 import { AwsRole } from 'shared/services/apps';
 
-import { UnifiedResource } from 'teleport/services/agents';
 import cfg from 'teleport/config';
-import useTeleport from 'teleport/useTeleport';
-import { Database } from 'teleport/services/databases';
-import { openNewTab } from 'teleport/lib/util';
-import { Kube } from 'teleport/services/kube';
-import { Desktop } from 'teleport/services/desktops';
 import DbConnectDialog from 'teleport/Databases/ConnectDialog';
+import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
+import { ResourceKind } from 'teleport/Discover/Shared';
 import KubeConnectDialog from 'teleport/Kubes/ConnectDialog';
-import useStickyClusterId from 'teleport/useStickyClusterId';
-import { Node, sortNodeLogins } from 'teleport/services/nodes';
+import { openNewTab } from 'teleport/lib/util';
+import { useSamlAppAction } from 'teleport/SamlApplications/useSamlAppActions';
+import { UnifiedResource } from 'teleport/services/agents';
 import { App, AppSubKind } from 'teleport/services/apps';
-import { ResourceKind } from 'teleport/Discover/Shared';
+import { Database } from 'teleport/services/databases';
+import { Desktop } from 'teleport/services/desktops';
+import { Kube } from 'teleport/services/kube';
+import { Node, sortNodeLogins } from 'teleport/services/nodes';
 import { DiscoverEventResource } from 'teleport/services/userEvent';
-import { useSamlAppAction } from 'teleport/SamlApplications/useSamlAppActions';
-
-import type { ResourceSpec } from 'teleport/Discover/SelectResource/types';
+import useStickyClusterId from 'teleport/useStickyClusterId';
+import useTeleport from 'teleport/useTeleport';
 
 type Props = {
   resource: UnifiedResource;
diff --git a/web/packages/teleport/src/UnifiedResources/UnifiedResources.tsx b/web/packages/teleport/src/UnifiedResources/UnifiedResources.tsx
index a3679b1c6bd75..c10fd8bdab04c 100644
--- a/web/packages/teleport/src/UnifiedResources/UnifiedResources.tsx
+++ b/web/packages/teleport/src/UnifiedResources/UnifiedResources.tsx
@@ -16,44 +16,42 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useCallback, useState, useMemo } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 
 import { Flex } from 'design';
 import { Danger } from 'design/Alert';
-
+import { DefaultTab } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
+import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
 import {
-  FilterKind,
-  UnifiedResources as SharedUnifiedResources,
-  useUnifiedResourcesFetch,
-  UnifiedResourcesPinning,
   BulkAction,
+  FilterKind,
   IncludedResourceMode,
   ResourceAvailabilityFilter,
+  UnifiedResources as SharedUnifiedResources,
+  UnifiedResourcesPinning,
+  useUnifiedResourcesFetch,
 } from 'shared/components/UnifiedResources';
-import { ClusterDropdown } from 'shared/components/ClusterDropdown/ClusterDropdown';
-
-import { DefaultTab } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 
-import useStickyClusterId from 'teleport/useStickyClusterId';
-import { useUser } from 'teleport/User/UserContext';
 import { useTeleport } from 'teleport';
+import AgentButtonAdd from 'teleport/components/AgentButtonAdd';
+import Empty, { EmptyStateInfo } from 'teleport/components/Empty';
 import { useUrlFiltering } from 'teleport/components/hooks';
 import {
+  FeatureBox,
   FeatureHeader,
   FeatureHeaderTitle,
-  FeatureBox,
 } from 'teleport/components/Layout';
-import { useNoMinWidth } from 'teleport/Main';
-import AgentButtonAdd from 'teleport/components/AgentButtonAdd';
+import { ServersideSearchPanel } from 'teleport/components/ServersideSearchPanel';
 import { SearchResource } from 'teleport/Discover/SelectResource';
-import Empty, { EmptyStateInfo } from 'teleport/components/Empty';
-import { FeatureFlags } from 'teleport/types';
-import { UnifiedResource } from 'teleport/services/agents';
+import { useNoMinWidth } from 'teleport/Main';
 import {
-  useSamlAppAction,
   SamlAppActionProvider,
+  useSamlAppAction,
 } from 'teleport/SamlApplications/useSamlAppActions';
-import { ServersideSearchPanel } from 'teleport/components/ServersideSearchPanel';
+import { UnifiedResource } from 'teleport/services/agents';
+import { FeatureFlags } from 'teleport/types';
+import { useUser } from 'teleport/User/UserContext';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 import { ResourceActionButton } from './ResourceActionButton';
 
diff --git a/web/packages/teleport/src/User/UserContext.test.tsx b/web/packages/teleport/src/User/UserContext.test.tsx
index a5d412d1facde..4b404f3e77d49 100644
--- a/web/packages/teleport/src/User/UserContext.test.tsx
+++ b/web/packages/teleport/src/User/UserContext.test.tsx
@@ -16,22 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { setupServer } from 'msw/node';
+import { render, screen } from '@testing-library/react';
 import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
 import { MemoryRouter } from 'react-router';
 
-import { render, screen } from '@testing-library/react';
-
 import '@testing-library/jest-dom';
 
 import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
 
 import cfg from 'teleport/config';
-
+import { KeysEnum } from 'teleport/services/storageService';
 import { UserContextProvider } from 'teleport/User';
-
 import { useUser } from 'teleport/User/UserContext';
-import { KeysEnum } from 'teleport/services/storageService';
 
 function ThemeName() {
   const { preferences } = useUser();
diff --git a/web/packages/teleport/src/User/UserContext.tsx b/web/packages/teleport/src/User/UserContext.tsx
index 36358b7b32e78..3dba8e941de8b 100644
--- a/web/packages/teleport/src/User/UserContext.tsx
+++ b/web/packages/teleport/src/User/UserContext.tsx
@@ -26,21 +26,15 @@ import {
   useState,
 } from 'react';
 
-import useAttempt from 'shared/hooks/useAttemptNext';
-
 import { Indicator } from 'design';
-
-import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
-
 import { ClusterUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/cluster_preferences_pb';
+import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
-import { StyledIndicator } from 'teleport/Main';
-
-import * as service from 'teleport/services/userPreferences';
 import cfg from 'teleport/config';
-
+import { StyledIndicator } from 'teleport/Main';
 import { KeysEnum, storageService } from 'teleport/services/storageService';
-
+import * as service from 'teleport/services/userPreferences';
 import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
 
 export interface UserContextValue {
diff --git a/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.test.tsx b/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.test.tsx
index 9478b19646c8d..93052b7f8d741 100644
--- a/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.test.tsx
+++ b/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.test.tsx
@@ -17,17 +17,13 @@
  */
 
 import { fireEvent, render, screen } from 'design/utils/testing';
-
 import Validation from 'shared/components/Validation';
 
 import { AllUserTraits } from 'teleport/services/user';
 
-import { TraitsEditor, emptyTrait } from './TraitsEditor';
-
+import { emptyTrait, TraitsEditor, type TraitsOption } from './TraitsEditor';
 import { traitsToTraitsOption } from './useDialog';
 
-import type { TraitsOption } from './TraitsEditor';
-
 test('Available traits are rendered', async () => {
   const setConfiguredTraits = jest.fn();
   const userTraits: AllUserTraits = {
diff --git a/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.tsx b/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.tsx
index 2d90f94518d50..4179aeac18855 100644
--- a/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.tsx
+++ b/web/packages/teleport/src/Users/UserAddEdit/TraitsEditor.tsx
@@ -17,11 +17,12 @@
  */
 
 import { Dispatch, SetStateAction } from 'react';
-import { ButtonBorder, Box, Flex, Text, ButtonIcon } from 'design';
+
+import { Box, ButtonBorder, ButtonIcon, Flex, Text } from 'design';
 import { Add, Trash } from 'design/Icon';
 import { FieldSelectCreatable } from 'shared/components/FieldSelect';
 import { Option } from 'shared/components/Select';
-import { requiredField, requiredAll } from 'shared/components/Validation/rules';
+import { requiredAll, requiredField } from 'shared/components/Validation/rules';
 import { Attempt } from 'shared/hooks/useAttemptNext';
 
 /**
diff --git a/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.story.tsx b/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.story.tsx
index dc0cfe00fcbd7..0eaee799f95c9 100644
--- a/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.story.tsx
+++ b/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.story.tsx
@@ -20,9 +20,8 @@ import { useState } from 'react';
 
 import { AllUserTraits } from 'teleport/services/user';
 
-import { UserAddEdit } from './UserAddEdit';
-
 import type { TraitsOption } from './TraitsEditor';
+import { UserAddEdit } from './UserAddEdit';
 
 export default {
   title: 'Teleport/Users/UserAddEdit',
diff --git a/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.tsx b/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.tsx
index 1acf01d8f5766..ae7c12e6d9089 100644
--- a/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.tsx
+++ b/web/packages/teleport/src/Users/UserAddEdit/UserAddEdit.tsx
@@ -16,23 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonPrimary, ButtonSecondary, Alert, Box } from 'design';
+import { Alert, Box, ButtonPrimary, ButtonSecondary } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
-import Validation from 'shared/components/Validation';
 import FieldInput from 'shared/components/FieldInput';
 import { FieldSelectAsync } from 'shared/components/FieldSelect';
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 
 import UserTokenLink from './../UserTokenLink';
-import useDialog, { Props } from './useDialog';
-
 import { TraitsEditor } from './TraitsEditor';
+import useDialog, { Props } from './useDialog';
 
 export default function Container(props: Props) {
   const dialog = useDialog(props);
diff --git a/web/packages/teleport/src/Users/UserAddEdit/useDialog.tsx b/web/packages/teleport/src/Users/UserAddEdit/useDialog.tsx
index acfe3451b6fe0..94a578c8fbbbb 100644
--- a/web/packages/teleport/src/Users/UserAddEdit/useDialog.tsx
+++ b/web/packages/teleport/src/Users/UserAddEdit/useDialog.tsx
@@ -17,10 +17,11 @@
  */
 
 import { useState } from 'react';
-import { useAttemptNext } from 'shared/hooks';
+
 import { Option } from 'shared/components/Select';
+import { useAttemptNext } from 'shared/hooks';
 
-import { ResetToken, User, AllUserTraits } from 'teleport/services/user';
+import { AllUserTraits, ResetToken, User } from 'teleport/services/user';
 
 import type { TraitsOption } from './TraitsEditor';
 
diff --git a/web/packages/teleport/src/Users/UserDelete/UserDelete.tsx b/web/packages/teleport/src/Users/UserDelete/UserDelete.tsx
index f6ab5685d0eab..004cfecba9f83 100644
--- a/web/packages/teleport/src/Users/UserDelete/UserDelete.tsx
+++ b/web/packages/teleport/src/Users/UserDelete/UserDelete.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonWarning, ButtonSecondary, Text, Alert } from 'design';
+import { Alert, ButtonSecondary, ButtonWarning, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 import { useAttemptNext } from 'shared/hooks';
 
diff --git a/web/packages/teleport/src/Users/UserDelete/index.ts b/web/packages/teleport/src/Users/UserDelete/index.ts
index bcb3537481291..a63006e0d839c 100644
--- a/web/packages/teleport/src/Users/UserDelete/index.ts
+++ b/web/packages/teleport/src/Users/UserDelete/index.ts
@@ -17,4 +17,5 @@
  */
 
 import UserDelete from './UserDelete';
+
 export default UserDelete;
diff --git a/web/packages/teleport/src/Users/UserList/UserList.tsx b/web/packages/teleport/src/Users/UserList/UserList.tsx
index 715f8743e1735..507df4e3e9ab8 100644
--- a/web/packages/teleport/src/Users/UserList/UserList.tsx
+++ b/web/packages/teleport/src/Users/UserList/UserList.tsx
@@ -19,8 +19,8 @@
 import { Cell, LabelCell } from 'design/DataTable';
 import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 
-import { Access, User, UserOrigin } from 'teleport/services/user';
 import { ClientSearcheableTableWithQueryParamSupport } from 'teleport/components/ClientSearcheableTableWithQueryParamSupport';
+import { Access, User, UserOrigin } from 'teleport/services/user';
 
 export default function UserList({
   users = [],
diff --git a/web/packages/teleport/src/Users/UserReset/UserReset.story.tsx b/web/packages/teleport/src/Users/UserReset/UserReset.story.tsx
index 3a68f43ac6a8f..87674790e78ba 100644
--- a/web/packages/teleport/src/Users/UserReset/UserReset.story.tsx
+++ b/web/packages/teleport/src/Users/UserReset/UserReset.story.tsx
@@ -17,9 +17,9 @@
  */
 
 import { Meta } from '@storybook/react';
+import { useEffect, useState } from 'react';
 
 import { Attempt } from 'shared/hooks/useAttemptNext';
-import { useEffect, useState } from 'react';
 
 import cfg from 'teleport/config';
 
diff --git a/web/packages/teleport/src/Users/UserReset/UserReset.tsx b/web/packages/teleport/src/Users/UserReset/UserReset.tsx
index 0eb11518a0fb5..926a6e8a12ca7 100644
--- a/web/packages/teleport/src/Users/UserReset/UserReset.tsx
+++ b/web/packages/teleport/src/Users/UserReset/UserReset.tsx
@@ -17,12 +17,13 @@
  */
 
 import { useState } from 'react';
-import { ButtonPrimary, ButtonSecondary, Text, Alert, P2 } from 'design';
+
+import { Alert, ButtonPrimary, ButtonSecondary, P2, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 import { useAttemptNext } from 'shared/hooks';
 
diff --git a/web/packages/teleport/src/Users/UserTokenLink/UserTokenLink.tsx b/web/packages/teleport/src/Users/UserTokenLink/UserTokenLink.tsx
index 0177b459bdc20..edee72e3dd9a9 100644
--- a/web/packages/teleport/src/Users/UserTokenLink/UserTokenLink.tsx
+++ b/web/packages/teleport/src/Users/UserTokenLink/UserTokenLink.tsx
@@ -20,15 +20,15 @@ import { formatDistanceStrict } from 'date-fns';
 
 import { ButtonSecondary, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 
 import TextSelectCopy from 'teleport/components/TextSelectCopy';
-import { ResetToken } from 'teleport/services/user';
 import cfg from 'teleport/config';
+import { ResetToken } from 'teleport/services/user';
 
 export default function UserTokenLink({
   token,
diff --git a/web/packages/teleport/src/Users/Users.test.tsx b/web/packages/teleport/src/Users/Users.test.tsx
index 5a67db85fdb50..b14f1cd786b5d 100644
--- a/web/packages/teleport/src/Users/Users.test.tsx
+++ b/web/packages/teleport/src/Users/Users.test.tsx
@@ -17,7 +17,8 @@
  */
 
 import { MemoryRouter } from 'react-router';
-import { render, screen, userEvent, fireEvent } from 'design/utils/testing';
+
+import { fireEvent, render, screen, userEvent } from 'design/utils/testing';
 
 import { ContextProvider } from 'teleport';
 import { createTeleportContext } from 'teleport/mocks/contexts';
diff --git a/web/packages/teleport/src/Users/Users.tsx b/web/packages/teleport/src/Users/Users.tsx
index 16c007045752c..7bd73b2d135d0 100644
--- a/web/packages/teleport/src/Users/Users.tsx
+++ b/web/packages/teleport/src/Users/Users.tsx
@@ -17,7 +17,8 @@
  */
 
 import React from 'react';
-import { Indicator, Text, Flex, Box, Alert, Button, Link } from 'design';
+
+import { Alert, Box, Button, Flex, Indicator, Link, Text } from 'design';
 import { HoverTooltip } from 'shared/components/ToolTip';
 
 import {
@@ -26,9 +27,9 @@ import {
   FeatureHeaderTitle,
 } from 'teleport/components/Layout';
 
-import UserList from './UserList';
 import UserAddEdit from './UserAddEdit';
 import UserDelete from './UserDelete';
+import UserList from './UserList';
 import UserReset from './UserReset';
 import useUsers, { State, UsersContainerProps } from './useUsers';
 
diff --git a/web/packages/teleport/src/Users/useUsers.ts b/web/packages/teleport/src/Users/useUsers.ts
index d23da34ff659a..48dc99dd11637 100644
--- a/web/packages/teleport/src/Users/useUsers.ts
+++ b/web/packages/teleport/src/Users/useUsers.ts
@@ -17,13 +17,14 @@
  */
 
 import { ReactElement, useEffect, useState } from 'react';
+
 import { useAttempt } from 'shared/hooks';
 
-import { ExcludeUserField, User } from 'teleport/services/user';
-import useTeleport from 'teleport/useTeleport';
 import cfg from 'teleport/config';
-import { storageService } from 'teleport/services/storageService';
 import auth from 'teleport/services/auth/auth';
+import { storageService } from 'teleport/services/storageService';
+import { ExcludeUserField, User } from 'teleport/services/user';
+import useTeleport from 'teleport/useTeleport';
 
 export default function useUsers({
   InviteCollaborators,
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/Expired.tsx b/web/packages/teleport/src/Welcome/NewCredentials/Expired.tsx
index 173ae15a42848..70ca24cd6ada7 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/Expired.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/Expired.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { H2, P1 } from 'design';
 
 import { OnboardCard } from 'teleport/components/Onboard';
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.story.tsx b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.story.tsx
index 3f626a6883d85..a35c64a099212 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.story.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.story.tsx
@@ -17,7 +17,6 @@
  */
 
 import { WelcomeWrapper } from 'teleport/components/Onboard';
-
 import {
   NewMfaDevice,
   NewMfaDeviceProps,
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.test.tsx b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.test.tsx
index a270f2c41b178..8ee825d354cc5 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.test.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.test.tsx
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Attempt } from 'shared/hooks/useAttemptNext';
-
 import { render, screen } from 'design/utils/testing';
+import { Attempt } from 'shared/hooks/useAttemptNext';
 
 import { RecoveryCodes, ResetToken } from 'teleport/services/auth';
-import { NewCredentialsProps } from 'teleport/Welcome/NewCredentials/types';
-import { NewCredentials } from 'teleport/Welcome/NewCredentials/NewCredentials';
-import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
 import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
+import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
+import { NewCredentials } from 'teleport/Welcome/NewCredentials/NewCredentials';
+import { NewCredentialsProps } from 'teleport/Welcome/NewCredentials/types';
 
 const attempt: Attempt = { status: '' };
 const failedAttempt: Attempt = { status: 'failed' };
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.tsx b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.tsx
index 68a0389b5f589..0ce9796332550 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/NewCredentials.tsx
@@ -17,20 +17,19 @@
  */
 
 import { useState } from 'react';
-import { NewFlow, StepSlider } from 'design/StepSlider';
+
 import { Box } from 'design';
+import { NewFlow, StepSlider } from 'design/StepSlider';
 
 import { OnboardCard } from 'teleport/components/Onboard';
 import OSSRecoveryCodes from 'teleport/components/RecoveryCodes';
 import cfg from 'teleport/config';
-
 import { loginFlows } from 'teleport/Welcome/NewCredentials/constants';
 
 import useToken from '../useToken';
-
 import { Expired } from './Expired';
-import { LoginFlow, NewCredentialsProps } from './types';
 import { RegisterSuccess } from './Success';
+import { LoginFlow, NewCredentialsProps } from './types';
 
 /**
  *
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/NewPassword.tsx b/web/packages/teleport/src/Welcome/NewCredentials/NewPassword.tsx
index e5340a27f3d11..66c0b97bccaf1 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/NewPassword.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/NewPassword.tsx
@@ -17,6 +17,7 @@
  */
 
 import React, { useState } from 'react';
+
 import { Box, ButtonPrimary, ButtonText, H2, Text } from 'design';
 import { Danger } from 'design/Alert';
 import FieldInput from 'shared/components/FieldInput';
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/NewPasswordlessDevice.tsx b/web/packages/teleport/src/Welcome/NewCredentials/NewPasswordlessDevice.tsx
index f66cf5119c95d..8f95f01a542f9 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/NewPasswordlessDevice.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/NewPasswordlessDevice.tsx
@@ -17,6 +17,7 @@
  */
 
 import React, { useState } from 'react';
+
 import { Box, ButtonPrimary, ButtonText, H2 } from 'design';
 import { Danger } from 'design/Alert';
 import FieldInput from 'shared/components/FieldInput';
@@ -25,7 +26,6 @@ import { requiredField } from 'shared/components/Validation/rules';
 import { useRefAutoFocus } from 'shared/hooks';
 
 import { OnboardCard } from 'teleport/components/Onboard';
-
 import { PasskeyBlurb } from 'teleport/components/Passkeys/PasskeyBlurb';
 
 import { SliderProps, UseTokenState } from './types';
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/Success.tsx b/web/packages/teleport/src/Welcome/NewCredentials/Success.tsx
index a533fa689282e..6a58b2b246bd5 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/Success.tsx
+++ b/web/packages/teleport/src/Welcome/NewCredentials/Success.tsx
@@ -18,10 +18,9 @@
 
 import { ButtonPrimary, Flex, H2, Image, Text } from 'design';
 
+import shieldCheck from 'teleport/assets/shield-check.png';
 import { OnboardCard } from 'teleport/components/Onboard';
-
 import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
-import shieldCheck from 'teleport/assets/shield-check.png';
 
 import { RegisterSuccessProps } from './types';
 
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/constants.ts b/web/packages/teleport/src/Welcome/NewCredentials/constants.ts
index 24d099b174de1..009a8ca893fbb 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/constants.ts
+++ b/web/packages/teleport/src/Welcome/NewCredentials/constants.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NewPassword } from 'teleport/Welcome/NewCredentials/NewPassword';
 import { NewMfaDevice } from 'teleport/Welcome/NewCredentials/NewMfaDevice';
+import { NewPassword } from 'teleport/Welcome/NewCredentials/NewPassword';
 import { NewPasswordlessDevice } from 'teleport/Welcome/NewCredentials/NewPasswordlessDevice';
 
 export const loginFlows = {
diff --git a/web/packages/teleport/src/Welcome/NewCredentials/types.ts b/web/packages/teleport/src/Welcome/NewCredentials/types.ts
index b88ff36b6396f..718b83b49c21f 100644
--- a/web/packages/teleport/src/Welcome/NewCredentials/types.ts
+++ b/web/packages/teleport/src/Welcome/NewCredentials/types.ts
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Attempt } from 'shared/hooks/useAttemptNext';
-
-import { Auth2faType, PrimaryAuthType } from 'shared/services';
+import { ReactElement } from 'react';
 
 import { NewFlow, StepComponentProps } from 'design/StepSlider';
+import { Attempt } from 'shared/hooks/useAttemptNext';
+import { Auth2faType, PrimaryAuthType } from 'shared/services';
 
-import { ReactElement } from 'react';
-
-import { RecoveryCodes, ResetToken } from 'teleport/services/auth';
 import { RecoveryCodesProps } from 'teleport/components/RecoveryCodes';
+import { RecoveryCodes, ResetToken } from 'teleport/services/auth';
 import { DeviceUsage } from 'teleport/services/mfa';
 
 export type UseTokenState = {
diff --git a/web/packages/teleport/src/Welcome/Welcome.story.tsx b/web/packages/teleport/src/Welcome/Welcome.story.tsx
index b31284c9b1815..2fec30cefecdd 100644
--- a/web/packages/teleport/src/Welcome/Welcome.story.tsx
+++ b/web/packages/teleport/src/Welcome/Welcome.story.tsx
@@ -19,11 +19,10 @@
 import { MemoryRouter } from 'react-router-dom';
 
 import { WelcomeWrapper } from 'teleport/components/Onboard';
-
 import { NewCredentials } from 'teleport/Welcome/NewCredentials';
 
-import { Welcome } from './Welcome';
 import { CardWelcome } from './CardWelcome';
+import { Welcome } from './Welcome';
 
 export default { title: 'Teleport/Welcome' };
 
diff --git a/web/packages/teleport/src/Welcome/Welcome.test.tsx b/web/packages/teleport/src/Welcome/Welcome.test.tsx
index cae693c2d3479..ac75b0ce98511 100644
--- a/web/packages/teleport/src/Welcome/Welcome.test.tsx
+++ b/web/packages/teleport/src/Welcome/Welcome.test.tsx
@@ -16,20 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MemoryRouter, Route, Router } from 'react-router';
+import { act } from '@testing-library/react';
+import { userEvent, UserEvent } from '@testing-library/user-event';
 import { createMemoryHistory } from 'history';
+import { MemoryRouter, Route, Router } from 'react-router';
+
 import { fireEvent, render, screen, waitFor } from 'design/utils/testing';
 import { Logger } from 'shared/libs/logger';
 
-import { act } from '@testing-library/react';
-import { userEvent, UserEvent } from '@testing-library/user-event';
-
 import cfg from 'teleport/config';
-import history from 'teleport/services/history';
 import auth from 'teleport/services/auth';
-
+import history from 'teleport/services/history';
 import { userEventService } from 'teleport/services/userEvent';
-
 import { NewCredentials } from 'teleport/Welcome/NewCredentials';
 
 import { Welcome } from './Welcome';
diff --git a/web/packages/teleport/src/Welcome/Welcome.tsx b/web/packages/teleport/src/Welcome/Welcome.tsx
index 2ad5d54c43afc..cc94d9e848d66 100644
--- a/web/packages/teleport/src/Welcome/Welcome.tsx
+++ b/web/packages/teleport/src/Welcome/Welcome.tsx
@@ -17,19 +17,18 @@
  */
 
 import { WelcomeWrapper } from 'teleport/components/Onboard';
-
 import {
   Route,
   Switch,
-  useParams,
   useLocation,
+  useParams,
 } from 'teleport/components/Router';
-import history from 'teleport/services/history';
 import cfg from 'teleport/config';
+import history from 'teleport/services/history';
 import { NewCredentialsContainerProps } from 'teleport/Welcome/NewCredentials';
 
-import { CLOUD_INVITE_URL_PARAM } from './const';
 import { CardWelcome } from './CardWelcome';
+import { CLOUD_INVITE_URL_PARAM } from './const';
 
 type WelcomeProps = {
   NewCredentials: (props: NewCredentialsContainerProps) => JSX.Element;
diff --git a/web/packages/teleport/src/Welcome/useToken.ts b/web/packages/teleport/src/Welcome/useToken.ts
index 6e00cea7e7965..a711e2c8d736e 100644
--- a/web/packages/teleport/src/Welcome/useToken.ts
+++ b/web/packages/teleport/src/Welcome/useToken.ts
@@ -17,10 +17,10 @@
  */
 
 import { useEffect, useState } from 'react';
+
 import useAttempt from 'shared/hooks/useAttemptNext';
 
 import cfg from 'teleport/config';
-import history from 'teleport/services/history';
 import auth, {
   ChangedUserAuthn,
   RecoveryCodes,
@@ -28,8 +28,9 @@ import auth, {
   ResetPasswordWithWebauthnReqWithEvent,
   ResetToken,
 } from 'teleport/services/auth';
-import { UseTokenState } from 'teleport/Welcome/NewCredentials/types';
+import history from 'teleport/services/history';
 import { DeviceUsage } from 'teleport/services/mfa';
+import { UseTokenState } from 'teleport/Welcome/NewCredentials/types';
 
 export default function useToken(tokenId: string): UseTokenState {
   const [resetToken, setResetToken] = useState<ResetToken>();
diff --git a/web/packages/teleport/src/boot.tsx b/web/packages/teleport/src/boot.tsx
index d1b22f4ea4c10..b1d10c4bae768 100644
--- a/web/packages/teleport/src/boot.tsx
+++ b/web/packages/teleport/src/boot.tsx
@@ -22,9 +22,9 @@ import history from 'teleport/services/history';
 
 import 'teleport/lib/polyfillRandomUuid';
 
+import cfg from './config';
 import Teleport from './Teleport';
 import TeleportContext from './teleportContext';
-import cfg from './config';
 
 // apply configuration received from the server
 cfg.init(window['GRV_CONFIG']);
diff --git a/web/packages/teleport/src/components/AjaxPoller/index.js b/web/packages/teleport/src/components/AjaxPoller/index.js
index 9b03e88a3ee79..a3ecb1c428c9e 100644
--- a/web/packages/teleport/src/components/AjaxPoller/index.js
+++ b/web/packages/teleport/src/components/AjaxPoller/index.js
@@ -17,4 +17,5 @@
  */
 
 import AjaxPoller from './AjaxPoller';
+
 export default AjaxPoller;
diff --git a/web/packages/teleport/src/components/Authenticated/Authenticated.test.tsx b/web/packages/teleport/src/components/Authenticated/Authenticated.test.tsx
index 8a4103f988466..64e24fd97b312 100644
--- a/web/packages/teleport/src/components/Authenticated/Authenticated.test.tsx
+++ b/web/packages/teleport/src/components/Authenticated/Authenticated.test.tsx
@@ -18,10 +18,10 @@
 
 import { render, screen, waitFor } from 'design/utils/testing';
 
-import session from 'teleport/services/websession';
-import { ApiError } from 'teleport/services/api/parseError';
 import api from 'teleport/services/api';
+import { ApiError } from 'teleport/services/api/parseError';
 import history from 'teleport/services/history';
+import session from 'teleport/services/websession';
 
 import Authenticated from './Authenticated';
 
diff --git a/web/packages/teleport/src/components/Authenticated/Authenticated.tsx b/web/packages/teleport/src/components/Authenticated/Authenticated.tsx
index 532111b2cb087..affc9051efe01 100644
--- a/web/packages/teleport/src/components/Authenticated/Authenticated.tsx
+++ b/web/packages/teleport/src/components/Authenticated/Authenticated.tsx
@@ -17,17 +17,18 @@
  */
 
 import React, { PropsWithChildren, useEffect } from 'react';
-import { throttle } from 'shared/utils/highbar';
-import Logger from 'shared/libs/logger';
-import useAttempt from 'shared/hooks/useAttemptNext';
-import { getErrMessage } from 'shared/utils/errorType';
+
 import { Box, Indicator } from 'design';
 import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
+import useAttempt from 'shared/hooks/useAttemptNext';
+import Logger from 'shared/libs/logger';
+import { getErrMessage } from 'shared/utils/errorType';
+import { throttle } from 'shared/utils/highbar';
 
-import session from 'teleport/services/websession';
-import { storageService } from 'teleport/services/storageService';
-import { ApiError } from 'teleport/services/api/parseError';
 import { StyledIndicator } from 'teleport/Main';
+import { ApiError } from 'teleport/services/api/parseError';
+import { storageService } from 'teleport/services/storageService';
+import session from 'teleport/services/websession';
 
 import { ErrorDialog } from './ErrorDialogue';
 
diff --git a/web/packages/teleport/src/components/Authenticated/ErrorDialogue.tsx b/web/packages/teleport/src/components/Authenticated/ErrorDialogue.tsx
index 493d188ce9c19..1bfc00ac5843c 100644
--- a/web/packages/teleport/src/components/Authenticated/ErrorDialogue.tsx
+++ b/web/packages/teleport/src/components/Authenticated/ErrorDialogue.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Alert, ButtonSecondary } from 'design';
+import { Alert, ButtonSecondary, Text } from 'design';
 import Dialog, {
-  DialogHeader,
-  DialogTitle,
   DialogContent,
   DialogFooter,
+  DialogHeader,
+  DialogTitle,
 } from 'design/Dialog';
 
 import history from 'teleport/services/history';
diff --git a/web/packages/teleport/src/components/Authenticated/index.ts b/web/packages/teleport/src/components/Authenticated/index.ts
index a6cce6f7f9837..fe17ca64f81f3 100644
--- a/web/packages/teleport/src/components/Authenticated/index.ts
+++ b/web/packages/teleport/src/components/Authenticated/index.ts
@@ -17,4 +17,5 @@
  */
 
 import Authenticated from './Authenticated';
+
 export default Authenticated;
diff --git a/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.test.tsx b/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.test.tsx
index 516c021c8d452..c432a185b0a90 100644
--- a/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.test.tsx
+++ b/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.test.tsx
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, fireEvent } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { makeDefaultMfaState, MfaState } from 'teleport/lib/useMfa';
-
 import { SSOChallenge } from 'teleport/services/mfa';
 
 import AuthnDialog from './AuthnDialog';
diff --git a/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.tsx b/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.tsx
index 0a301b1f16c43..93e70216b5cb0 100644
--- a/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.tsx
+++ b/web/packages/teleport/src/components/AuthnDialog/AuthnDialog.tsx
@@ -16,12 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Dialog, { DialogContent } from 'design/Dialog';
+import { ButtonIcon, ButtonSecondary, Flex, H2, Text } from 'design';
 import { Danger } from 'design/Alert';
-import { FingerprintSimple, Cross } from 'design/Icon';
-
-import { Text, ButtonSecondary, Flex, ButtonIcon, H2 } from 'design';
-
+import Dialog, { DialogContent } from 'design/Dialog';
+import { Cross, FingerprintSimple } from 'design/Icon';
 import { guessProviderType } from 'shared/components/ButtonSso';
 import { SSOIcon } from 'shared/components/ButtonSso/ButtonSso';
 
diff --git a/web/packages/teleport/src/components/AuthnDialog/index.ts b/web/packages/teleport/src/components/AuthnDialog/index.ts
index 991acdad6b2b9..063dce1ebdfd3 100644
--- a/web/packages/teleport/src/components/AuthnDialog/index.ts
+++ b/web/packages/teleport/src/components/AuthnDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import AuthnDialog from './AuthnDialog';
+
 export default AuthnDialog;
diff --git a/web/packages/teleport/src/components/BannerList/BannerList.test.tsx b/web/packages/teleport/src/components/BannerList/BannerList.test.tsx
index a8fb75460cf99..324978a8a6160 100644
--- a/web/packages/teleport/src/components/BannerList/BannerList.test.tsx
+++ b/web/packages/teleport/src/components/BannerList/BannerList.test.tsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+
 import {
   fireEvent,
   screen,
@@ -25,9 +26,7 @@ import {
 
 import { LayoutContextProvider } from 'teleport/Main/LayoutContext';
 
-import { BannerList } from './BannerList';
-
-import type { BannerType } from './BannerList';
+import { BannerList, type BannerType } from './BannerList';
 
 function render(banner: React.ReactNode) {
   return testingRender(<LayoutContextProvider>{banner}</LayoutContextProvider>);
diff --git a/web/packages/teleport/src/components/BannerList/BannerList.tsx b/web/packages/teleport/src/components/BannerList/BannerList.tsx
index 058bd1db33025..0a54fe8cdafc1 100644
--- a/web/packages/teleport/src/components/BannerList/BannerList.tsx
+++ b/web/packages/teleport/src/components/BannerList/BannerList.tsx
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState, type ReactNode } from 'react';
 
 import { Box } from 'design';
 
-import { StandardBanner } from './StandardBanner';
-
-import type { Severity } from './StandardBanner';
-import type { ReactNode } from 'react';
+import { StandardBanner, type Severity } from './StandardBanner';
 
 export const BannerList = ({
   banners = [],
diff --git a/web/packages/teleport/src/components/BannerList/StandardBanner.tsx b/web/packages/teleport/src/components/BannerList/StandardBanner.tsx
index 1f7148d2c57f9..4c0c0d1264fcf 100644
--- a/web/packages/teleport/src/components/BannerList/StandardBanner.tsx
+++ b/web/packages/teleport/src/components/BannerList/StandardBanner.tsx
@@ -17,11 +17,10 @@
  */
 
 import { Banner } from 'design';
-
 import { Action } from 'design/Alert';
 
-import { CaptureEvent } from 'teleport/services/userEvent/types';
 import { userEventService } from 'teleport/services/userEvent';
+import { CaptureEvent } from 'teleport/services/userEvent/types';
 
 export type Severity = 'info' | 'warning' | 'danger';
 
diff --git a/web/packages/teleport/src/components/BannerList/index.tsx b/web/packages/teleport/src/components/BannerList/index.tsx
index 826bf2c2c9e1b..13aa57b646b7b 100644
--- a/web/packages/teleport/src/components/BannerList/index.tsx
+++ b/web/packages/teleport/src/components/BannerList/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { StandardBanner } from './StandardBanner';
 import { BannerList } from './BannerList';
+import { StandardBanner } from './StandardBanner';
 
 export { StandardBanner, BannerList };
diff --git a/web/packages/teleport/src/components/BannerList/useAlerts.test.tsx b/web/packages/teleport/src/components/BannerList/useAlerts.test.tsx
index 3fd919f60ee6f..cd68dc5dea626 100644
--- a/web/packages/teleport/src/components/BannerList/useAlerts.test.tsx
+++ b/web/packages/teleport/src/components/BannerList/useAlerts.test.tsx
@@ -19,7 +19,6 @@
 import { renderHook, waitFor } from '@testing-library/react';
 
 import cfg from 'teleport/config';
-
 // Imports to be mocked
 import { fetchClusterAlerts } from 'teleport/services/alerts'; // eslint-disable-line
 import useStickyClusterId from 'teleport/useStickyClusterId'; // eslint-disable-line
diff --git a/web/packages/teleport/src/components/BannerList/useAlerts.tsx b/web/packages/teleport/src/components/BannerList/useAlerts.tsx
index 1ea11253e36d1..e9f0397c66bc4 100644
--- a/web/packages/teleport/src/components/BannerList/useAlerts.tsx
+++ b/web/packages/teleport/src/components/BannerList/useAlerts.tsx
@@ -16,15 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
-import Logger from 'shared/libs/logger';
+import { useEffect, useState } from 'react';
 
-import { alertNames, fetchClusterAlerts } from 'teleport/services/alerts';
-import useStickyClusterId from 'teleport/useStickyClusterId';
+import Logger from 'shared/libs/logger';
 
 import cfg from 'teleport/config';
-
-import type { ClusterAlert } from 'teleport/services/alerts';
+import {
+  alertNames,
+  fetchClusterAlerts,
+  type ClusterAlert,
+} from 'teleport/services/alerts';
+import useStickyClusterId from 'teleport/useStickyClusterId';
 
 const logger = Logger.create('ClusterAlerts');
 
diff --git a/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.test.tsx b/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.test.tsx
index e1aae4aaca04b..8578adc6fd2c0 100644
--- a/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.test.tsx
+++ b/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.test.tsx
@@ -17,14 +17,13 @@
  */
 
 import React from 'react';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import cfg from 'teleport/config';
-
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
 import { createTeleportContext } from 'teleport/mocks/contexts';
-
 import { CtaEvent, userEventService } from 'teleport/services/userEvent';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
 import { ButtonLockedFeature } from './ButtonLockedFeature';
 
diff --git a/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.tsx b/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.tsx
index 54137445f009e..d92d8d3374efc 100644
--- a/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.tsx
+++ b/web/packages/teleport/src/components/ButtonLockedFeature/ButtonLockedFeature.tsx
@@ -18,13 +18,13 @@
 
 import React from 'react';
 import styled from 'styled-components';
+
 import { ButtonPrimary, Link } from 'design';
-import { Unlock } from 'design/Icon';
 import Flex from 'design/Flex';
+import { Unlock } from 'design/Icon';
 
 import cfg from 'teleport/config';
 import { getSalesURL } from 'teleport/services/sales';
-
 import { CtaEvent, userEventService } from 'teleport/services/userEvent';
 import useTeleport from 'teleport/useTeleport';
 
diff --git a/web/packages/teleport/src/components/CardEmpty/index.js b/web/packages/teleport/src/components/CardEmpty/index.js
index a4a99e3b35a56..022491472de54 100644
--- a/web/packages/teleport/src/components/CardEmpty/index.js
+++ b/web/packages/teleport/src/components/CardEmpty/index.js
@@ -17,4 +17,5 @@
  */
 
 import CardEmpty from './CardEmpty';
+
 export default CardEmpty;
diff --git a/web/packages/teleport/src/components/CatchError/CatchError.tsx b/web/packages/teleport/src/components/CatchError/CatchError.tsx
index e6c748f6b2b82..7e392bad92189 100644
--- a/web/packages/teleport/src/components/CatchError/CatchError.tsx
+++ b/web/packages/teleport/src/components/CatchError/CatchError.tsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+
 import { Failed } from 'design/CardError';
 import Logger from 'shared/libs/logger';
 
diff --git a/web/packages/teleport/src/components/ClientSearcheableTableWithQueryParamSupport/ClientSearcheableTableWithQueryParamSupport.tsx b/web/packages/teleport/src/components/ClientSearcheableTableWithQueryParamSupport/ClientSearcheableTableWithQueryParamSupport.tsx
index c71b6c56464a8..a48526048cbe7 100644
--- a/web/packages/teleport/src/components/ClientSearcheableTableWithQueryParamSupport/ClientSearcheableTableWithQueryParamSupport.tsx
+++ b/web/packages/teleport/src/components/ClientSearcheableTableWithQueryParamSupport/ClientSearcheableTableWithQueryParamSupport.tsx
@@ -18,8 +18,8 @@
 
 import { useHistory, useLocation } from 'react-router';
 
-import { TableProps } from 'design/DataTable/types';
 import Table from 'design/DataTable';
+import { TableProps } from 'design/DataTable/types';
 
 import {
   decodeUrlQueryParam,
diff --git a/web/packages/teleport/src/components/DayPicker/Shared.tsx b/web/packages/teleport/src/components/DayPicker/Shared.tsx
index 398d74f2ade92..ad13739fc7b78 100644
--- a/web/packages/teleport/src/components/DayPicker/Shared.tsx
+++ b/web/packages/teleport/src/components/DayPicker/Shared.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Flex } from 'design';
 
 export const StyledDateRange = styled(Flex)`
diff --git a/web/packages/teleport/src/components/DownloadLinks/index.ts b/web/packages/teleport/src/components/DownloadLinks/index.ts
index 38763f36faadf..395ae933723ac 100644
--- a/web/packages/teleport/src/components/DownloadLinks/index.ts
+++ b/web/packages/teleport/src/components/DownloadLinks/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DownloadLinks from './DownloadLinks';
+
 export default DownloadLinks;
diff --git a/web/packages/teleport/src/components/Empty/Empty.test.tsx b/web/packages/teleport/src/components/Empty/Empty.test.tsx
index 1049dec678d3a..5c164f958535e 100644
--- a/web/packages/teleport/src/components/Empty/Empty.test.tsx
+++ b/web/packages/teleport/src/components/Empty/Empty.test.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import { MemoryRouter } from 'react-router';
 
+import { render, screen } from 'design/utils/testing';
+
 import Empty, { Props } from './Empty';
 
 test('empty state for enterprise or oss, with create perms', async () => {
diff --git a/web/packages/teleport/src/components/Empty/Empty.tsx b/web/packages/teleport/src/components/Empty/Empty.tsx
index cc630f92f081e..a8b1b9a3001d0 100644
--- a/web/packages/teleport/src/components/Empty/Empty.tsx
+++ b/web/packages/teleport/src/components/Empty/Empty.tsx
@@ -19,13 +19,13 @@
 import { Link } from 'react-router-dom';
 
 import {
-  Text,
   Box,
-  Flex,
-  ButtonPrimary,
   ButtonBorder,
+  ButtonPrimary,
+  Flex,
   H1,
   ResourceIcon,
+  Text,
 } from 'design';
 
 import cfg from 'teleport/config';
diff --git a/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.tsx b/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.tsx
index 12592b9a57b16..81b8c0b9e7909 100644
--- a/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.tsx
+++ b/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, forwardRef } from 'react';
-import { isAfter, endOfDay, startOfDay, isSameDay } from 'date-fns';
-import { DayPicker, addToRange, DateRange } from 'react-day-picker';
+import { endOfDay, isAfter, isSameDay, startOfDay } from 'date-fns';
+import { forwardRef, useState } from 'react';
+import { addToRange, DateRange, DayPicker } from 'react-day-picker';
+
 import 'react-day-picker/dist/style.css';
 
 import { StyledDateRange } from 'teleport/components/DayPicker/Shared';
diff --git a/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.story.tsx b/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.story.tsx
index 1b83086c75621..14812b2384ac5 100644
--- a/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.story.tsx
+++ b/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.story.tsx
@@ -18,9 +18,8 @@
 
 import { useState } from 'react';
 
-import RangePicker from './EventRangePicker';
-
 import { EventRange, getRangeOptions } from '.';
+import RangePicker from './EventRangePicker';
 
 export default {
   title: 'Teleport/RangePicker',
diff --git a/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.tsx b/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.tsx
index 3c33e2a383209..9ba01ee685185 100644
--- a/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.tsx
+++ b/web/packages/teleport/src/components/EventRangePicker/EventRangePicker.tsx
@@ -18,16 +18,17 @@
 
 import { useState } from 'react';
 import { components, ValueContainerProps } from 'react-select';
-import 'react-day-picker/dist/style.css';
-import { Text, Box } from 'design';
-import Dialog from 'design/DialogConfirmation';
-import { displayDate } from 'design/datetime';
-import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
 
-import Select, { Option } from 'shared/components/Select';
+import 'react-day-picker/dist/style.css';
 
 import styled from 'styled-components';
 
+import { Box, Text } from 'design';
+import { displayDate } from 'design/datetime';
+import Dialog from 'design/DialogConfirmation';
+import Select, { Option } from 'shared/components/Select';
+import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
+
 import { State } from 'teleport/Audit/useAuditEvents';
 
 import { CustomRange } from './Custom';
diff --git a/web/packages/teleport/src/components/EventRangePicker/utils.ts b/web/packages/teleport/src/components/EventRangePicker/utils.ts
index 49a194ca977be..1b4c8d200db15 100644
--- a/web/packages/teleport/src/components/EventRangePicker/utils.ts
+++ b/web/packages/teleport/src/components/EventRangePicker/utils.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { startOfDay, endOfDay, subDays } from 'date-fns';
+import { endOfDay, startOfDay, subDays } from 'date-fns';
 
 export function getRangeOptions(): EventRange[] {
   return [
diff --git a/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.test.tsx b/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.test.tsx
index c3d78cd75548b..a0a6b2fc09a5b 100644
--- a/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.test.tsx
+++ b/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.test.tsx
@@ -17,14 +17,13 @@
  */
 
 import { MemoryRouter } from 'react-router';
-import { render, screen } from 'design/utils/testing';
 
-import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
+import { render, screen } from 'design/utils/testing';
 
-import { ContextProvider } from 'teleport/index';
-import cfg from 'teleport/config';
 import { clusters } from 'teleport/Clusters/fixtures';
-
+import cfg from 'teleport/config';
+import { ContextProvider } from 'teleport/index';
+import { createTeleportContext, getAcl } from 'teleport/mocks/contexts';
 import { storageService } from 'teleport/services/storageService';
 
 import { ExternalAuditStorageCta } from './ExternalAuditStorageCta';
diff --git a/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.tsx b/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.tsx
index f478947ad891a..77c6e182e246a 100644
--- a/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.tsx
+++ b/web/packages/teleport/src/components/ExternalAuditStorageCta/ExternalAuditStorageCta.tsx
@@ -16,24 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import Box from 'design/Box';
-import * as Icons from 'design/Icon';
 import { ButtonPrimary, ButtonSecondary } from 'design/Button';
 import Flex from 'design/Flex';
+import * as Icons from 'design/Icon';
 import Text from 'design/Text';
-
 import { HoverTooltip } from 'design/Tooltip';
 
 import cfg from 'teleport/config';
 import { IntegrationKind } from 'teleport/services/integrations';
-import useTeleport from 'teleport/useTeleport';
-
-import { CtaEvent } from 'teleport/services/userEvent';
-
 import { storageService } from 'teleport/services/storageService';
+import { CtaEvent } from 'teleport/services/userEvent';
+import useTeleport from 'teleport/useTeleport';
 
 import { ButtonLockedFeature } from '../ButtonLockedFeature';
 
diff --git a/web/packages/teleport/src/components/FormLogin/FormLogin.test.tsx b/web/packages/teleport/src/components/FormLogin/FormLogin.test.tsx
index aa2da17755745..5b50d3c7818ff 100644
--- a/web/packages/teleport/src/components/FormLogin/FormLogin.test.tsx
+++ b/web/packages/teleport/src/components/FormLogin/FormLogin.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import history from 'teleport/services/history';
 
diff --git a/web/packages/teleport/src/components/FormLogin/FormLogin.tsx b/web/packages/teleport/src/components/FormLogin/FormLogin.tsx
index b9fc58434d9bc..3b4963f29f356 100644
--- a/web/packages/teleport/src/components/FormLogin/FormLogin.tsx
+++ b/web/packages/teleport/src/components/FormLogin/FormLogin.tsx
@@ -16,44 +16,43 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import styled from 'styled-components';
+
 import {
-  Card,
-  Text,
-  Flex,
+  Box,
+  Button,
   ButtonLink,
   ButtonPrimary,
-  Box,
-  ButtonText,
   ButtonSecondary,
-  Button,
+  ButtonText,
+  Card,
+  Flex,
+  Text,
 } from 'design';
 import * as Alerts from 'design/Alert';
-import {
-  AuthProvider,
-  Auth2faType,
-  PreferredMfaType,
-  PrimaryAuthType,
-} from 'shared/services';
-import { useAttempt, useRefAutoFocus } from 'shared/hooks';
-import Validation, { Validator } from 'shared/components/Validation';
+import { StepComponentProps, StepSlider } from 'design/StepSlider';
+import { P } from 'design/Text/Text';
 import FieldInput from 'shared/components/FieldInput';
 import { FieldSelect } from 'shared/components/FieldSelect';
+import Validation, { Validator } from 'shared/components/Validation';
 import {
-  requiredToken,
   requiredField,
+  requiredToken,
 } from 'shared/components/Validation/rules';
+import { useAttempt, useRefAutoFocus } from 'shared/hooks';
+import {
+  Auth2faType,
+  AuthProvider,
+  PreferredMfaType,
+  PrimaryAuthType,
+} from 'shared/services';
 import createMfaOptions, { MfaOption } from 'shared/utils/createMfaOptions';
-import { StepSlider, StepComponentProps } from 'design/StepSlider';
-
-import { P } from 'design/Text/Text';
 
 import { UserCredentials } from 'teleport/services/auth';
 import history from 'teleport/services/history';
 
 import { PasskeyIcons } from '../Passkeys';
-
 import SSOButtonList from './SsoButtons';
 
 const allAuthTypes: PrimaryAuthType[] = ['passwordless', 'sso', 'local'];
diff --git a/web/packages/teleport/src/components/FormLogin/SsoButtons.tsx b/web/packages/teleport/src/components/FormLogin/SsoButtons.tsx
index a57cb3be1e497..4e3d4338e31ef 100644
--- a/web/packages/teleport/src/components/FormLogin/SsoButtons.tsx
+++ b/web/packages/teleport/src/components/FormLogin/SsoButtons.tsx
@@ -17,6 +17,7 @@
  */
 
 import { forwardRef } from 'react';
+
 import { Flex, Text } from 'design';
 import ButtonSso, { guessProviderType } from 'shared/components/ButtonSso';
 import { AuthProvider } from 'shared/services';
diff --git a/web/packages/teleport/src/components/FormLogin/index.ts b/web/packages/teleport/src/components/FormLogin/index.ts
index 447367bd552b9..0466b1cc850fd 100644
--- a/web/packages/teleport/src/components/FormLogin/index.ts
+++ b/web/packages/teleport/src/components/FormLogin/index.ts
@@ -17,4 +17,5 @@
  */
 
 import FormLogin from './FormLogin';
+
 export default FormLogin;
diff --git a/web/packages/teleport/src/components/HeadlessRequestDialog/HeadlessRequestDialog.tsx b/web/packages/teleport/src/components/HeadlessRequestDialog/HeadlessRequestDialog.tsx
index 423a9ee6699f6..f13dfbbd505e8 100644
--- a/web/packages/teleport/src/components/HeadlessRequestDialog/HeadlessRequestDialog.tsx
+++ b/web/packages/teleport/src/components/HeadlessRequestDialog/HeadlessRequestDialog.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonPrimary, ButtonSecondary, Text } from 'design';
+import { Danger } from 'design/Alert';
 import Dialog, {
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from 'design/Dialog';
-import { Danger } from 'design/Alert';
-import { ButtonPrimary, ButtonSecondary, Text } from 'design';
 
 export default function HeadlessRequestDialog({
   ipAddress,
diff --git a/web/packages/teleport/src/components/InputSearch/InputSearch.jsx b/web/packages/teleport/src/components/InputSearch/InputSearch.jsx
index 88e6d5e7345d0..b44ddfa9ed614 100644
--- a/web/packages/teleport/src/components/InputSearch/InputSearch.jsx
+++ b/web/packages/teleport/src/components/InputSearch/InputSearch.jsx
@@ -17,9 +17,10 @@
  */
 
 import { Component } from 'react';
-import { debounce } from 'shared/utils/highbar';
 import styled from 'styled-components';
-import { height, space, color } from 'design/system';
+
+import { color, height, space } from 'design/system';
+import { debounce } from 'shared/utils/highbar';
 
 class InputSearch extends Component {
   constructor(props) {
diff --git a/web/packages/teleport/src/components/InputSearch/index.js b/web/packages/teleport/src/components/InputSearch/index.js
index 521558aa44671..cb450973c47f7 100644
--- a/web/packages/teleport/src/components/InputSearch/index.js
+++ b/web/packages/teleport/src/components/InputSearch/index.js
@@ -17,4 +17,5 @@
  */
 
 import InputSearch from './InputSearch';
+
 export default InputSearch;
diff --git a/web/packages/teleport/src/components/LabelSelector/LabelSelector.test.tsx b/web/packages/teleport/src/components/LabelSelector/LabelSelector.test.tsx
index aed64b5a02616..33a1426090423 100644
--- a/web/packages/teleport/src/components/LabelSelector/LabelSelector.test.tsx
+++ b/web/packages/teleport/src/components/LabelSelector/LabelSelector.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, fireEvent } from 'design/utils/testing';
+import { fireEvent, render, screen } from 'design/utils/testing';
 
 import { LabelSelector } from './LabelSelector';
 
diff --git a/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx b/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx
index 4551d96a13a43..7c093bc709e78 100644
--- a/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx
+++ b/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx
@@ -19,9 +19,8 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 
-import { Box, Flex, Pill, Popover, Link, Text } from 'design';
+import { Box, Flex, Link, Pill, Popover, Text } from 'design';
 import { Info, Warning } from 'design/Icon';
-
 import { useClickOutside } from 'shared/hooks/useClickOutside';
 import { useEscape } from 'shared/hooks/useEscape';
 
diff --git a/web/packages/teleport/src/components/LabelsInput/LabelsInput.story.tsx b/web/packages/teleport/src/components/LabelsInput/LabelsInput.story.tsx
index 257b3e8ac4286..0fdbbfcb3cd05 100644
--- a/web/packages/teleport/src/components/LabelsInput/LabelsInput.story.tsx
+++ b/web/packages/teleport/src/components/LabelsInput/LabelsInput.story.tsx
@@ -17,10 +17,11 @@
  */
 
 import { useState } from 'react';
-import Validation from 'shared/components/Validation';
+
 import { ButtonSecondary } from 'design/Button';
+import Validation from 'shared/components/Validation';
 
-import { LabelsInput, Label } from './LabelsInput';
+import { Label, LabelsInput } from './LabelsInput';
 
 export default {
   title: 'Teleport/LabelsInput',
diff --git a/web/packages/teleport/src/components/LabelsInput/LabelsInput.test.tsx b/web/packages/teleport/src/components/LabelsInput/LabelsInput.test.tsx
index 8f8c07ea95d0c..1a3718b0faa1a 100644
--- a/web/packages/teleport/src/components/LabelsInput/LabelsInput.test.tsx
+++ b/web/packages/teleport/src/components/LabelsInput/LabelsInput.test.tsx
@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, fireEvent, screen } from 'design/utils/testing';
-import Validation, { Validator } from 'shared/components/Validation';
 import { act } from '@testing-library/react';
 
+import { fireEvent, render, screen } from 'design/utils/testing';
+import Validation, { Validator } from 'shared/components/Validation';
+
 import { Label, LabelsInput, LabelsRule, nonEmptyLabels } from './LabelsInput';
 import {
-  Default,
+  AtLeastOneRequired,
   Custom,
+  Default,
   Disabled,
-  AtLeastOneRequired,
 } from './LabelsInput.story';
 
 test('defaults, with empty labels', async () => {
diff --git a/web/packages/teleport/src/components/LabelsInput/LabelsInput.tsx b/web/packages/teleport/src/components/LabelsInput/LabelsInput.tsx
index eee6025249817..6c58424c0d905 100644
--- a/web/packages/teleport/src/components/LabelsInput/LabelsInput.tsx
+++ b/web/packages/teleport/src/components/LabelsInput/LabelsInput.tsx
@@ -17,12 +17,15 @@
  */
 
 import styled from 'styled-components';
-import { Flex, Box, ButtonSecondary, ButtonIcon } from 'design';
+
+import { Box, ButtonIcon, ButtonSecondary, Flex } from 'design';
+import * as Icons from 'design/Icon';
+import { inputGeometry } from 'design/Input/Input';
 import FieldInput from 'shared/components/FieldInput';
 import {
-  Validator,
   useRule,
   useValidation,
+  Validator,
 } from 'shared/components/Validation';
 import {
   precomputed,
@@ -30,8 +33,6 @@ import {
   Rule,
   ValidationResult,
 } from 'shared/components/Validation/rules';
-import * as Icons from 'design/Icon';
-import { inputGeometry } from 'design/Input/Input';
 
 export type Label = {
   name: string;
diff --git a/web/packages/teleport/src/components/Layout/Layout.tsx b/web/packages/teleport/src/components/Layout/Layout.tsx
index 7ba7e541bd49a..050195a5d7373 100644
--- a/web/packages/teleport/src/components/Layout/Layout.tsx
+++ b/web/packages/teleport/src/components/Layout/Layout.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Flex, H1 } from 'design';
 import { alignItems, space } from 'design/system';
 
diff --git a/web/packages/teleport/src/components/LogoHero/LogoHero.tsx b/web/packages/teleport/src/components/LogoHero/LogoHero.tsx
index a0e392c74bfce..2083a2febb131 100644
--- a/web/packages/teleport/src/components/LogoHero/LogoHero.tsx
+++ b/web/packages/teleport/src/components/LogoHero/LogoHero.tsx
@@ -17,13 +17,14 @@
  */
 
 import { useTheme } from 'styled-components';
-import Image from 'design/Image';
-import AGPLLogoLight from 'design/assets/images/agpl-light.svg';
+
 import AGPLLogoDark from 'design/assets/images/agpl-dark.svg';
-import CommunityLogoLight from 'design/assets/images/community-light.svg';
+import AGPLLogoLight from 'design/assets/images/agpl-light.svg';
 import CommunityLogoDark from 'design/assets/images/community-dark.svg';
-import EnterpriseLogoLight from 'design/assets/images/enterprise-light.svg';
+import CommunityLogoLight from 'design/assets/images/community-light.svg';
 import EnterpriseLogoDark from 'design/assets/images/enterprise-dark.svg';
+import EnterpriseLogoLight from 'design/assets/images/enterprise-light.svg';
+import Image from 'design/Image';
 
 import cfg, { TeleportEdition } from 'teleport/config';
 
diff --git a/web/packages/teleport/src/components/MfaDeviceList/MfaDeviceList.tsx b/web/packages/teleport/src/components/MfaDeviceList/MfaDeviceList.tsx
index f4ec3dc873176..c6b9d50320893 100644
--- a/web/packages/teleport/src/components/MfaDeviceList/MfaDeviceList.tsx
+++ b/web/packages/teleport/src/components/MfaDeviceList/MfaDeviceList.tsx
@@ -17,10 +17,11 @@
  */
 
 import styled from 'styled-components';
+
 import { ButtonBorder, Text } from 'design';
 import Table, { Cell } from 'design/DataTable';
-import { dateMatcher } from 'design/utils/match';
 import { displayDate } from 'design/datetime';
+import { dateMatcher } from 'design/utils/match';
 
 import { MfaDevice } from 'teleport/services/mfa/types';
 
diff --git a/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/RemoveDialog.tsx b/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/RemoveDialog.tsx
index 259947c55f91a..20bc0955f7d26 100644
--- a/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/RemoveDialog.tsx
+++ b/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/RemoveDialog.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonSecondary, ButtonWarning, P1, Text } from 'design';
+import { ButtonSecondary, ButtonWarning, H2, P1, Text } from 'design';
 import { Danger } from 'design/Alert';
 import Dialog, { DialogContent, DialogFooter } from 'design/DialogConfirmation';
 import useAttempt from 'shared/hooks/useAttemptNext';
-import { H2 } from 'design';
 
 export default function RemoveDialog(props: Props) {
   const { name, onClose, onRemove } = props;
diff --git a/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/index.ts b/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/index.ts
index a35a82d9279d9..3009cb11320f1 100644
--- a/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/index.ts
+++ b/web/packages/teleport/src/components/MfaDeviceList/RemoveDialog/index.ts
@@ -17,4 +17,5 @@
  */
 
 import RemoveDialog from './RemoveDialog';
+
 export default RemoveDialog;
diff --git a/web/packages/teleport/src/components/NewMfaDeviceForm/NewMfaDeviceForm.tsx b/web/packages/teleport/src/components/NewMfaDeviceForm/NewMfaDeviceForm.tsx
index 3c13db00c08d8..393bad095077b 100644
--- a/web/packages/teleport/src/components/NewMfaDeviceForm/NewMfaDeviceForm.tsx
+++ b/web/packages/teleport/src/components/NewMfaDeviceForm/NewMfaDeviceForm.tsx
@@ -17,20 +17,19 @@
  */
 
 import React, { useState } from 'react';
+
 import { Box, ButtonPrimary, Flex, Image, Text } from 'design';
 import { Danger } from 'design/Alert';
 import { ArrowBack } from 'design/Icon';
 import { RadioGroup } from 'design/RadioGroup';
+import { StepHeader } from 'design/StepSlider';
 import FieldInput from 'shared/components/FieldInput';
 import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import createMfaOptions from 'shared/utils/createMfaOptions';
 import { useRefAutoFocus } from 'shared/hooks';
-import { Auth2faType } from 'shared/services';
-
 import { Attempt } from 'shared/hooks/useAttemptNext';
-
-import { StepHeader } from 'design/StepSlider';
+import { Auth2faType } from 'shared/services';
+import createMfaOptions from 'shared/utils/createMfaOptions';
 
 import { OnboardCard } from 'teleport/components/Onboard';
 import { PasskeyIcons } from 'teleport/components/Passkeys';
diff --git a/web/packages/teleport/src/components/NodeList/NodeList.tsx b/web/packages/teleport/src/components/NodeList/NodeList.tsx
index 70df17053cfb9..8d4ea8d66757e 100644
--- a/web/packages/teleport/src/components/NodeList/NodeList.tsx
+++ b/web/packages/teleport/src/components/NodeList/NodeList.tsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+
 import Table, { Cell, ClickableLabelCell } from 'design/DataTable';
 import { FetchStatus, SortType } from 'design/DataTable/types';
 import {
@@ -25,11 +26,10 @@ import {
   MenuLogin,
 } from 'shared/components/MenuLogin';
 
-import { Node } from 'teleport/services/nodes';
-import { ResourceLabel, ResourceFilter } from 'teleport/services/agents';
-import { ServersideSearchPanelWithPageIndicator } from 'teleport/components/ServersideSearchPanel';
-
 import type { PageIndicators } from 'teleport/components/hooks/useServersidePagination';
+import { ServersideSearchPanelWithPageIndicator } from 'teleport/components/ServersideSearchPanel';
+import { ResourceFilter, ResourceLabel } from 'teleport/services/agents';
+import { Node } from 'teleport/services/nodes';
 
 export function NodeList(props: {
   nodes: Node[];
diff --git a/web/packages/teleport/src/components/Onboard/WelcomeWrapper.story.tsx b/web/packages/teleport/src/components/Onboard/WelcomeWrapper.story.tsx
index 200ab8ba8caca..5489fceeda551 100644
--- a/web/packages/teleport/src/components/Onboard/WelcomeWrapper.story.tsx
+++ b/web/packages/teleport/src/components/Onboard/WelcomeWrapper.story.tsx
@@ -18,8 +18,8 @@
 
 import { Text } from 'design';
 
-import { WelcomeWrapper } from './WelcomeWrapper';
 import { OnboardCard } from './OnboardCard';
+import { WelcomeWrapper } from './WelcomeWrapper';
 
 export default {
   title: 'teleport/Onboard',
diff --git a/web/packages/teleport/src/components/Passkeys/PasskeyIcons.tsx b/web/packages/teleport/src/components/Passkeys/PasskeyIcons.tsx
index 41f61a216913d..ec155298e04d9 100644
--- a/web/packages/teleport/src/components/Passkeys/PasskeyIcons.tsx
+++ b/web/packages/teleport/src/components/Passkeys/PasskeyIcons.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import * as Icon from 'design/Icon';
 
 export function PasskeyIcons() {
diff --git a/web/packages/teleport/src/components/ReAuthenticate/ReAuthenticate.tsx b/web/packages/teleport/src/components/ReAuthenticate/ReAuthenticate.tsx
index 6dfc8a0f96f3c..a3961cf7fc167 100644
--- a/web/packages/teleport/src/components/ReAuthenticate/ReAuthenticate.tsx
+++ b/web/packages/teleport/src/components/ReAuthenticate/ReAuthenticate.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import React, { useEffect, useState } from 'react';
+
 import {
   Box,
   ButtonPrimary,
@@ -31,7 +33,6 @@ import Dialog, {
   DialogHeader,
   DialogTitle,
 } from 'design/Dialog';
-import React, { useEffect, useState } from 'react';
 import FieldInput from 'shared/components/FieldInput';
 import FieldSelect from 'shared/components/FieldSelect';
 import Validation, { Validator } from 'shared/components/Validation';
diff --git a/web/packages/teleport/src/components/ReAuthenticate/useReAuthenticate.ts b/web/packages/teleport/src/components/ReAuthenticate/useReAuthenticate.ts
index ed8c73f3fe6da..1e4ac68c6860d 100644
--- a/web/packages/teleport/src/components/ReAuthenticate/useReAuthenticate.ts
+++ b/web/packages/teleport/src/components/ReAuthenticate/useReAuthenticate.ts
@@ -17,11 +17,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
+
 import { Attempt, makeEmptyAttempt, useAsync } from 'shared/hooks/useAsync';
 
 import auth from 'teleport/services/auth';
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
-
 import {
   DeviceType,
   DeviceUsage,
diff --git a/web/packages/teleport/src/components/RecoveryCodes/RecoveryCodes.tsx b/web/packages/teleport/src/components/RecoveryCodes/RecoveryCodes.tsx
index d088a3d30450e..8efb2a34c4caa 100644
--- a/web/packages/teleport/src/components/RecoveryCodes/RecoveryCodes.tsx
+++ b/web/packages/teleport/src/components/RecoveryCodes/RecoveryCodes.tsx
@@ -18,6 +18,7 @@
 
 import { useRef } from 'react';
 import styled from 'styled-components';
+
 import { Box, ButtonPrimary, Card, Flex, Text } from 'design';
 import { copyToClipboard } from 'design/utils/copyToClipboard';
 import selectElementContent from 'design/utils/selectElementContent';
diff --git a/web/packages/teleport/src/components/ResourceEditor/ResourceEditor.jsx b/web/packages/teleport/src/components/ResourceEditor/ResourceEditor.jsx
index 9c399df671ac6..5695704a30f62 100644
--- a/web/packages/teleport/src/components/ResourceEditor/ResourceEditor.jsx
+++ b/web/packages/teleport/src/components/ResourceEditor/ResourceEditor.jsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState } from 'react';
 import PropTypes from 'prop-types';
-import Dialog, { DialogHeader, DialogTitle } from 'design/Dialog';
+import { useState } from 'react';
+
 import {
   Box,
   ButtonBorder,
@@ -29,8 +29,9 @@ import {
   LabelInput,
   Text,
 } from 'design';
-import TextEditor from 'shared/components/TextEditor';
 import * as Alerts from 'design/Alert';
+import Dialog, { DialogHeader, DialogTitle } from 'design/Dialog';
+import TextEditor from 'shared/components/TextEditor';
 import { useAttempt } from 'shared/hooks';
 
 import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
diff --git a/web/packages/teleport/src/components/Router/Router.jsx b/web/packages/teleport/src/components/Router/Router.jsx
index 00ab4c7428e56..3b5f65460064e 100644
--- a/web/packages/teleport/src/components/Router/Router.jsx
+++ b/web/packages/teleport/src/components/Router/Router.jsx
@@ -18,13 +18,14 @@
 
 import { useEffect } from 'react';
 import {
-  useRouteMatch,
-  useParams,
+  Router,
   useLocation,
+  useParams,
+  useRouteMatch,
   withRouter,
-  Router,
 } from 'react-router';
 import * as RouterDOM from 'react-router-dom';
+
 import { NotFound } from 'design/CardError';
 
 const NoMatch = () => (
diff --git a/web/packages/teleport/src/components/Router/index.js b/web/packages/teleport/src/components/Router/index.js
index 7a54ca3dae209..b6100c95d298a 100644
--- a/web/packages/teleport/src/components/Router/index.js
+++ b/web/packages/teleport/src/components/Router/index.js
@@ -17,15 +17,15 @@
  */
 
 import {
-  useRouteMatch,
-  useParams,
-  useLocation,
-  withRouter,
-  Redirect,
-  Router,
   NavLink,
+  Redirect,
   Route,
+  Router,
   Switch,
+  useLocation,
+  useParams,
+  useRouteMatch,
+  withRouter,
 } from './Router';
 
 export {
diff --git a/web/packages/teleport/src/components/SelectFilters/Pager.tsx b/web/packages/teleport/src/components/SelectFilters/Pager.tsx
index d006f4fc270c2..f9e3c424df369 100644
--- a/web/packages/teleport/src/components/SelectFilters/Pager.tsx
+++ b/web/packages/teleport/src/components/SelectFilters/Pager.tsx
@@ -17,8 +17,9 @@
  */
 
 import styled from 'styled-components';
+
+import { Flex, Text } from 'design';
 import { CircleArrowLeft, CircleArrowRight } from 'design/Icon';
-import { Text, Flex } from 'design';
 
 export default function Pager({
   startFrom = 0,
diff --git a/web/packages/teleport/src/components/SelectFilters/SelectFilters.tsx b/web/packages/teleport/src/components/SelectFilters/SelectFilters.tsx
index 2453ebc12b645..3a0a911686daa 100644
--- a/web/packages/teleport/src/components/SelectFilters/SelectFilters.tsx
+++ b/web/packages/teleport/src/components/SelectFilters/SelectFilters.tsx
@@ -16,21 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useRef, useEffect, useMemo } from 'react';
-import styled from 'styled-components';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { components } from 'react-select';
-import { Flex, Text, ButtonBorder, ButtonIcon, Box } from 'design';
-import { Cross, Add } from 'design/Icon';
+import styled from 'styled-components';
+
+import { Box, ButtonBorder, ButtonIcon, Flex, Text } from 'design';
+import { Add, Cross } from 'design/Icon';
 import Select, {
-  Option as BaseOption,
   ActionMeta,
+  Option as BaseOption,
 } from 'shared/components/Select';
 
 import { makeLabelTag } from 'teleport/components/formatters';
 import { Filter } from 'teleport/types';
 
-import usePages from './usePages';
 import Pager from './Pager';
+import usePages from './usePages';
 
 export default function SelectFilters({
   applyFilters,
diff --git a/web/packages/teleport/src/components/SelectFilters/index.ts b/web/packages/teleport/src/components/SelectFilters/index.ts
index 71b7671631d85..a7898f1037387 100644
--- a/web/packages/teleport/src/components/SelectFilters/index.ts
+++ b/web/packages/teleport/src/components/SelectFilters/index.ts
@@ -17,4 +17,5 @@
  */
 
 import SelectFilters from './SelectFilters';
+
 export default SelectFilters;
diff --git a/web/packages/teleport/src/components/SelectFilters/usePages.ts b/web/packages/teleport/src/components/SelectFilters/usePages.ts
index 83808ddc8011c..03ec3e3d6479c 100644
--- a/web/packages/teleport/src/components/SelectFilters/usePages.ts
+++ b/web/packages/teleport/src/components/SelectFilters/usePages.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 export default function usePages({ pageSize, data }) {
   const [startFrom, setFrom] = useState(0);
diff --git a/web/packages/teleport/src/components/ServersideSearchPanel/SearchInput.tsx b/web/packages/teleport/src/components/ServersideSearchPanel/SearchInput.tsx
index 737d2d821d772..bf8e28adb5ee1 100644
--- a/web/packages/teleport/src/components/ServersideSearchPanel/SearchInput.tsx
+++ b/web/packages/teleport/src/components/ServersideSearchPanel/SearchInput.tsx
@@ -20,12 +20,12 @@ import React, { SetStateAction } from 'react';
 import styled from 'styled-components';
 
 import {
+  color,
+  ColorProps,
   height,
   HeightProps,
   space,
   SpaceProps,
-  color,
-  ColorProps,
 } from 'design/system';
 
 // Taken from design.dataTable.InputSearch; will be modified later.
diff --git a/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanel.tsx b/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanel.tsx
index 357f9753ca2f3..7801f85f6e72a 100644
--- a/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanel.tsx
+++ b/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanel.tsx
@@ -17,12 +17,11 @@
  */
 
 import { Flex } from 'design';
-
 import { AdvancedSearchToggle } from 'shared/components/AdvancedSearchToggle';
 
 import useServersideSearchPanel, {
-  SearchPanelState,
   HookProps,
+  SearchPanelState,
 } from 'teleport/components/ServersideSearchPanel/useServerSideSearchPanel';
 
 import { SearchInput } from './SearchInput';
diff --git a/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanelWithPageIndicator.tsx b/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanelWithPageIndicator.tsx
index c4f48ae7fee68..0710200b363fd 100644
--- a/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanelWithPageIndicator.tsx
+++ b/web/packages/teleport/src/components/ServersideSearchPanel/ServersideSearchPanelWithPageIndicator.tsx
@@ -21,10 +21,10 @@ import { PageIndicatorText } from 'design/DataTable/Pager/PageIndicatorText';
 
 import { PageIndicators } from 'teleport/components/hooks/useServersidePagination';
 
+import { SearchPanel } from './ServersideSearchPanel';
 import useServersideSearchPanel, {
   HookProps,
 } from './useServerSideSearchPanel';
-import { SearchPanel } from './ServersideSearchPanel';
 
 interface ComponentProps {
   pageIndicators: PageIndicators;
diff --git a/web/packages/teleport/src/components/ServersideSearchPanel/useServerSideSearchPanel.ts b/web/packages/teleport/src/components/ServersideSearchPanel/useServerSideSearchPanel.ts
index 844c55c3141f9..33aa1f9a36564 100644
--- a/web/packages/teleport/src/components/ServersideSearchPanel/useServerSideSearchPanel.ts
+++ b/web/packages/teleport/src/components/ServersideSearchPanel/useServerSideSearchPanel.ts
@@ -18,9 +18,8 @@
 
 import { useEffect, useState } from 'react';
 
-import { ResourceFilter } from 'teleport/services/agents';
-
 import { decodeUrlQueryParam } from 'teleport/components/hooks/useUrlFiltering';
+import { ResourceFilter } from 'teleport/services/agents';
 
 export default function useServersideSearchPanel({
   params,
diff --git a/web/packages/teleport/src/components/TabIcon/TabIcon.tsx b/web/packages/teleport/src/components/TabIcon/TabIcon.tsx
index 0d7101714c96a..1790a19bcb2ca 100644
--- a/web/packages/teleport/src/components/TabIcon/TabIcon.tsx
+++ b/web/packages/teleport/src/components/TabIcon/TabIcon.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { H3 } from 'design';
 
 export default function TabIcon({ Icon, ...props }: Props) {
diff --git a/web/packages/teleport/src/components/TabIcon/index.ts b/web/packages/teleport/src/components/TabIcon/index.ts
index c237a5aba599b..fd16d4020b275 100644
--- a/web/packages/teleport/src/components/TabIcon/index.ts
+++ b/web/packages/teleport/src/components/TabIcon/index.ts
@@ -17,4 +17,5 @@
  */
 
 import TabIcon from './TabIcon';
+
 export { TabIcon };
diff --git a/web/packages/teleport/src/components/Tabs/Tabs.story.tsx b/web/packages/teleport/src/components/Tabs/Tabs.story.tsx
index 81427eea19e1b..294a1f8b0ea0d 100644
--- a/web/packages/teleport/src/components/Tabs/Tabs.story.tsx
+++ b/web/packages/teleport/src/components/Tabs/Tabs.story.tsx
@@ -17,7 +17,6 @@
  */
 
 import { TextSelectCopyMulti } from '../TextSelectCopy';
-
 import { Tabs } from './Tabs';
 
 export default {
diff --git a/web/packages/teleport/src/components/Tabs/Tabs.tsx b/web/packages/teleport/src/components/Tabs/Tabs.tsx
index ec97f26920eba..d3016fcc14d5e 100644
--- a/web/packages/teleport/src/components/Tabs/Tabs.tsx
+++ b/web/packages/teleport/src/components/Tabs/Tabs.tsx
@@ -17,6 +17,7 @@
  */
 
 import { Fragment, useState } from 'react';
+
 import { Box, Flex } from 'design';
 
 export function Tabs({ tabs }: Props) {
diff --git a/web/packages/teleport/src/components/Tabs/index.ts b/web/packages/teleport/src/components/Tabs/index.ts
index 3befa5c83c008..dea580671ac29 100644
--- a/web/packages/teleport/src/components/Tabs/index.ts
+++ b/web/packages/teleport/src/components/Tabs/index.ts
@@ -17,4 +17,5 @@
  */
 
 import { Tabs } from './Tabs';
+
 export { Tabs };
diff --git a/web/packages/teleport/src/components/TdpClientCanvas/TdpClientCanvas.tsx b/web/packages/teleport/src/components/TdpClientCanvas/TdpClientCanvas.tsx
index de20cb6e79517..c1d402447e606 100644
--- a/web/packages/teleport/src/components/TdpClientCanvas/TdpClientCanvas.tsx
+++ b/web/packages/teleport/src/components/TdpClientCanvas/TdpClientCanvas.tsx
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { memo, useEffect, useRef } from 'react';
+import { memo, useEffect, useRef, type CSSProperties } from 'react';
+
 import { DebouncedFunc } from 'shared/utils/highbar';
 
-import { TdpClientEvent, TdpClient } from 'teleport/lib/tdp';
+import { TdpClient, TdpClientEvent } from 'teleport/lib/tdp';
 import { BitmapFrame } from 'teleport/lib/tdp/client';
-
-import type { CSSProperties } from 'react';
 import type {
-  PngFrame,
   ClientScreenSpec,
   ClipboardData,
+  PngFrame,
 } from 'teleport/lib/tdp/codec';
 
 function TdpClientCanvas(props: Props) {
diff --git a/web/packages/teleport/src/components/TextSelectCopy/index.ts b/web/packages/teleport/src/components/TextSelectCopy/index.ts
index b105bde1b7f59..5f929726aae16 100644
--- a/web/packages/teleport/src/components/TextSelectCopy/index.ts
+++ b/web/packages/teleport/src/components/TextSelectCopy/index.ts
@@ -20,6 +20,7 @@ import {
   TextSelectCopy,
   TextSelectCopyMulti,
 } from 'shared/components/TextSelectCopy';
+
 /**
  * @deprecated Import from `shared/TextSelectCopy`.
  */
diff --git a/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.story.tsx b/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.story.tsx
index f653d9b43f0be..d2921b0bde33c 100644
--- a/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.story.tsx
+++ b/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.story.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
 import { ToolTipBadge } from './ToolTipBadge';
diff --git a/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.tsx b/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.tsx
index 850ded24b946a..617cd8fe051af 100644
--- a/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.tsx
+++ b/web/packages/teleport/src/components/ToolTipBadge/ToolTipBadge.tsx
@@ -18,7 +18,8 @@
 
 import React, { PropsWithChildren, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
-import { Popover, Box } from 'design';
+
+import { Box, Popover } from 'design';
 
 type Props = {
   borderRadius?: number;
diff --git a/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.story.tsx b/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.story.tsx
index c13b2b59ae660..7277b5d9b0de4 100644
--- a/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.story.tsx
+++ b/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.story.tsx
@@ -17,9 +17,10 @@
  */
 
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
-import { ToolTipNoPermBadge, BadgeTitle } from './ToolTipNoPermBadge';
+import { BadgeTitle, ToolTipNoPermBadge } from './ToolTipNoPermBadge';
 
 export default {
   title: 'Teleport/ToolTip',
diff --git a/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.test.tsx b/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.test.tsx
index dad665b8343ae..9615a21b10bf9 100644
--- a/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.test.tsx
+++ b/web/packages/teleport/src/components/ToolTipNoPermBadge/ToolTipNoPermBadge.test.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { render, screen, userEvent } from 'design/utils/testing';
 
 import { BadgeTitle, ToolTipNoPermBadge } from './ToolTipNoPermBadge';
diff --git a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.story.tsx b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.story.tsx
index 7b52fe6a1e612..bada23f611eb3 100644
--- a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.story.tsx
+++ b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.story.tsx
@@ -17,13 +17,14 @@
  */
 
 import { MemoryRouter } from 'react-router';
+
 import * as Icons from 'design/Icon';
 
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import TeleportContext from 'teleport/teleportContext';
-import { makeUserContext } from 'teleport/services/user';
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 import { getOSSFeatures } from 'teleport/features';
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
+import { makeUserContext } from 'teleport/services/user';
+import TeleportContext from 'teleport/teleportContext';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 
 import { UserMenuNav } from './UserMenuNav';
 
diff --git a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.test.tsx b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.test.tsx
index b02f6fba17247..43f76e8c42ab7 100644
--- a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.test.tsx
+++ b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.test.tsx
@@ -19,23 +19,19 @@
 import { MemoryRouter } from 'react-router';
 
 import {
-  render as testingRender,
-  screen,
   fireEvent,
+  screen,
+  render as testingRender,
 } from 'design/utils/testing';
 
 import cfg from 'teleport/config';
-
-import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 import { getOSSFeatures } from 'teleport/features';
-
-import TeleportContextProvider from 'teleport/TeleportContextProvider';
-import TeleportContext from 'teleport/teleportContext';
-
+import { FeaturesContextProvider } from 'teleport/FeaturesContext';
 import { makeUserContext } from 'teleport/services/user';
-
-import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
+import TeleportContext from 'teleport/teleportContext';
+import TeleportContextProvider from 'teleport/TeleportContextProvider';
 import { makeTestUserContext } from 'teleport/User/testHelpers/makeTestUserContext';
+import { mockUserContextProviderWith } from 'teleport/User/testHelpers/mockUserContextWith';
 
 import { UserMenuNav } from './UserMenuNav';
 
diff --git a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.tsx b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.tsx
index 47a3db87846d9..e301b0772df91 100644
--- a/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.tsx
+++ b/web/packages/teleport/src/components/UserMenuNav/UserMenuNav.tsx
@@ -16,31 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useRef } from 'react';
+import { useRef, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
 
-import { Moon, Sun, ChevronDown, Logout as LogoutIcon } from 'design/Icon';
-import { Text, Box } from 'design';
-import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
+import { Box, Text } from 'design';
+import { ChevronDown, Logout as LogoutIcon, Moon, Sun } from 'design/Icon';
 import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
+import { useRefClickOutside } from 'shared/hooks/useRefClickOutside';
 
-import { getCurrentTheme, getNextTheme } from 'teleport/ThemeProvider';
-import { focusOutsideTarget } from 'teleport/lib/util/eventTarget';
-import session from 'teleport/services/websession';
-import { useFeatures } from 'teleport/FeaturesContext';
 import { useTeleport } from 'teleport';
-import { useUser } from 'teleport/User/UserContext';
 import {
   Dropdown,
+  DropdownDivider,
   DropdownItem,
   DropdownItemButton,
-  DropdownItemLink,
   DropdownItemIcon,
-  DropdownDivider,
-  STARTING_TRANSITION_DELAY,
+  DropdownItemLink,
   INCREMENT_TRANSITION_DELAY,
+  STARTING_TRANSITION_DELAY,
 } from 'teleport/components/Dropdown';
+import { useFeatures } from 'teleport/FeaturesContext';
+import { focusOutsideTarget } from 'teleport/lib/util/eventTarget';
+import session from 'teleport/services/websession';
+import { getCurrentTheme, getNextTheme } from 'teleport/ThemeProvider';
 import { DeviceTrustStatus } from 'teleport/TopBar/DeviceTrustStatus';
+import { useUser } from 'teleport/User/UserContext';
 
 interface UserMenuNavProps {
   username: string;
diff --git a/web/packages/teleport/src/components/Wizard/Navigation/Bullet.tsx b/web/packages/teleport/src/components/Wizard/Navigation/Bullet.tsx
index 22ff59a49c77d..4a376731aae68 100644
--- a/web/packages/teleport/src/components/Wizard/Navigation/Bullet.tsx
+++ b/web/packages/teleport/src/components/Wizard/Navigation/Bullet.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Flex from 'design/Flex';
 import styled from 'styled-components';
 
+import Flex from 'design/Flex';
+
 export type Props = {
   isDone?: boolean;
   isActive?: boolean;
diff --git a/web/packages/teleport/src/components/Wizard/Navigation/Navigation.story.tsx b/web/packages/teleport/src/components/Wizard/Navigation/Navigation.story.tsx
index 3c4f3dd6a792f..0544cfb2ea86f 100644
--- a/web/packages/teleport/src/components/Wizard/Navigation/Navigation.story.tsx
+++ b/web/packages/teleport/src/components/Wizard/Navigation/Navigation.story.tsx
@@ -19,7 +19,6 @@
 import { Box } from 'design';
 
 import { addIndexToViews } from '../flow';
-
 import { Navigation } from './Navigation';
 
 export default {
diff --git a/web/packages/teleport/src/components/Wizard/Navigation/Navigation.tsx b/web/packages/teleport/src/components/Wizard/Navigation/Navigation.tsx
index 1fe4ae34c68af..dfa074a78ba52 100644
--- a/web/packages/teleport/src/components/Wizard/Navigation/Navigation.tsx
+++ b/web/packages/teleport/src/components/Wizard/Navigation/Navigation.tsx
@@ -19,9 +19,8 @@
 import { Flex } from 'design';
 
 import { BaseView } from '../flow';
-
-import { StepTitle, StepsContainer } from './Shared';
 import { Bullet } from './Bullet';
+import { StepsContainer, StepTitle } from './Shared';
 import { StepList } from './StepList';
 
 export type StepIcon = {
diff --git a/web/packages/teleport/src/components/Wizard/Navigation/StepItem.tsx b/web/packages/teleport/src/components/Wizard/Navigation/StepItem.tsx
index 06bf434f56c98..8cfc7d468468b 100644
--- a/web/packages/teleport/src/components/Wizard/Navigation/StepItem.tsx
+++ b/web/packages/teleport/src/components/Wizard/Navigation/StepItem.tsx
@@ -17,13 +17,12 @@
  */
 
 import {
-  StepTitle,
   StepsContainer,
+  StepTitle,
 } from 'teleport/components/Wizard/Navigation';
 import { Bullet } from 'teleport/components/Wizard/Navigation/Bullet';
 
 import { BaseView } from '../flow';
-
 import { StepList } from './StepList';
 
 export function StepItem<T>(props: {
diff --git a/web/packages/teleport/src/components/Wizard/Navigation/StepList.tsx b/web/packages/teleport/src/components/Wizard/Navigation/StepList.tsx
index 9ca9d0c24c08c..748e2ea289d45 100644
--- a/web/packages/teleport/src/components/Wizard/Navigation/StepList.tsx
+++ b/web/packages/teleport/src/components/Wizard/Navigation/StepList.tsx
@@ -17,7 +17,6 @@
  */
 
 import { BaseView } from '../flow';
-
 import { StepItem } from './StepItem';
 
 interface StepListProps<T> {
diff --git a/web/packages/teleport/src/components/Wizard/flow.test.tsx b/web/packages/teleport/src/components/Wizard/flow.test.tsx
index 6bf12f13d34e9..a683391a5fdbf 100644
--- a/web/packages/teleport/src/components/Wizard/flow.test.tsx
+++ b/web/packages/teleport/src/components/Wizard/flow.test.tsx
@@ -18,8 +18,8 @@
 
 import { render, screen } from 'design/utils/testing';
 
-import { Navigation } from './Navigation';
 import { addIndexToViews, computeViewChildrenSize } from './flow';
+import { Navigation } from './Navigation';
 
 test('computeViewChildrenSize', async () => {
   const nestedViews = [
diff --git a/web/packages/teleport/src/components/hooks/useServersidePagination.ts b/web/packages/teleport/src/components/hooks/useServersidePagination.ts
index 6524095bb0f0d..ae05efe0bfe72 100644
--- a/web/packages/teleport/src/components/hooks/useServersidePagination.ts
+++ b/web/packages/teleport/src/components/hooks/useServersidePagination.ts
@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, Dispatch, SetStateAction } from 'react';
+import { Dispatch, SetStateAction, useState } from 'react';
+
 import { FetchStatus, Page } from 'design/DataTable/types';
 import useAttempt, { Attempt } from 'shared/hooks/useAttemptNext';
 
-import { ResourcesResponse, ResourceFilter } from 'teleport/services/agents';
 import { UrlResourcesParams } from 'teleport/config';
+import { ResourceFilter, ResourcesResponse } from 'teleport/services/agents';
 
 export function useServerSidePagination<T>({
   fetchFunc,
diff --git a/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.test.tsx b/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.test.tsx
index 01916c2cf1f2a..114bcf96a5fb3 100644
--- a/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.test.tsx
+++ b/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.test.tsx
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
-import renderHook from 'design/utils/renderHook';
+import { Router } from 'react-router';
+
 import { SortType } from 'design/DataTable/types';
+import renderHook from 'design/utils/renderHook';
 
 import { useUrlFiltering } from './useUrlFiltering';
 
diff --git a/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.ts b/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.ts
index 1154feaf9b344..d305cbd7d54fb 100644
--- a/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.ts
+++ b/web/packages/teleport/src/components/hooks/useUrlFiltering/useUrlFiltering.ts
@@ -18,13 +18,13 @@
 
 import { useMemo, useState } from 'react';
 import { useLocation } from 'react-router';
-import { SortType } from 'design/DataTable/types';
 
-import { makeAdvancedSearchQueryForLabel } from 'shared/utils/advancedSearchLabelQuery';
+import { SortType } from 'design/DataTable/types';
 import { IncludedResourceMode } from 'shared/components/UnifiedResources';
+import { makeAdvancedSearchQueryForLabel } from 'shared/utils/advancedSearchLabelQuery';
 
-import history from 'teleport/services/history';
 import { ResourceFilter, ResourceLabel } from 'teleport/services/agents';
+import history from 'teleport/services/history';
 
 import { encodeUrlQueryParams } from './encodeUrlQueryParams';
 
diff --git a/web/packages/teleport/src/components/useResources.ts b/web/packages/teleport/src/components/useResources.ts
index 7dd491a0b4244..d3c24e87beff0 100644
--- a/web/packages/teleport/src/components/useResources.ts
+++ b/web/packages/teleport/src/components/useResources.ts
@@ -18,7 +18,7 @@
 
 import { useState } from 'react';
 
-import { Resource, Kind } from 'teleport/services/resources';
+import { Kind, Resource } from 'teleport/services/resources';
 
 export default function useResources<T extends Kind>(
   resources: Resource<T>[],
diff --git a/web/packages/teleport/src/config.test.ts b/web/packages/teleport/src/config.test.ts
index e8e9799c2aaf4..593a0ba0b8163 100644
--- a/web/packages/teleport/src/config.test.ts
+++ b/web/packages/teleport/src/config.test.ts
@@ -19,9 +19,9 @@
 import { AwsOidcPolicyPreset } from 'teleport/services/integrations';
 
 import cfg, {
-  UrlDeployServiceIamConfigureScriptParams,
-  UrlAwsOidcConfigureIdp,
   UrlAwsConfigureIamScriptParams,
+  UrlAwsOidcConfigureIdp,
+  UrlDeployServiceIamConfigureScriptParams,
 } from './config';
 
 test('getDeployServiceIamConfigureScriptPath formatting', async () => {
diff --git a/web/packages/teleport/src/config.ts b/web/packages/teleport/src/config.ts
index c8883b598eebf..9016c068e54bd 100644
--- a/web/packages/teleport/src/config.ts
+++ b/web/packages/teleport/src/config.ts
@@ -19,9 +19,6 @@
 import { generatePath } from 'react-router';
 
 import { IncludedResourceMode } from 'shared/components/UnifiedResources';
-
-import { mergeDeep } from 'shared/utils/highbar';
-
 import {
   Auth2faType,
   AuthProvider,
@@ -29,7 +26,9 @@ import {
   PreferredMfaType,
   PrimaryAuthType,
 } from 'shared/services';
+import { mergeDeep } from 'shared/utils/highbar';
 
+import type { SortType } from 'teleport/services/agents';
 import {
   AwsOidcPolicyPreset,
   IntegrationKind,
@@ -37,17 +36,14 @@ import {
   Regions,
 } from 'teleport/services/integrations';
 import { KubeResourceKind } from 'teleport/services/kube/types';
-
-import { defaultEntitlements } from './entitlement';
-
-import generateResourcePath from './generateResourcePath';
-
-import type { SortType } from 'teleport/services/agents';
-import type { RecordingType } from 'teleport/services/recordings';
 import type { WebauthnAssertionResponse } from 'teleport/services/mfa';
+import type { RecordingType } from 'teleport/services/recordings';
 import type { ParticipantMode } from 'teleport/services/session';
 import type { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
 
+import { defaultEntitlements } from './entitlement';
+import generateResourcePath from './generateResourcePath';
+
 const cfg = {
   /** @deprecated Use cfg.edition instead. */
   isEnterprise: false,
diff --git a/web/packages/teleport/src/features.tsx b/web/packages/teleport/src/features.tsx
index 5f8f4d41eadef..94b92b0150d97 100644
--- a/web/packages/teleport/src/features.tsx
+++ b/web/packages/teleport/src/features.tsx
@@ -36,41 +36,36 @@ import {
   User as UserIcon,
 } from 'design/Icon';
 
+import { IntegrationEnroll } from '@gravitational/teleport/src/Integrations/Enroll';
 import cfg from 'teleport/config';
-
+import { IntegrationStatus } from 'teleport/Integrations/IntegrationStatus';
 import {
-  NavigationCategory,
   ManagementSection,
+  NavigationCategory,
 } from 'teleport/Navigation/categories';
 import { NavigationCategory as SideNavigationCategory } from 'teleport/Navigation/SideNavigation/categories';
-import { IntegrationEnroll } from '@gravitational/teleport/src/Integrations/Enroll';
-
-import { IntegrationStatus } from 'teleport/Integrations/IntegrationStatus';
 
-import { NavTitle } from './types';
-
-import { AuditContainer as Audit } from './Audit';
-import { SessionsContainer as Sessions } from './Sessions';
-import { UnifiedResources } from './UnifiedResources';
+import { LockedAccessRequests } from './AccessRequests';
 import { AccountPage } from './Account';
-import { Support } from './Support';
+import { AuditContainer as Audit } from './Audit';
+import { AuthConnectorsContainer as AuthConnectors } from './AuthConnectors';
+import { Bots } from './Bots';
+import { AddBots } from './Bots/Add';
 import { Clusters } from './Clusters';
-import { TrustedClusters } from './TrustedClusters';
-import { Users } from './Users';
-import { RolesContainer as Roles } from './Roles';
 import { DeviceTrustLocked } from './DeviceTrust';
-import { RecordingsContainer as Recordings } from './Recordings';
-import { AuthConnectorsContainer as AuthConnectors } from './AuthConnectors';
-import { Locks } from './LocksV2/Locks';
-import { NewLockView } from './LocksV2/NewLock';
 import { Discover } from './Discover';
-import { LockedAccessRequests } from './AccessRequests';
 import { Integrations } from './Integrations';
-import { Bots } from './Bots';
-import { AddBots } from './Bots/Add';
 import { JoinTokens } from './JoinTokens/JoinTokens';
-
-import type { FeatureFlags, TeleportFeature } from './types';
+import { Locks } from './LocksV2/Locks';
+import { NewLockView } from './LocksV2/NewLock';
+import { RecordingsContainer as Recordings } from './Recordings';
+import { RolesContainer as Roles } from './Roles';
+import { SessionsContainer as Sessions } from './Sessions';
+import { Support } from './Support';
+import { TrustedClusters } from './TrustedClusters';
+import { NavTitle, type FeatureFlags, type TeleportFeature } from './types';
+import { UnifiedResources } from './UnifiedResources';
+import { Users } from './Users';
 
 class AccessRequests implements TeleportFeature {
   category = NavigationCategory.Resources;
diff --git a/web/packages/teleport/src/lib/tdp/client.ts b/web/packages/teleport/src/lib/tdp/client.ts
index ca18c58744124..cf636e87c8630 100644
--- a/web/packages/teleport/src/lib/tdp/client.ts
+++ b/web/packages/teleport/src/lib/tdp/client.ts
@@ -19,46 +19,42 @@
 import Logger from 'shared/libs/logger';
 
 import init, {
-  init_wasm_log,
   FastPathProcessor,
+  init_wasm_log,
 } from 'teleport/ironrdp/pkg/ironrdp';
-
-import { WebsocketCloseCode, TermEvent } from 'teleport/lib/term/enums';
-import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
 import { AuthenticatedWebSocket } from 'teleport/lib/AuthenticatedWebSocket';
+import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
+import { TermEvent, WebsocketCloseCode } from 'teleport/lib/term/enums';
+import type { WebauthnAssertionResponse } from 'teleport/services/mfa';
 
 import Codec, {
-  MessageType,
   FileType,
-  SharedDirectoryErrCode,
+  MessageType,
   Severity,
+  SharedDirectoryErrCode,
+  type ButtonState,
+  type ClientScreenSpec,
+  type ClipboardData,
+  type FileSystemObject,
+  type MouseButton,
+  type PngFrame,
+  type ScrollAxis,
+  type SharedDirectoryCreateResponse,
+  type SharedDirectoryDeleteResponse,
+  type SharedDirectoryInfoResponse,
+  type SharedDirectoryListResponse,
+  type SharedDirectoryMoveResponse,
+  type SharedDirectoryReadResponse,
+  type SharedDirectoryTruncateResponse,
+  type SharedDirectoryWriteResponse,
+  type SyncKeys,
 } from './codec';
 import {
   PathDoesNotExistError,
   SharedDirectoryManager,
+  type FileOrDirInfo,
 } from './sharedDirectoryManager';
 
-import type { FileOrDirInfo } from './sharedDirectoryManager';
-import type {
-  MouseButton,
-  ButtonState,
-  ScrollAxis,
-  ClientScreenSpec,
-  PngFrame,
-  ClipboardData,
-  SharedDirectoryInfoResponse,
-  SharedDirectoryListResponse,
-  SharedDirectoryMoveResponse,
-  SharedDirectoryReadResponse,
-  SharedDirectoryWriteResponse,
-  SharedDirectoryCreateResponse,
-  SharedDirectoryDeleteResponse,
-  FileSystemObject,
-  SyncKeys,
-  SharedDirectoryTruncateResponse,
-} from './codec';
-import type { WebauthnAssertionResponse } from 'teleport/services/mfa';
-
 export enum TdpClientEvent {
   TDP_CLIENT_SCREEN_SPEC = 'tdp client screen spec',
   TDP_PNG_FRAME = 'tdp png frame',
diff --git a/web/packages/teleport/src/lib/tdp/codec.test.ts b/web/packages/teleport/src/lib/tdp/codec.test.ts
index 02ef687b3caee..fc81e09693618 100644
--- a/web/packages/teleport/src/lib/tdp/codec.test.ts
+++ b/web/packages/teleport/src/lib/tdp/codec.test.ts
@@ -17,8 +17,8 @@
  */
 
 import Codec, {
-  MessageType,
   ButtonState,
+  MessageType,
   MouseButton,
   ScrollAxis,
 } from './codec';
diff --git a/web/packages/teleport/src/lib/tdp/index.ts b/web/packages/teleport/src/lib/tdp/index.ts
index 2d1f6ef0f85b6..e3e4a7071d637 100644
--- a/web/packages/teleport/src/lib/tdp/index.ts
+++ b/web/packages/teleport/src/lib/tdp/index.ts
@@ -17,7 +17,7 @@
  */
 
 import TdpClient, { TdpClientEvent } from './client';
-import { PlayerClient } from './playerClient';
 import { ButtonState, ScrollAxis } from './codec';
+import { PlayerClient } from './playerClient';
 
 export { TdpClient, TdpClientEvent, PlayerClient, ButtonState, ScrollAxis };
diff --git a/web/packages/teleport/src/lib/tdp/playerClient.ts b/web/packages/teleport/src/lib/tdp/playerClient.ts
index 9adb15ef10038..ebd23974b7ae2 100644
--- a/web/packages/teleport/src/lib/tdp/playerClient.ts
+++ b/web/packages/teleport/src/lib/tdp/playerClient.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { throttle } from 'shared/utils/highbar';
 import { base64ToArrayBuffer } from 'shared/utils/base64';
+import { throttle } from 'shared/utils/highbar';
 
 import { StatusEnum } from 'teleport/lib/player';
 
diff --git a/web/packages/teleport/src/lib/term/terminal.ts b/web/packages/teleport/src/lib/term/terminal.ts
index 535283b33db5a..49a59519d6b5a 100644
--- a/web/packages/teleport/src/lib/term/terminal.ts
+++ b/web/packages/teleport/src/lib/term/terminal.ts
@@ -17,26 +17,26 @@
  */
 
 import '@xterm/xterm/css/xterm.css';
-import { ITheme, Terminal } from '@xterm/xterm';
+
+import { CanvasAddon } from '@xterm/addon-canvas';
 import { FitAddon } from '@xterm/addon-fit';
 import { ImageAddon } from '@xterm/addon-image';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import { WebglAddon } from '@xterm/addon-webgl';
+import { ITheme, Terminal } from '@xterm/xterm';
+
 import {
   SearchAddon,
   TerminalSearcher,
 } from 'shared/components/TerminalSearch';
-import { WebglAddon } from '@xterm/addon-webgl';
-import { WebLinksAddon } from '@xterm/addon-web-links';
-import { CanvasAddon } from '@xterm/addon-canvas';
-import { debounce, isInteger } from 'shared/utils/highbar';
 import Logger from 'shared/libs/logger';
+import { debounce, isInteger, type DebouncedFunc } from 'shared/utils/highbar';
 
 import cfg from 'teleport/config';
 
 import { TermEvent } from './enums';
 import Tty from './tty';
 
-import type { DebouncedFunc } from 'shared/utils/highbar';
-
 const logger = Logger.create('lib/term/terminal');
 const DISCONNECT_TXT = 'disconnected';
 const WINDOW_RESIZE_DEBOUNCE_DELAY = 200;
diff --git a/web/packages/teleport/src/lib/term/tty.ts b/web/packages/teleport/src/lib/term/tty.ts
index 7c50a38ee9a38..fccca96178a24 100644
--- a/web/packages/teleport/src/lib/term/tty.ts
+++ b/web/packages/teleport/src/lib/term/tty.ts
@@ -18,14 +18,15 @@
 
 import Logger from 'shared/libs/logger';
 
-import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
-import { WebauthnAssertionResponse } from 'teleport/services/mfa';
 import { AuthenticatedWebSocket } from 'teleport/lib/AuthenticatedWebSocket';
-
-import { MfaChallengeResponse } from 'teleport/services/mfa';
+import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
+import {
+  MfaChallengeResponse,
+  WebauthnAssertionResponse,
+} from 'teleport/services/mfa';
 
 import { EventType, TermEvent, WebsocketCloseCode } from './enums';
-import { Protobuf, MessageTypeEnum } from './protobuf';
+import { MessageTypeEnum, Protobuf } from './protobuf';
 
 const logger = Logger.create('Tty');
 
diff --git a/web/packages/teleport/src/lib/term/ttyPlayer.js b/web/packages/teleport/src/lib/term/ttyPlayer.js
index 87153d6ade295..3d3629f54e95c 100644
--- a/web/packages/teleport/src/lib/term/ttyPlayer.js
+++ b/web/packages/teleport/src/lib/term/ttyPlayer.js
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { throttle } from 'shared/utils/highbar';
 import Logger from 'shared/libs/logger';
+import { throttle } from 'shared/utils/highbar';
 
 import { StatusEnum } from 'teleport/lib/player';
 
-import Tty from './tty';
 import { TermEvent, WebsocketCloseCode } from './enums';
+import Tty from './tty';
 
 const logger = Logger.create('TtyPlayer');
 
diff --git a/web/packages/teleport/src/lib/term/ttyPlayer.test.js b/web/packages/teleport/src/lib/term/ttyPlayer.test.js
index aace8826ff3ed..098f4616b7e9a 100644
--- a/web/packages/teleport/src/lib/term/ttyPlayer.test.js
+++ b/web/packages/teleport/src/lib/term/ttyPlayer.test.js
@@ -18,8 +18,8 @@
 
 import WS from 'jest-websocket-mock';
 
-import { TermEvent } from 'teleport/lib/term/enums';
 import { StatusEnum } from 'teleport/lib/player';
+import { TermEvent } from 'teleport/lib/term/enums';
 
 import TtyPlayer from './ttyPlayer';
 
diff --git a/web/packages/teleport/src/lib/useMfa.ts b/web/packages/teleport/src/lib/useMfa.ts
index 664016790e002..b2038c06e272c 100644
--- a/web/packages/teleport/src/lib/useMfa.ts
+++ b/web/packages/teleport/src/lib/useMfa.ts
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
 import { TermEvent } from 'teleport/lib/term/enums';
-import { parseMfaChallengeJson as parseMfaChallenge } from 'teleport/services/mfa/makeMfa';
+import auth from 'teleport/services/auth/auth';
 import {
   MfaAuthenticateChallengeJson,
   SSOChallenge,
 } from 'teleport/services/mfa';
-import auth from 'teleport/services/auth/auth';
+import { parseMfaChallengeJson as parseMfaChallenge } from 'teleport/services/mfa/makeMfa';
 
 export function useMfa(emitterSender: EventEmitterMfaSender): MfaState {
   const [state, setState] = useState<{
diff --git a/web/packages/teleport/src/lib/util.test.ts b/web/packages/teleport/src/lib/util.test.ts
index 338a32b41d4ee..8e85a268f655f 100644
--- a/web/packages/teleport/src/lib/util.test.ts
+++ b/web/packages/teleport/src/lib/util.test.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { generateTshLoginCommand, arrayStrDiff, compareByString } from './util';
+import { arrayStrDiff, compareByString, generateTshLoginCommand } from './util';
 
 let windowSpy;
 
diff --git a/web/packages/teleport/src/mocks/contexts.ts b/web/packages/teleport/src/mocks/contexts.ts
index 2d1378f964fd3..48445672325d2 100644
--- a/web/packages/teleport/src/mocks/contexts.ts
+++ b/web/packages/teleport/src/mocks/contexts.ts
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import makeUserContext from 'teleport/services/user/makeUserContext';
 import { Context as TeleportContext } from 'teleport';
 import { makeAcl } from 'teleport/services/user/makeAcl';
-
+import makeUserContext from 'teleport/services/user/makeUserContext';
 import type { Access, Acl } from 'teleport/services/user/types';
 
 export const noAccess: Access = {
diff --git a/web/packages/teleport/src/services/agents/agents.test.ts b/web/packages/teleport/src/services/agents/agents.test.ts
index ce18a6b497d40..f33a8f93b173f 100644
--- a/web/packages/teleport/src/services/agents/agents.test.ts
+++ b/web/packages/teleport/src/services/agents/agents.test.ts
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { agentService } from './agents';
 import { makeLabelMapOfStrArrs } from './make';
-
 import type { ConnectionDiagnosticRequest } from './types';
 
 test('createConnectionDiagnostic request', () => {
diff --git a/web/packages/teleport/src/services/agents/agents.ts b/web/packages/teleport/src/services/agents/agents.ts
index b0813b365e72b..2d01c644faf28 100644
--- a/web/packages/teleport/src/services/agents/agents.ts
+++ b/web/packages/teleport/src/services/agents/agents.ts
@@ -18,11 +18,10 @@
 
 import { platformToGOOS } from 'design/platform';
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { makeConnectionDiagnostic } from './make';
-
 import type {
   ConnectionDiagnostic,
   ConnectionDiagnosticRequest,
diff --git a/web/packages/teleport/src/services/agents/types.ts b/web/packages/teleport/src/services/agents/types.ts
index b306910da95c3..c15b72a73529b 100644
--- a/web/packages/teleport/src/services/agents/types.ts
+++ b/web/packages/teleport/src/services/agents/types.ts
@@ -16,18 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { Platform } from 'design/platform';
 import { IncludedResourceMode } from 'shared/components/UnifiedResources';
 
 import { App } from 'teleport/services/apps';
 import { Database } from 'teleport/services/databases';
-import { Node } from 'teleport/services/nodes';
-import { Kube } from 'teleport/services/kube';
 import { Desktop } from 'teleport/services/desktops';
-
-import { UserGroup } from '../userGroups';
+import { Kube } from 'teleport/services/kube';
+import { Node } from 'teleport/services/nodes';
 
 import type { MfaChallengeResponse } from '../mfa';
-import type { Platform } from 'design/platform';
+import { UserGroup } from '../userGroups';
 
 export type UnifiedResource =
   | App
diff --git a/web/packages/teleport/src/services/alerts/alerts.tsx b/web/packages/teleport/src/services/alerts/alerts.tsx
index 39e4336e42db0..138c4e45a54e4 100644
--- a/web/packages/teleport/src/services/alerts/alerts.tsx
+++ b/web/packages/teleport/src/services/alerts/alerts.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 export const LINK_DESTINATION_LABEL = 'teleport.internal/link';
 export const LINK_TEXT_LABEL = 'teleport.internal/link-text';
diff --git a/web/packages/teleport/src/services/api/api.test.ts b/web/packages/teleport/src/services/api/api.test.ts
index ec6b26a27de2c..a148214de51e7 100644
--- a/web/packages/teleport/src/services/api/api.test.ts
+++ b/web/packages/teleport/src/services/api/api.test.ts
@@ -17,12 +17,11 @@
  */
 
 import { MfaChallengeResponse } from '../mfa';
-
 import api, {
-  MFA_HEADER,
   defaultRequestOptions,
   getAuthHeaders,
   isRoleNotFoundError,
+  MFA_HEADER,
 } from './api';
 
 describe('api.fetch', () => {
diff --git a/web/packages/teleport/src/services/api/api.ts b/web/packages/teleport/src/services/api/api.ts
index 1048c3333e11c..556434acacdc4 100644
--- a/web/packages/teleport/src/services/api/api.ts
+++ b/web/packages/teleport/src/services/api/api.ts
@@ -17,12 +17,12 @@
  */
 
 import 'whatwg-fetch';
+
 import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
 import websession from 'teleport/services/websession';
 
-import { storageService } from '../storageService';
 import { MfaChallengeResponse } from '../mfa';
-
+import { storageService } from '../storageService';
 import parseError, { ApiError } from './parseError';
 
 export const MFA_HEADER = 'Teleport-Mfa-Response';
diff --git a/web/packages/teleport/src/services/api/index.ts b/web/packages/teleport/src/services/api/index.ts
index 813b3e911af1f..864daa1517d9a 100644
--- a/web/packages/teleport/src/services/api/index.ts
+++ b/web/packages/teleport/src/services/api/index.ts
@@ -17,12 +17,13 @@
  */
 
 import api, {
-  getAuthHeaders,
-  getNoCacheHeaders,
   getAccessToken,
+  getAuthHeaders,
   getHostName,
+  getNoCacheHeaders,
   getXCSRFToken,
 } from './api';
+
 export default api;
 export {
   getAuthHeaders,
diff --git a/web/packages/teleport/src/services/apps/apps.ts b/web/packages/teleport/src/services/apps/apps.ts
index d64f37414a872..f7fe95e552413 100644
--- a/web/packages/teleport/src/services/apps/apps.ts
+++ b/web/packages/teleport/src/services/apps/apps.ts
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, { UrlAppParams, UrlResourcesParams } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
-
+import api from 'teleport/services/api';
 import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
 
 import makeApp from './makeApps';
diff --git a/web/packages/teleport/src/services/apps/types.ts b/web/packages/teleport/src/services/apps/types.ts
index bb0bf2f0b0f10..b134b45bd733e 100644
--- a/web/packages/teleport/src/services/apps/types.ts
+++ b/web/packages/teleport/src/services/apps/types.ts
@@ -19,7 +19,6 @@
 import { AwsRole } from 'shared/services/apps';
 
 import { ResourceLabel } from 'teleport/services/agents';
-
 import type { SamlServiceProviderPreset } from 'teleport/services/samlidp/types';
 
 export interface App {
diff --git a/web/packages/teleport/src/services/audit/audit.ts b/web/packages/teleport/src/services/audit/audit.ts
index aed9307d2263f..8f1cac3f1025d 100644
--- a/web/packages/teleport/src/services/audit/audit.ts
+++ b/web/packages/teleport/src/services/audit/audit.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import makeEvent from './makeEvent';
 import { EventQuery, EventResponse } from './types';
diff --git a/web/packages/teleport/src/services/audit/makeEvent.ts b/web/packages/teleport/src/services/audit/makeEvent.ts
index ff1ae2a166e56..64392b707544e 100644
--- a/web/packages/teleport/src/services/audit/makeEvent.ts
+++ b/web/packages/teleport/src/services/audit/makeEvent.ts
@@ -17,9 +17,10 @@
  */
 
 import { formatDistanceStrict } from 'date-fns';
+
 import { pluralize } from 'shared/utils/text';
 
-import { Event, RawEvent, Formatters, eventCodes, RawEvents } from './types';
+import { Event, eventCodes, Formatters, RawEvent, RawEvents } from './types';
 
 const formatElasticsearchEvent: (
   json:
diff --git a/web/packages/teleport/src/services/auth/auth.test.ts b/web/packages/teleport/src/services/auth/auth.test.ts
index bec482724f6e9..d2d2e3def1924 100644
--- a/web/packages/teleport/src/services/auth/auth.test.ts
+++ b/web/packages/teleport/src/services/auth/auth.test.ts
@@ -17,8 +17,8 @@
  */
 
 import cfg from 'teleport/config';
-import auth from 'teleport/services/auth';
 import api from 'teleport/services/api';
+import auth from 'teleport/services/auth';
 
 /* eslint-disable jest/no-conditional-expect */
 
diff --git a/web/packages/teleport/src/services/auth/auth.ts b/web/packages/teleport/src/services/auth/auth.ts
index e1533ee4d3297..a42768c69ebb9 100644
--- a/web/packages/teleport/src/services/auth/auth.ts
+++ b/web/packages/teleport/src/services/auth/auth.ts
@@ -16,33 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 import {
   DeviceType,
   DeviceUsage,
   MfaAuthenticateChallenge,
   MfaChallengeResponse,
 } from 'teleport/services/mfa';
-
 import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 
 import {
-  parseMfaChallengeJson,
-  parseMfaRegistrationChallengeJson,
   makeWebauthnAssertionResponse,
   makeWebauthnCreationResponse,
+  parseMfaChallengeJson,
+  parseMfaRegistrationChallengeJson,
 } from '../mfa/makeMfa';
-
-import makePasswordToken from './makePasswordToken';
 import { makeChangedUserAuthn } from './make';
+import makePasswordToken from './makePasswordToken';
 import {
+  ChangePasswordReq,
+  CreateAuthenticateChallengeRequest,
+  CreateNewHardwareDeviceRequest,
   ResetPasswordReqWithEvent,
   ResetPasswordWithWebauthnReqWithEvent,
   UserCredentials,
-  ChangePasswordReq,
-  CreateNewHardwareDeviceRequest,
-  CreateAuthenticateChallengeRequest,
 } from './types';
 
 const auth = {
diff --git a/web/packages/teleport/src/services/auth/types.ts b/web/packages/teleport/src/services/auth/types.ts
index 57fb003ab7975..5a4717f70a137 100644
--- a/web/packages/teleport/src/services/auth/types.ts
+++ b/web/packages/teleport/src/services/auth/types.ts
@@ -19,7 +19,6 @@
 import { EventMeta } from 'teleport/services/userEvent';
 
 import { DeviceUsage, MfaChallengeResponse } from '../mfa';
-
 import { IsMfaRequiredRequest, MfaChallengeScope } from './auth';
 
 export type Base64urlString = string;
diff --git a/web/packages/teleport/src/services/bot/bot.ts b/web/packages/teleport/src/services/bot/bot.ts
index f203fd28fb9f3..c87b160355aaf 100644
--- a/web/packages/teleport/src/services/bot/bot.ts
+++ b/web/packages/teleport/src/services/bot/bot.ts
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
-
+import api from 'teleport/services/api';
 import { makeBot, toApiGitHubTokenSpec } from 'teleport/services/bot/consts';
 import ResourceService, { RoleResource } from 'teleport/services/resources';
 import { FeatureFlags } from 'teleport/types';
@@ -26,10 +25,10 @@ import { FeatureFlags } from 'teleport/types';
 import {
   BotList,
   BotResponse,
-  FlatBot,
-  EditBotRequest,
-  CreateBotRequest,
   CreateBotJoinTokenRequest,
+  CreateBotRequest,
+  EditBotRequest,
+  FlatBot,
 } from './types';
 
 export function createBot(config: CreateBotRequest): Promise<void> {
diff --git a/web/packages/teleport/src/services/clusters/clusters.ts b/web/packages/teleport/src/services/clusters/clusters.ts
index a912a315433e0..e35110127c34a 100644
--- a/web/packages/teleport/src/services/clusters/clusters.ts
+++ b/web/packages/teleport/src/services/clusters/clusters.ts
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
-
-import { makeClusterInfo, makeClusterList } from './makeCluster';
+import api from 'teleport/services/api';
 
 import { Cluster } from '.';
+import { makeClusterInfo, makeClusterList } from './makeCluster';
 
 export default class ClustersService {
   clusters: Cluster[] = [];
diff --git a/web/packages/teleport/src/services/databases/databases.ts b/web/packages/teleport/src/services/databases/databases.ts
index 4fa028a5b2f5f..72649f7199c46 100644
--- a/web/packages/teleport/src/services/databases/databases.ts
+++ b/web/packages/teleport/src/services/databases/databases.ts
@@ -16,18 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, { UrlResourcesParams } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
+import api from 'teleport/services/api';
 
 import { makeDatabase, makeDatabaseService } from './makeDatabase';
-
 import type {
   CreateDatabaseRequest,
   Database,
-  UpdateDatabaseRequest,
   DatabaseIamPolicyResponse,
   DatabaseServicesResponse,
+  UpdateDatabaseRequest,
 } from './types';
 
 class DatabaseService {
diff --git a/web/packages/teleport/src/services/desktops/desktops.ts b/web/packages/teleport/src/services/desktops/desktops.ts
index 28ae88d04b3a4..45a7ae1c9fb4b 100644
--- a/web/packages/teleport/src/services/desktops/desktops.ts
+++ b/web/packages/teleport/src/services/desktops/desktops.ts
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, { UrlResourcesParams } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
+import api from 'teleport/services/api';
 
 import { makeDesktop, makeDesktopService } from './makeDesktop';
-
 import type { Desktop, WindowsDesktopService } from './types';
 
 class DesktopService {
diff --git a/web/packages/teleport/src/services/discovery/discovery.ts b/web/packages/teleport/src/services/discovery/discovery.ts
index 41cce9b779f82..fbe6c1dfe6d03 100644
--- a/web/packages/teleport/src/services/discovery/discovery.ts
+++ b/web/packages/teleport/src/services/discovery/discovery.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { AwsMatcher, DiscoveryConfig } from './types';
 
diff --git a/web/packages/teleport/src/services/history/history.ts b/web/packages/teleport/src/services/history/history.ts
index 1789b54c90ec1..59c600eabe9e4 100644
--- a/web/packages/teleport/src/services/history/history.ts
+++ b/web/packages/teleport/src/services/history/history.ts
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { createBrowserHistory } from 'history';
-
+import { createBrowserHistory, type History } from 'history';
 import { matchPath } from 'react-router';
 
 import cfg from 'teleport/config';
 
-import type { History } from 'history';
-
 let _inst: History = null;
 
 const history = {
diff --git a/web/packages/teleport/src/services/history/index.ts b/web/packages/teleport/src/services/history/index.ts
index 1e141127f8dfc..f54c53cf04bf0 100644
--- a/web/packages/teleport/src/services/history/index.ts
+++ b/web/packages/teleport/src/services/history/index.ts
@@ -17,5 +17,6 @@
  */
 
 import service, { getUrlParameter } from './history';
+
 export default service;
 export { getUrlParameter };
diff --git a/web/packages/teleport/src/services/integrations/integrations.test.ts b/web/packages/teleport/src/services/integrations/integrations.test.ts
index 4e5bbcc089d4e..a48f8ddb5a6f7 100644
--- a/web/packages/teleport/src/services/integrations/integrations.test.ts
+++ b/web/packages/teleport/src/services/integrations/integrations.test.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { integrationService } from './integrations';
-import { IntegrationStatusCode, IntegrationAudience } from './types';
+import { IntegrationAudience, IntegrationStatusCode } from './types';
 
 test('fetch a single integration: fetchIntegration()', async () => {
   // test a valid response
diff --git a/web/packages/teleport/src/services/integrations/integrations.ts b/web/packages/teleport/src/services/integrations/integrations.ts
index 23abcfcc2a8a4..a0d5a584cb26c 100644
--- a/web/packages/teleport/src/services/integrations/integrations.ts
+++ b/web/packages/teleport/src/services/integrations/integrations.ts
@@ -16,50 +16,49 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
-import makeNode from '../nodes/makeNode';
-import auth, { MfaChallengeScope } from '../auth/auth';
 import { App } from '../apps';
 import makeApp from '../apps/makeApps';
-
+import auth, { MfaChallengeScope } from '../auth/auth';
+import makeNode from '../nodes/makeNode';
 import {
-  Integration,
-  IntegrationCreateRequest,
-  IntegrationUpdateRequest,
-  IntegrationStatusCode,
-  IntegrationListResponse,
+  AwsDatabaseVpcsResponse,
+  AwsOidcDeployDatabaseServicesRequest,
+  AwsOidcDeployServiceRequest,
   AwsOidcListDatabasesRequest,
+  AwsOidcPingRequest,
+  AwsOidcPingResponse,
   AwsRdsDatabase,
-  ListAwsRdsDatabaseResponse,
-  RdsEngineIdentifier,
-  AwsOidcDeployServiceRequest,
-  ListEc2InstancesRequest,
-  ListEc2InstancesResponse,
-  Ec2InstanceConnectEndpoint,
-  ListEc2InstanceConnectEndpointsRequest,
-  ListEc2InstanceConnectEndpointsResponse,
-  ListAwsSecurityGroupsRequest,
-  ListAwsSecurityGroupsResponse,
   DeployEc2InstanceConnectEndpointRequest,
   DeployEc2InstanceConnectEndpointResponse,
-  SecurityGroup,
-  SecurityGroupRule,
-  ListEksClustersResponse,
-  EnrollEksClustersResponse,
+  Ec2InstanceConnectEndpoint,
   EnrollEksClustersRequest,
-  ListEksClustersRequest,
-  AwsOidcDeployDatabaseServicesRequest,
-  Regions,
+  EnrollEksClustersResponse,
+  Integration,
+  IntegrationCreateRequest,
+  IntegrationListResponse,
+  IntegrationStatusCode,
+  IntegrationUpdateRequest,
+  IntegrationWithSummary,
+  ListAwsRdsDatabaseResponse,
   ListAwsRdsFromAllEnginesResponse,
+  ListAwsSecurityGroupsRequest,
+  ListAwsSecurityGroupsResponse,
   ListAwsSubnetsRequest,
   ListAwsSubnetsResponse,
+  ListEc2InstanceConnectEndpointsRequest,
+  ListEc2InstanceConnectEndpointsResponse,
+  ListEc2InstancesRequest,
+  ListEc2InstancesResponse,
+  ListEksClustersRequest,
+  ListEksClustersResponse,
+  RdsEngineIdentifier,
+  Regions,
+  SecurityGroup,
+  SecurityGroupRule,
   Subnet,
-  AwsDatabaseVpcsResponse,
-  AwsOidcPingResponse,
-  AwsOidcPingRequest,
-  IntegrationWithSummary,
 } from './types';
 
 export const integrationService = {
diff --git a/web/packages/teleport/src/services/joinToken/joinToken.test.ts b/web/packages/teleport/src/services/joinToken/joinToken.test.ts
index 8b259db20f84a..1f941345c1006 100644
--- a/web/packages/teleport/src/services/joinToken/joinToken.test.ts
+++ b/web/packages/teleport/src/services/joinToken/joinToken.test.ts
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import JoinTokenService from './joinToken';
-
 import type { JoinTokenRequest } from './types';
 
 test('fetchJoinToken with an empty request properly sets defaults', () => {
diff --git a/web/packages/teleport/src/services/joinToken/joinToken.ts b/web/packages/teleport/src/services/joinToken/joinToken.ts
index 759ae40595cbb..fe564b4440dae 100644
--- a/web/packages/teleport/src/services/joinToken/joinToken.ts
+++ b/web/packages/teleport/src/services/joinToken/joinToken.ts
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { makeLabelMapOfStrArrs } from '../agents/make';
-
 import makeJoinToken from './makeJoinToken';
-import { JoinToken, JoinRule, JoinTokenRequest } from './types';
+import { JoinRule, JoinToken, JoinTokenRequest } from './types';
 
 const TeleportTokenNameHeader = 'X-Teleport-TokenName';
 
diff --git a/web/packages/teleport/src/services/joinToken/makeJoinToken.ts b/web/packages/teleport/src/services/joinToken/makeJoinToken.ts
index 57a134dfe3588..92ab74bc6f53f 100644
--- a/web/packages/teleport/src/services/joinToken/makeJoinToken.ts
+++ b/web/packages/teleport/src/services/joinToken/makeJoinToken.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { formatDistanceStrict, differenceInYears } from 'date-fns';
+import { differenceInYears, formatDistanceStrict } from 'date-fns';
 
 import type { JoinToken } from './types';
 
diff --git a/web/packages/teleport/src/services/kube/kube.ts b/web/packages/teleport/src/services/kube/kube.ts
index 82886438aba9c..737a10ed3cb21 100644
--- a/web/packages/teleport/src/services/kube/kube.ts
+++ b/web/packages/teleport/src/services/kube/kube.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, {
   UrlKubeResourcesParams,
   UrlResourcesParams,
 } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
+import api from 'teleport/services/api';
 
-import { Kube, KubeResourceResponse } from './types';
 import { makeKube, makeKubeResource } from './makeKube';
+import { Kube, KubeResourceResponse } from './types';
 
 class KubeService {
   fetchKubernetes(
diff --git a/web/packages/teleport/src/services/kube/types.ts b/web/packages/teleport/src/services/kube/types.ts
index 735dfd45b1459..db922c38f6127 100644
--- a/web/packages/teleport/src/services/kube/types.ts
+++ b/web/packages/teleport/src/services/kube/types.ts
@@ -17,6 +17,7 @@
  */
 
 import { ResourceLabel } from 'teleport/services/agents';
+
 export interface Kube {
   kind: 'kube_cluster';
   name: string;
diff --git a/web/packages/teleport/src/services/locks/locks.ts b/web/packages/teleport/src/services/locks/locks.ts
index aac061091adfb..4dda74a631a4b 100644
--- a/web/packages/teleport/src/services/locks/locks.ts
+++ b/web/packages/teleport/src/services/locks/locks.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import { CreateLockRequest, Lock } from './types';
 
diff --git a/web/packages/teleport/src/services/mfa/mfa.ts b/web/packages/teleport/src/services/mfa/mfa.ts
index 7d7838f0777a7..20a911232aefe 100644
--- a/web/packages/teleport/src/services/mfa/mfa.ts
+++ b/web/packages/teleport/src/services/mfa/mfa.ts
@@ -20,13 +20,13 @@ import cfg from 'teleport/config';
 import api from 'teleport/services/api';
 import auth, { makeWebauthnCreationResponse } from 'teleport/services/auth';
 
+import makeMfaDevice from './makeMfaDevice';
 import {
-  MfaDevice,
-  AddNewTotpDeviceRequest,
   AddNewHardwareDeviceRequest,
+  AddNewTotpDeviceRequest,
+  MfaDevice,
   SaveNewHardwareDeviceRequest,
 } from './types';
-import makeMfaDevice from './makeMfaDevice';
 
 class MfaService {
   fetchDevicesWithToken(tokenId: string): Promise<MfaDevice[]> {
diff --git a/web/packages/teleport/src/services/mfa/mfaOptions.test.ts b/web/packages/teleport/src/services/mfa/mfaOptions.test.ts
index 81eec4be87a80..780bd00216403 100644
--- a/web/packages/teleport/src/services/mfa/mfaOptions.test.ts
+++ b/web/packages/teleport/src/services/mfa/mfaOptions.test.ts
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Auth2faType } from 'shared/services';
-
 import { SSOChallenge } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
+import { Auth2faType } from 'shared/services';
 
 import { getMfaChallengeOptions, getMfaRegisterOptions } from './mfaOptions';
 import { DeviceType, MfaAuthenticateChallenge } from './types';
diff --git a/web/packages/teleport/src/services/nodes/makeNode.ts b/web/packages/teleport/src/services/nodes/makeNode.ts
index 43c631e52240c..b53a3df092782 100644
--- a/web/packages/teleport/src/services/nodes/makeNode.ts
+++ b/web/packages/teleport/src/services/nodes/makeNode.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Node, AwsMetadata } from './types';
+import { AwsMetadata, Node } from './types';
 
 export default function makeNode(json: any): Node {
   json = json ?? {};
diff --git a/web/packages/teleport/src/services/nodes/nodes.ts b/web/packages/teleport/src/services/nodes/nodes.ts
index f5617b5c740c6..50bf21c2f55bf 100644
--- a/web/packages/teleport/src/services/nodes/nodes.ts
+++ b/web/packages/teleport/src/services/nodes/nodes.ts
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, { UrlResourcesParams } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
+import api from 'teleport/services/api';
 
-import { Node, CreateNodeRequest } from './types';
 import makeNode from './makeNode';
+import { CreateNodeRequest, Node } from './types';
 
 export default class NodeService {
   fetchNodes(
diff --git a/web/packages/teleport/src/services/recordings/makeRecording.ts b/web/packages/teleport/src/services/recordings/makeRecording.ts
index 3b69c2508fa41..789d8bf3ee472 100644
--- a/web/packages/teleport/src/services/recordings/makeRecording.ts
+++ b/web/packages/teleport/src/services/recordings/makeRecording.ts
@@ -18,9 +18,8 @@
 
 import { differenceInMilliseconds, formatDistanceStrict } from 'date-fns';
 
-import { eventCodes } from 'teleport/services/audit';
-
 import cfg from 'teleport/config';
+import { eventCodes } from 'teleport/services/audit';
 
 import { Recording } from './types';
 
diff --git a/web/packages/teleport/src/services/recordings/recordings.ts b/web/packages/teleport/src/services/recordings/recordings.ts
index ba71160aa1795..ff4779c334dd3 100644
--- a/web/packages/teleport/src/services/recordings/recordings.ts
+++ b/web/packages/teleport/src/services/recordings/recordings.ts
@@ -19,8 +19,8 @@
 import cfg from 'teleport/config';
 import api from 'teleport/services/api';
 
-import { RecordingsQuery, RecordingsResponse } from './types';
 import { makeRecording } from './makeRecording';
+import { RecordingsQuery, RecordingsResponse } from './types';
 
 export default class RecordingsService {
   maxFetchLimit = 5000;
diff --git a/web/packages/teleport/src/services/resources/makeResource.ts b/web/packages/teleport/src/services/resources/makeResource.ts
index 105284bf3d619..cd9984b581699 100644
--- a/web/packages/teleport/src/services/resources/makeResource.ts
+++ b/web/packages/teleport/src/services/resources/makeResource.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Resource, Kind } from './types';
+import { Kind, Resource } from './types';
 
 export function makeResource<T extends Kind>(json: any): Resource<T> {
   json = json || {};
diff --git a/web/packages/teleport/src/services/resources/resource.ts b/web/packages/teleport/src/services/resources/resource.ts
index d22c7c54f0628..3c402851f73ee 100644
--- a/web/packages/teleport/src/services/resources/resource.ts
+++ b/web/packages/teleport/src/services/resources/resource.ts
@@ -16,14 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import cfg, { UrlListRolesParams, UrlResourcesParams } from 'teleport/config';
 import api from 'teleport/services/api';
-import cfg, { UrlResourcesParams, UrlListRolesParams } from 'teleport/config';
-
-import { UnifiedResource, ResourcesResponse } from '../agents';
-
-import { makeUnifiedResource } from './makeUnifiedResource';
 
+import { ResourcesResponse, UnifiedResource } from '../agents';
 import { makeResource, makeResourceList, RoleResource } from './';
+import { makeUnifiedResource } from './makeUnifiedResource';
 
 class ResourceService {
   fetchTrustedClusters() {
diff --git a/web/packages/teleport/src/services/session/makeSession.ts b/web/packages/teleport/src/services/session/makeSession.ts
index 5191401f1bf96..685e590afac2f 100644
--- a/web/packages/teleport/src/services/session/makeSession.ts
+++ b/web/packages/teleport/src/services/session/makeSession.ts
@@ -18,7 +18,7 @@
 
 import { formatDistanceStrict } from 'date-fns';
 
-import { Session, SessionKind, Participant } from './types';
+import { Participant, Session, SessionKind } from './types';
 
 const nameField: { [kind in SessionKind]: string } = {
   ssh: 'server_hostname',
diff --git a/web/packages/teleport/src/services/session/session.ts b/web/packages/teleport/src/services/session/session.ts
index 8640e697eddae..7ce2a5ba0a049 100644
--- a/web/packages/teleport/src/services/session/session.ts
+++ b/web/packages/teleport/src/services/session/session.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import makeSession, { makeParticipant } from './makeSession';
 import { ParticipantList } from './types';
diff --git a/web/packages/teleport/src/services/storageService/storageService.ts b/web/packages/teleport/src/services/storageService/storageService.ts
index 7e6cc838161f7..e86bd4fb6692f 100644
--- a/web/packages/teleport/src/services/storageService/storageService.ts
+++ b/web/packages/teleport/src/services/storageService/storageService.ts
@@ -16,24 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
-import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
 import { OnboardUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
+import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
+import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
-import { getPrefersDark } from 'teleport/ThemeProvider';
-import { BearerToken } from 'teleport/services/websession';
+import { RecentHistoryItem } from 'teleport/Navigation/RecentHistory';
 import { OnboardDiscover } from 'teleport/services/user';
 import {
   BackendUserPreferences,
   convertBackendUserPreferences,
   isBackendUserPreferences,
 } from 'teleport/services/userPreferences/userPreferences';
-import { RecentHistoryItem } from 'teleport/Navigation/RecentHistory';
+import { BearerToken } from 'teleport/services/websession';
+import { getPrefersDark } from 'teleport/ThemeProvider';
+import type { RecommendFeature } from 'teleport/types';
 
 import { CloudUserInvites, KeysEnum, LocalStorageSurvey } from './types';
 
-import type { RecommendFeature } from 'teleport/types';
-
 // This is an array of local storage `KeysEnum` that are kept when a user logs out
 const KEEP_LOCALSTORAGE_KEYS_ON_LOGOUT = [
   KeysEnum.THEME,
diff --git a/web/packages/teleport/src/services/user/index.ts b/web/packages/teleport/src/services/user/index.ts
index 2dc403edb9219..9501adb11d88d 100644
--- a/web/packages/teleport/src/services/user/index.ts
+++ b/web/packages/teleport/src/services/user/index.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import service from './user';
 import makeUser from './makeUser';
 import makeUserContext from './makeUserContext';
+import service from './user';
 
 export { makeUserContext, makeUser };
 export * from './types';
diff --git a/web/packages/teleport/src/services/user/makeUserContext.ts b/web/packages/teleport/src/services/user/makeUserContext.ts
index 13c25ff053c8c..a0b2f88faecb6 100644
--- a/web/packages/teleport/src/services/user/makeUserContext.ts
+++ b/web/packages/teleport/src/services/user/makeUserContext.ts
@@ -17,9 +17,8 @@
  */
 
 import { makeCluster } from '../clusters';
-
 import { makeAcl } from './makeAcl';
-import { UserContext, AccessCapabilities, PasswordState } from './types';
+import { AccessCapabilities, PasswordState, UserContext } from './types';
 
 export default function makeUserContext(json: any): UserContext {
   json = json || {};
diff --git a/web/packages/teleport/src/services/user/user.test.ts b/web/packages/teleport/src/services/user/user.test.ts
index f734942a9d4fa..cfbe71fe43f6a 100644
--- a/web/packages/teleport/src/services/user/user.test.ts
+++ b/web/packages/teleport/src/services/user/user.test.ts
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
-import user from './user';
 import { makeTraits } from './makeUser';
 import { Acl, ExcludeUserField, PasswordState, User } from './types';
+import user from './user';
 
 test('undefined values in context response gives proper default values', async () => {
   const mockContext = {
diff --git a/web/packages/teleport/src/services/user/user.ts b/web/packages/teleport/src/services/user/user.ts
index ce2d07c22034e..4454ecdbc6d74 100644
--- a/web/packages/teleport/src/services/user/user.ts
+++ b/web/packages/teleport/src/services/user/user.ts
@@ -16,20 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 import session from 'teleport/services/websession';
 
 import { MfaChallengeResponse } from '../mfa';
-
-import makeUserContext from './makeUserContext';
 import { makeResetToken } from './makeResetToken';
 import makeUser, { makeUsers } from './makeUser';
+import makeUserContext from './makeUserContext';
 import {
+  ExcludeUserField,
+  ResetPasswordType,
   User,
   UserContext,
-  ResetPasswordType,
-  ExcludeUserField,
 } from './types';
 
 const cache = {
diff --git a/web/packages/teleport/src/services/userEvent/userEvent.ts b/web/packages/teleport/src/services/userEvent/userEvent.ts
index c6ab80d54bcca..05e8118c4f95d 100644
--- a/web/packages/teleport/src/services/userEvent/userEvent.ts
+++ b/web/packages/teleport/src/services/userEvent/userEvent.ts
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import {
-  UserEvent,
-  PreUserEvent,
-  DiscoverEventRequest,
-  CtaEvent,
   CaptureEvent,
-  IntegrationEnrollEventRequest,
+  CtaEvent,
+  DiscoverEventRequest,
   FeatureRecommendationEvent,
+  IntegrationEnrollEventRequest,
+  PreUserEvent,
+  UserEvent,
 } from './types';
 
 export const userEventService = {
diff --git a/web/packages/teleport/src/services/userGroups/usergroups.ts b/web/packages/teleport/src/services/userGroups/usergroups.ts
index 64486202ee38f..54fd4b3da16ea 100644
--- a/web/packages/teleport/src/services/userGroups/usergroups.ts
+++ b/web/packages/teleport/src/services/userGroups/usergroups.ts
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg, { UrlResourcesParams } from 'teleport/config';
 import { ResourcesResponse } from 'teleport/services/agents';
+import api from 'teleport/services/api';
 
 import { makeUserGroup } from './makeUserGroup';
-
 import type { UserGroup } from './types';
 
 class UserGroupService {
diff --git a/web/packages/teleport/src/services/userPreferences/userPreferences.test.ts b/web/packages/teleport/src/services/userPreferences/userPreferences.test.ts
index d5464b3c10ad4..3b45776c1d83e 100644
--- a/web/packages/teleport/src/services/userPreferences/userPreferences.test.ts
+++ b/web/packages/teleport/src/services/userPreferences/userPreferences.test.ts
@@ -20,18 +20,17 @@ import { SideNavDrawerMode } from 'gen-proto-ts/teleport/userpreferences/v1/side
 import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
 import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
-import {
-  getCurrentTheme,
-  getNextTheme,
-  updateFavicon,
-} from 'teleport/ThemeProvider';
-
 import {
   BackendUserPreferences,
   convertBackendUserPreferences,
   convertUserPreferences,
   isBackendUserPreferences,
 } from 'teleport/services/userPreferences/userPreferences';
+import {
+  getCurrentTheme,
+  getNextTheme,
+  updateFavicon,
+} from 'teleport/ThemeProvider';
 
 test('should convert the old cluster user preferences format to the new one', () => {
   // this is how the backend currently returns cluster preferences - as an array of strings
diff --git a/web/packages/teleport/src/services/userPreferences/userPreferences.ts b/web/packages/teleport/src/services/userPreferences/userPreferences.ts
index 0d5b3a3fe3eb6..b8a05ddb3ea76 100644
--- a/web/packages/teleport/src/services/userPreferences/userPreferences.ts
+++ b/web/packages/teleport/src/services/userPreferences/userPreferences.ts
@@ -16,28 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ClusterUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/cluster_preferences_pb';
+import { OnboardUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
+import { SideNavDrawerMode } from 'gen-proto-ts/teleport/userpreferences/v1/sidenav_preferences_pb';
+import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
 import {
+  AvailableResourceMode,
   DefaultTab,
   LabelsViewMode,
   UnifiedResourcePreferences,
   ViewMode,
-  AvailableResourceMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
 import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
-import { ClusterUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/cluster_preferences_pb';
-
-import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
-
-import { OnboardUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/onboard_pb';
-
-import { SideNavDrawerMode } from 'gen-proto-ts/teleport/userpreferences/v1/sidenav_preferences_pb';
-
-import { getPrefersDark } from 'teleport/ThemeProvider';
-
 import cfg from 'teleport/config';
 import api from 'teleport/services/api';
+import { getPrefersDark } from 'teleport/ThemeProvider';
 
 interface BackendClusterUserPreferences {
   pinnedResources?: string[];
diff --git a/web/packages/teleport/src/services/websession/websession.ts b/web/packages/teleport/src/services/websession/websession.ts
index a9371db9e060d..667a25fb6f916 100644
--- a/web/packages/teleport/src/services/websession/websession.ts
+++ b/web/packages/teleport/src/services/websession/websession.ts
@@ -19,8 +19,8 @@
 import Logger from 'shared/libs/logger';
 
 import cfg from 'teleport/config';
-import history from 'teleport/services/history';
 import api from 'teleport/services/api';
+import history from 'teleport/services/history';
 import { KeysEnum, storageService } from 'teleport/services/storageService';
 
 import makeBearerToken from './makeBearerToken';
diff --git a/web/packages/teleport/src/services/yaml/yaml.ts b/web/packages/teleport/src/services/yaml/yaml.ts
index f94e6eb2c6c56..3a26ff3656531 100644
--- a/web/packages/teleport/src/services/yaml/yaml.ts
+++ b/web/packages/teleport/src/services/yaml/yaml.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import api from 'teleport/services/api';
 import cfg from 'teleport/config';
+import api from 'teleport/services/api';
 
 import {
   YamlParseRequest,
diff --git a/web/packages/teleport/src/stores/index.ts b/web/packages/teleport/src/stores/index.ts
index b90d571c9a5a1..9f26e00f28ed8 100644
--- a/web/packages/teleport/src/stores/index.ts
+++ b/web/packages/teleport/src/stores/index.ts
@@ -17,7 +17,7 @@
  */
 
 import StoreNav, { defaultNavState } from './storeNav';
-import StoreUserContext from './storeUserContext';
 import { StoreNotifications } from './storeNotifications';
+import StoreUserContext from './storeUserContext';
 
 export { StoreNav, StoreUserContext, StoreNotifications, defaultNavState };
diff --git a/web/packages/teleport/src/stores/storeUserContext.ts b/web/packages/teleport/src/stores/storeUserContext.ts
index e50f9fb9d6e61..f909670b9859f 100644
--- a/web/packages/teleport/src/stores/storeUserContext.ts
+++ b/web/packages/teleport/src/stores/storeUserContext.ts
@@ -19,7 +19,6 @@
 import { Store } from 'shared/libs/stores';
 
 import cfg from 'teleport/config';
-
 import { UserContext } from 'teleport/services/user';
 
 export default class StoreUserContext extends Store<UserContext> {
diff --git a/web/packages/teleport/src/telemetry-boot.ts b/web/packages/teleport/src/telemetry-boot.ts
index c94325f483026..201b70655f37b 100644
--- a/web/packages/teleport/src/telemetry-boot.ts
+++ b/web/packages/teleport/src/telemetry-boot.ts
@@ -16,25 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
-import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { ZoneContextManager } from '@opentelemetry/context-zone';
 import {
-  ConsoleSpanExporter,
-  BatchSpanProcessor,
-} from '@opentelemetry/sdk-trace-base';
+  CompositePropagator,
+  W3CTraceContextPropagator,
+} from '@opentelemetry/core';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { DocumentLoadInstrumentation } from '@opentelemetry/instrumentation-document-load';
-import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
 import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch';
-import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { UserInteractionInstrumentation } from '@opentelemetry/instrumentation-user-interaction';
+import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
+import { B3Propagator } from '@opentelemetry/propagator-b3';
+import { Resource } from '@opentelemetry/resources';
 import {
-  CompositePropagator,
-  W3CTraceContextPropagator,
-} from '@opentelemetry/core';
-import { ZoneContextManager } from '@opentelemetry/context-zone';
+  BatchSpanProcessor,
+  ConsoleSpanExporter,
+} from '@opentelemetry/sdk-trace-base';
+import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 
 export function instantiateTelemetry() {
   registerInstrumentations({
diff --git a/web/packages/teleport/src/teleportContext.tsx b/web/packages/teleport/src/teleportContext.tsx
index 1ba4c3fde4380..3cacff180e27b 100644
--- a/web/packages/teleport/src/teleportContext.tsx
+++ b/web/packages/teleport/src/teleportContext.tsx
@@ -20,26 +20,26 @@ import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpr
 
 import cfg from 'teleport/config';
 
-import { StoreNav, StoreNotifications, StoreUserContext } from './stores';
-import * as types from './types';
-import AuditService from './services/audit';
-import RecordingsService from './services/recordings';
-import NodeService from './services/nodes';
-import sessionService from './services/session';
-import ResourceService from './services/resources';
-import userService from './services/user';
+import { notificationContentFactory } from './Notifications';
+import { agentService } from './services/agents';
 import appService from './services/apps';
-import JoinTokenService from './services/joinToken';
-import KubeService from './services/kube';
+import AuditService from './services/audit';
+import ClustersService from './services/clusters/clusters';
 import DatabaseService from './services/databases';
 import desktopService from './services/desktops';
-import userGroupService from './services/userGroups';
+import JoinTokenService from './services/joinToken';
+import KubeService from './services/kube';
 import MfaService from './services/mfa';
-import { agentService } from './services/agents';
-import { storageService } from './services/storageService';
-import ClustersService from './services/clusters/clusters';
+import NodeService from './services/nodes';
 import { NotificationService } from './services/notifications';
-import { notificationContentFactory } from './Notifications';
+import RecordingsService from './services/recordings';
+import ResourceService from './services/resources';
+import sessionService from './services/session';
+import { storageService } from './services/storageService';
+import userService from './services/user';
+import userGroupService from './services/userGroups';
+import { StoreNav, StoreNotifications, StoreUserContext } from './stores';
+import * as types from './types';
 
 class TeleportContext implements types.Context {
   // stores
diff --git a/web/packages/teleport/src/useStickyClusterId.ts b/web/packages/teleport/src/useStickyClusterId.ts
index b7d57d817a02c..d1cc6a3978bc9 100644
--- a/web/packages/teleport/src/useStickyClusterId.ts
+++ b/web/packages/teleport/src/useStickyClusterId.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRouteMatch } from 'react-router';
 import { useRef } from 'react';
+import { useRouteMatch } from 'react-router';
 
-import { StickyCluster } from 'teleport/types';
 import cfg from 'teleport/config';
+import { StickyCluster } from 'teleport/types';
 
 // useStickyClusterId determines the current :clusterId in the URL.
 // When a route contains `:clusterId` it can refer to the root or the leaf cluster.
diff --git a/web/packages/teleterm/electron.vite.config.mts b/web/packages/teleterm/electron.vite.config.mts
index 926fc20b307cb..fbc6f5c840e8e 100644
--- a/web/packages/teleterm/electron.vite.config.mts
+++ b/web/packages/teleterm/electron.vite.config.mts
@@ -19,14 +19,13 @@
 import path from 'node:path';
 
 import { defineConfig, externalizeDepsPlugin, UserConfig } from 'electron-vite';
+import type { Plugin } from 'vite';
 
 import { reactPlugin } from '@gravitational/build/vite/react.mjs';
 import { tsconfigPathsPlugin } from '@gravitational/build/vite/tsconfigPaths.mjs';
 
 import { getConnectCsp } from './csp';
 
-import type { Plugin } from 'vite';
-
 const rootDirectory = path.resolve(__dirname, '../../..');
 const outputDirectory = path.resolve(__dirname, 'build', 'app');
 
diff --git a/web/packages/teleterm/src/agentCleanupDaemon/agentCleanupDaemon.test.ts b/web/packages/teleterm/src/agentCleanupDaemon/agentCleanupDaemon.test.ts
index 4a9d7001a61f1..d62d6e602e64c 100644
--- a/web/packages/teleterm/src/agentCleanupDaemon/agentCleanupDaemon.test.ts
+++ b/web/packages/teleterm/src/agentCleanupDaemon/agentCleanupDaemon.test.ts
@@ -20,10 +20,10 @@
  */
 
 import childProcess from 'node:child_process';
-import path from 'node:path';
-import process from 'node:process';
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
+import path from 'node:path';
+import process from 'node:process';
 
 const stdio = 'pipe'; // Change to 'inherit' for easier debugging.
 
diff --git a/web/packages/teleterm/src/deepLinks.ts b/web/packages/teleterm/src/deepLinks.ts
index c11d12017c468..727dc85cf8a52 100644
--- a/web/packages/teleterm/src/deepLinks.ts
+++ b/web/packages/teleterm/src/deepLinks.ts
@@ -17,12 +17,13 @@
  */
 
 import * as whatwg from 'whatwg-url';
+
 import {
+  AuthenticateWebDeviceDeepURL,
+  ConnectMyComputerDeepURL,
   CUSTOM_PROTOCOL,
-  Path,
   DeepURL,
-  ConnectMyComputerDeepURL,
-  AuthenticateWebDeviceDeepURL,
+  Path,
 } from 'shared/deepLinks';
 
 export type DeepLinkParseResult =
diff --git a/web/packages/teleterm/src/helpers.ts b/web/packages/teleterm/src/helpers.ts
index 4da2df9b46af9..8fe1a23472af0 100644
--- a/web/packages/teleterm/src/helpers.ts
+++ b/web/packages/teleterm/src/helpers.ts
@@ -16,14 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { PaginatedResource } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
-import { Server } from 'gen-proto-ts/teleport/lib/teleterm/v1/server_pb';
-import { Database } from 'gen-proto-ts/teleport/lib/teleterm/v1/database_pb';
 import { App } from 'gen-proto-ts/teleport/lib/teleterm/v1/app_pb';
+import { Database } from 'gen-proto-ts/teleport/lib/teleterm/v1/database_pb';
 import { Kube } from 'gen-proto-ts/teleport/lib/teleterm/v1/kube_pb';
-
+import { Server } from 'gen-proto-ts/teleport/lib/teleterm/v1/server_pb';
+import { PaginatedResource } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
 import * as api from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 
+import {
+  ReloginRequest,
+  SendNotificationRequest,
+} from 'teleterm/services/tshdEvents';
 import {
   PtyClientEvent,
   PtyEventData,
@@ -33,10 +36,6 @@ import {
   PtyEventStartError,
   PtyServerEvent,
 } from 'teleterm/sharedProcess/api/protogen/ptyHostService_pb';
-import {
-  ReloginRequest,
-  SendNotificationRequest,
-} from 'teleterm/services/tshdEvents';
 
 export function resourceOneOfIsServer(
   resource: PaginatedResource['resource']
diff --git a/web/packages/teleterm/src/logger.ts b/web/packages/teleterm/src/logger.ts
index a867a2bc20de1..e215653fa1304 100644
--- a/web/packages/teleterm/src/logger.ts
+++ b/web/packages/teleterm/src/logger.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as types from 'teleterm/types';
 import { LoggerService } from 'teleterm/services/logger/types';
+import * as types from 'teleterm/types';
 
 export default class Logger {
   private static service: types.LoggerService;
diff --git a/web/packages/teleterm/src/main.ts b/web/packages/teleterm/src/main.ts
index 6d00ecf561786..7b0586265cb7c 100644
--- a/web/packages/teleterm/src/main.ts
+++ b/web/packages/teleterm/src/main.ts
@@ -20,25 +20,25 @@ import { spawn } from 'node:child_process';
 import os from 'node:os';
 import path from 'node:path';
 
-import { app, dialog, globalShortcut, shell, nativeTheme } from 'electron';
+import { app, dialog, globalShortcut, nativeTheme, shell } from 'electron';
 
 import { CUSTOM_PROTOCOL } from 'shared/deepLinks';
 
+import { parseDeepLink } from 'teleterm/deepLinks';
+import Logger from 'teleterm/logger';
 import MainProcess from 'teleterm/mainProcess';
-import { getRuntimeSettings } from 'teleterm/mainProcess/runtimeSettings';
 import { enableWebHandlersProtection } from 'teleterm/mainProcess/protocolHandler';
-import { LoggerColor, createFileLoggerService } from 'teleterm/services/logger';
-import Logger from 'teleterm/logger';
-import * as types from 'teleterm/types';
+import { manageRootClusterProxyHostAllowList } from 'teleterm/mainProcess/rootClusterProxyHostAllowList';
+import { getRuntimeSettings } from 'teleterm/mainProcess/runtimeSettings';
+import { WindowsManager } from 'teleterm/mainProcess/windowsManager';
 import {
   createConfigService,
   runConfigFileMigration,
 } from 'teleterm/services/config';
 import { createFileStorage } from 'teleterm/services/fileStorage';
-import { WindowsManager } from 'teleterm/mainProcess/windowsManager';
-import { parseDeepLink } from 'teleterm/deepLinks';
+import { createFileLoggerService, LoggerColor } from 'teleterm/services/logger';
+import * as types from 'teleterm/types';
 import { assertUnreachable } from 'teleterm/ui/utils';
-import { manageRootClusterProxyHostAllowList } from 'teleterm/mainProcess/rootClusterProxyHostAllowList';
 
 if (!app.isPackaged) {
   // Sets app name and data directories to Electron.
diff --git a/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.test.ts b/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.test.ts
index 4e9475dde1e26..fe333275f7a0f 100644
--- a/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.test.ts
+++ b/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.test.ts
@@ -22,9 +22,9 @@
 /* eslint jest/no-conditional-expect: 0 */
 
 import childProcess from 'node:child_process';
-import { PassThrough } from 'node:stream';
 import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
+import { PassThrough } from 'node:stream';
 import zlib from 'node:zlib';
 
 import tarFs from 'tar-fs';
@@ -32,9 +32,7 @@ import tarFs from 'tar-fs';
 import Logger, { NullService } from 'teleterm/logger';
 
 import { makeRuntimeSettings } from '../fixtures/mocks';
-
 import { downloadAgent } from './agentDownloader';
-
 import type { IFileDownloader } from './fileDownloader';
 
 jest.mock('node:child_process');
diff --git a/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.ts b/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.ts
index 56c66c5822415..23d989669c004 100644
--- a/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.ts
+++ b/web/packages/teleterm/src/mainProcess/agentDownloader/agentDownloader.ts
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { pipeline } from 'node:stream/promises';
+import { execFile } from 'node:child_process';
 import { createReadStream } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { createUnzip } from 'node:zlib';
-import { execFile } from 'node:child_process';
+import { pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
+import { createUnzip } from 'node:zlib';
 
 import { extract } from 'tar-fs';
 
@@ -31,7 +31,6 @@ import { compareSemVers } from 'shared/utils/semVer';
 import Logger from 'teleterm/logger';
 
 import { RuntimeSettings } from '../types';
-
 import type { IFileDownloader } from './fileDownloader';
 
 const TELEPORT_CDN_ADDRESS = 'https://cdn.teleport.dev';
diff --git a/web/packages/teleterm/src/mainProcess/agentDownloader/fileDownloader.test.ts b/web/packages/teleterm/src/mainProcess/agentDownloader/fileDownloader.test.ts
index 7f9af2d97c133..d743e0205c9f8 100644
--- a/web/packages/teleterm/src/mainProcess/agentDownloader/fileDownloader.test.ts
+++ b/web/packages/teleterm/src/mainProcess/agentDownloader/fileDownloader.test.ts
@@ -21,12 +21,12 @@
 
 import EventEmitter from 'events';
 
+import type { BrowserWindow, DownloadItem } from 'electron';
+
 import Logger, { NullService } from 'teleterm/logger';
 
 import { FileDownloader } from './fileDownloader';
 
-import type { DownloadItem, BrowserWindow } from 'electron';
-
 const DOWNLOAD_DIR = '/temp';
 const FILE_NAME = 'teleport-v13.1.0-darwin-arm64-bin.tar.gz';
 const URL = `https://cdn.teleport.dev/${FILE_NAME}`;
diff --git a/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.test.ts b/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.test.ts
index 56bffc9b50613..da7bcd984fb79 100644
--- a/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.test.ts
+++ b/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.test.ts
@@ -19,17 +19,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import path from 'node:path';
 import childProcess, { ChildProcess } from 'node:child_process';
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
+import path from 'node:path';
 
 import Logger, { NullService } from 'teleterm/logger';
 import { RootClusterUri } from 'teleterm/ui/uri';
 
 import * as mocks from '../fixtures/mocks';
 import { AgentProcessState, RuntimeSettings } from '../types';
-
 import { AgentRunner } from './agentRunner';
 
 const makeRuntimeSettings = (settings?: Partial<RuntimeSettings>) =>
diff --git a/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.ts b/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.ts
index 484634ac00b33..32fce2236c44e 100644
--- a/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.ts
+++ b/web/packages/teleterm/src/mainProcess/agentRunner/agentRunner.ts
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { spawn, fork, ChildProcess } from 'node:child_process';
-import os from 'node:os';
+import { ChildProcess, fork, spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
+import os from 'node:os';
 
 import stripAnsi from 'strip-ansi';
 
 import Logger from 'teleterm/logger';
-import { RootClusterUri } from 'teleterm/ui/uri';
 import { createFileLoggerService, LoggerColor } from 'teleterm/services/logger';
+import { RootClusterUri } from 'teleterm/ui/uri';
 
 import { generateAgentConfigPaths } from '../createAgentConfigFile';
-import { AgentProcessState, RuntimeSettings } from '../types';
 import { terminateWithTimeout } from '../terminateWithTimeout';
+import { AgentProcessState, RuntimeSettings } from '../types';
 
 const MAX_STDERR_LINES = 10;
 
diff --git a/web/packages/teleterm/src/mainProcess/contextMenus/tabContextMenu.ts b/web/packages/teleterm/src/mainProcess/contextMenus/tabContextMenu.ts
index 09dc7dd17655a..7c045a451afa4 100644
--- a/web/packages/teleterm/src/mainProcess/contextMenus/tabContextMenu.ts
+++ b/web/packages/teleterm/src/mainProcess/contextMenus/tabContextMenu.ts
@@ -17,18 +17,18 @@
  */
 
 import {
+  dialog,
   ipcMain,
   ipcRenderer,
   Menu,
   MenuItemConstructorOptions,
-  dialog,
 } from 'electron';
 
+import { makeCustomShellFromPath, Shell } from 'teleterm/mainProcess/shell';
 import { ConfigService } from 'teleterm/services/config';
-import { Shell, makeCustomShellFromPath } from 'teleterm/mainProcess/shell';
 import {
-  Document,
   canDocChangeShell,
+  Document,
 } from 'teleterm/ui/services/workspacesService';
 
 import {
diff --git a/web/packages/teleterm/src/mainProcess/createAgentConfigFile.test.ts b/web/packages/teleterm/src/mainProcess/createAgentConfigFile.test.ts
index 30ecda05521bc..07146249d4382 100644
--- a/web/packages/teleterm/src/mainProcess/createAgentConfigFile.test.ts
+++ b/web/packages/teleterm/src/mainProcess/createAgentConfigFile.test.ts
@@ -22,8 +22,8 @@
 import childProcess from 'node:child_process';
 import fs from 'node:fs/promises';
 
-import { RootClusterUri } from 'teleterm/ui/uri';
 import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
+import { RootClusterUri } from 'teleterm/ui/uri';
 
 import {
   createAgentConfigFile,
diff --git a/web/packages/teleterm/src/mainProcess/createAgentConfigFile.ts b/web/packages/teleterm/src/mainProcess/createAgentConfigFile.ts
index 4345563e3ee7f..92e010ae81db5 100644
--- a/web/packages/teleterm/src/mainProcess/createAgentConfigFile.ts
+++ b/web/packages/teleterm/src/mainProcess/createAgentConfigFile.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { promisify } from 'node:util';
 import { execFile } from 'node:child_process';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { promisify } from 'node:util';
 
 import * as connectMyComputer from 'shared/connectMyComputer';
 
-import { RootClusterUri, routing } from 'teleterm/ui/uri';
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
+import { RootClusterUri, routing } from 'teleterm/ui/uri';
 
 export interface CreateAgentConfigFileArgs {
   rootClusterUri: RootClusterUri;
diff --git a/web/packages/teleterm/src/mainProcess/fixtures/mocks.ts b/web/packages/teleterm/src/mainProcess/fixtures/mocks.ts
index 9b25a5c0f486b..ef06e2701c025 100644
--- a/web/packages/teleterm/src/mainProcess/fixtures/mocks.ts
+++ b/web/packages/teleterm/src/mainProcess/fixtures/mocks.ts
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { RuntimeSettings, MainProcessClient } from 'teleterm/types';
-import { createMockFileStorage } from 'teleterm/services/fileStorage/fixtures/mocks';
+import { AgentProcessState } from 'teleterm/mainProcess/types';
 // createConfigService has to be imported directly from configService.ts.
 // teleterm/services/config/index.ts reexports the config service client which depends on electron.
 // Importing electron breaks the fixtures if that's done from within storybook.
 import { createConfigService } from 'teleterm/services/config/configService';
-import { AgentProcessState } from 'teleterm/mainProcess/types';
+import { createMockFileStorage } from 'teleterm/services/fileStorage/fixtures/mocks';
+import { MainProcessClient, RuntimeSettings } from 'teleterm/types';
 
 export class MockMainProcessClient implements MainProcessClient {
   configService: ReturnType<typeof createConfigService>;
diff --git a/web/packages/teleterm/src/mainProcess/index.ts b/web/packages/teleterm/src/mainProcess/index.ts
index c09f0d6d24e27..71ca95795fc76 100644
--- a/web/packages/teleterm/src/mainProcess/index.ts
+++ b/web/packages/teleterm/src/mainProcess/index.ts
@@ -17,4 +17,5 @@
  */
 
 import MainProcess from './mainProcess';
+
 export default MainProcess;
diff --git a/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.test.ts b/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.test.ts
index 698d0338337ab..6129e3b472222 100644
--- a/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.test.ts
+++ b/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.test.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import fs from 'fs';
 import crypto from 'crypto';
+import fs from 'fs';
 
 import { loadInstallationId } from './loadInstallationId';
 
diff --git a/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts b/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts
index 54f53db905afb..7273cca63b550 100644
--- a/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts
+++ b/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import fs from 'fs';
 import crypto from 'crypto';
+import fs from 'fs';
 
 const UUID_V4_REGEX =
   /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
diff --git a/web/packages/teleterm/src/mainProcess/mainProcess.ts b/web/packages/teleterm/src/mainProcess/mainProcess.ts
index 2987f4e5c7dc9..e006ab0004a2f 100644
--- a/web/packages/teleterm/src/mainProcess/mainProcess.ts
+++ b/web/packages/teleterm/src/mainProcess/mainProcess.ts
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ChildProcess, fork, spawn, exec } from 'node:child_process';
-import path from 'node:path';
+import { ChildProcess, exec, fork, spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
+import path from 'node:path';
 import { promisify } from 'node:util';
 
+import { ChannelCredentials } from '@grpc/grpc-js';
+import { GrpcTransport } from '@protobuf-ts/grpc-transport';
 import {
   app,
   dialog,
@@ -30,55 +32,51 @@ import {
   nativeTheme,
   shell,
 } from 'electron';
-import { ChannelCredentials } from '@grpc/grpc-js';
-import { GrpcTransport } from '@protobuf-ts/grpc-transport';
 
-import { FileStorage, RuntimeSettings } from 'teleterm/types';
-import { subscribeToFileStorageEvents } from 'teleterm/services/fileStorage';
-import {
-  LoggerColor,
-  KeepLastChunks,
-  createFileLoggerService,
-} from 'teleterm/services/logger';
+import Logger from 'teleterm/logger';
+import { getAssetPath } from 'teleterm/mainProcess/runtimeSettings';
 import {
   ChildProcessAddresses,
   MainProcessIpc,
   RendererIpc,
   TERMINATE_MESSAGE,
 } from 'teleterm/mainProcess/types';
-import { getAssetPath } from 'teleterm/mainProcess/runtimeSettings';
-import { RootClusterUri } from 'teleterm/ui/uri';
-import Logger from 'teleterm/logger';
-import * as grpcCreds from 'teleterm/services/grpcCredentials';
-import { createTshdClient, TshdClient } from 'teleterm/services/tshd';
-import { loggingInterceptor } from 'teleterm/services/tshd/interceptors';
-import { staticConfig } from 'teleterm/staticConfig';
 import {
   TSH_AUTOUPDATE_ENV_VAR,
   TSH_AUTOUPDATE_OFF,
 } from 'teleterm/node/tshAutoupdate';
+import { subscribeToFileStorageEvents } from 'teleterm/services/fileStorage';
+import * as grpcCreds from 'teleterm/services/grpcCredentials';
+import {
+  createFileLoggerService,
+  KeepLastChunks,
+  LoggerColor,
+} from 'teleterm/services/logger';
+import { createTshdClient, TshdClient } from 'teleterm/services/tshd';
+import { loggingInterceptor } from 'teleterm/services/tshd/interceptors';
+import { staticConfig } from 'teleterm/staticConfig';
+import { FileStorage, RuntimeSettings } from 'teleterm/types';
+import { RootClusterUri } from 'teleterm/ui/uri';
 
 import {
   ConfigService,
   subscribeToConfigServiceEvents,
 } from '../services/config';
-
-import { subscribeToTerminalContextMenuEvent } from './contextMenus/terminalContextMenu';
+import { downloadAgent, FileDownloader, verifyAgent } from './agentDownloader';
+import { AgentRunner } from './agentRunner';
 import { subscribeToTabContextMenuEvent } from './contextMenus/tabContextMenu';
-import { resolveNetworkAddress, ResolveError } from './resolveNetworkAddress';
-import { WindowsManager } from './windowsManager';
-import { downloadAgent, verifyAgent, FileDownloader } from './agentDownloader';
+import { subscribeToTerminalContextMenuEvent } from './contextMenus/terminalContextMenu';
 import {
-  getAgentsDir,
   createAgentConfigFile,
+  generateAgentConfigPaths,
+  getAgentsDir,
   isAgentConfigFileCreated,
   removeAgentDirectory,
-  generateAgentConfigPaths,
+  type CreateAgentConfigFileArgs,
 } from './createAgentConfigFile';
-import { AgentRunner } from './agentRunner';
+import { ResolveError, resolveNetworkAddress } from './resolveNetworkAddress';
 import { terminateWithTimeout } from './terminateWithTimeout';
-
-import type { CreateAgentConfigFileArgs } from './createAgentConfigFile';
+import { WindowsManager } from './windowsManager';
 
 type Options = {
   settings: RuntimeSettings;
diff --git a/web/packages/teleterm/src/mainProcess/mainProcessClient.ts b/web/packages/teleterm/src/mainProcess/mainProcessClient.ts
index d70d05facbae6..5592128b215a2 100644
--- a/web/packages/teleterm/src/mainProcess/mainProcessClient.ts
+++ b/web/packages/teleterm/src/mainProcess/mainProcessClient.ts
@@ -18,19 +18,17 @@
 
 import { ipcRenderer } from 'electron';
 
-import { createFileStorageClient } from 'teleterm/services/fileStorage';
 import { CreateAgentConfigFileArgs } from 'teleterm/mainProcess/createAgentConfigFile';
+import { createFileStorageClient } from 'teleterm/services/fileStorage';
 import { RootClusterUri } from 'teleterm/ui/uri';
 
 import { createConfigServiceClient } from '../services/config';
-
-import { openTerminalContextMenu } from './contextMenus/terminalContextMenu';
 import { openTabContextMenu } from './contextMenus/tabContextMenu';
-
+import { openTerminalContextMenu } from './contextMenus/terminalContextMenu';
 import {
-  MainProcessClient,
-  ChildProcessAddresses,
   AgentProcessState,
+  ChildProcessAddresses,
+  MainProcessClient,
   MainProcessIpc,
   RendererIpc,
   WindowsManagerIpc,
diff --git a/web/packages/teleterm/src/mainProcess/protocolHandler.ts b/web/packages/teleterm/src/mainProcess/protocolHandler.ts
index 02b1611b6f02a..79526b8e0c52c 100644
--- a/web/packages/teleterm/src/mainProcess/protocolHandler.ts
+++ b/web/packages/teleterm/src/mainProcess/protocolHandler.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import fs from 'fs';
 import { fileURLToPath } from 'node:url';
 import * as path from 'path';
-import fs from 'fs';
 
-import { protocol, app } from 'electron';
+import { app, protocol } from 'electron';
 
 import Logger from 'teleterm/logger';
 
diff --git a/web/packages/teleterm/src/mainProcess/rootClusterProxyHostAllowList.ts b/web/packages/teleterm/src/mainProcess/rootClusterProxyHostAllowList.ts
index cba97e4e0ddcf..9551237e0bbdb 100644
--- a/web/packages/teleterm/src/mainProcess/rootClusterProxyHostAllowList.ts
+++ b/web/packages/teleterm/src/mainProcess/rootClusterProxyHostAllowList.ts
@@ -20,12 +20,12 @@ import { ipcMain } from 'electron';
 
 import { isAbortError } from 'shared/utils/abortError';
 
-import { proxyHostToBrowserProxyHost } from 'teleterm/services/tshd/cluster';
-import { TshdClient } from 'teleterm/services/tshd';
-import { Logger } from 'teleterm/types';
 import { MainProcessIpc } from 'teleterm/mainProcess/types';
-import * as tshd from 'teleterm/services/tshd/types';
+import { TshdClient } from 'teleterm/services/tshd';
 import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
+import { proxyHostToBrowserProxyHost } from 'teleterm/services/tshd/cluster';
+import * as tshd from 'teleterm/services/tshd/types';
+import { Logger } from 'teleterm/types';
 
 export type RootClusterProxyHostAllowList = Set<string>;
 
diff --git a/web/packages/teleterm/src/mainProcess/runtimeSettings.ts b/web/packages/teleterm/src/mainProcess/runtimeSettings.ts
index 6b8540ee5ca4f..386dbd7869642 100644
--- a/web/packages/teleterm/src/mainProcess/runtimeSettings.ts
+++ b/web/packages/teleterm/src/mainProcess/runtimeSettings.ts
@@ -22,9 +22,9 @@ import path from 'path';
 
 import { app } from 'electron';
 
-import { GrpcServerAddresses, RuntimeSettings } from './types';
 import { loadInstallationId } from './loadInstallationId';
 import { getAvailableShells, getDefaultShell } from './shell';
+import { GrpcServerAddresses, RuntimeSettings } from './types';
 
 const { argv, env } = process;
 
diff --git a/web/packages/teleterm/src/mainProcess/types.ts b/web/packages/teleterm/src/mainProcess/types.ts
index d2aeed78b001a..cf6cb9ea56e80 100644
--- a/web/packages/teleterm/src/mainProcess/types.ts
+++ b/web/packages/teleterm/src/mainProcess/types.ts
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { CreateAgentConfigFileArgs } from 'teleterm/mainProcess/createAgentConfigFile';
 import { DeepLinkParseResult } from 'teleterm/deepLinks';
-import { RootClusterUri } from 'teleterm/ui/uri';
-
-import { Document } from 'teleterm/ui/services/workspacesService';
+import { CreateAgentConfigFileArgs } from 'teleterm/mainProcess/createAgentConfigFile';
 import { FileStorage } from 'teleterm/services/fileStorage';
+import { Document } from 'teleterm/ui/services/workspacesService';
+import { RootClusterUri } from 'teleterm/ui/uri';
 
 import { ConfigService } from '../services/config';
-
 import { Shell } from './shell';
 
 export type RuntimeSettings = {
diff --git a/web/packages/teleterm/src/mainProcess/windowsManager.ts b/web/packages/teleterm/src/mainProcess/windowsManager.ts
index 513e31573400c..bce056b206815 100644
--- a/web/packages/teleterm/src/mainProcess/windowsManager.ts
+++ b/web/packages/teleterm/src/mainProcess/windowsManager.ts
@@ -22,22 +22,22 @@ import * as url from 'node:url';
 import {
   app,
   BrowserWindow,
+  ipcMain,
   Menu,
+  nativeTheme,
   Rectangle,
   screen,
-  nativeTheme,
-  ipcMain,
 } from 'electron';
 
+import { DeepLinkParseResult } from 'teleterm/deepLinks';
 import Logger from 'teleterm/logger';
-import { FileStorage } from 'teleterm/services/fileStorage';
 import {
   RendererIpc,
   RuntimeSettings,
   WindowsManagerIpc,
 } from 'teleterm/mainProcess/types';
+import { FileStorage } from 'teleterm/services/fileStorage';
 import { darkTheme, lightTheme } from 'teleterm/ui/ThemeProvider/theme';
-import { DeepLinkParseResult } from 'teleterm/deepLinks';
 
 type WindowState = Rectangle;
 
diff --git a/web/packages/teleterm/src/preload.ts b/web/packages/teleterm/src/preload.ts
index 8faa6a267da26..95cb082291988 100644
--- a/web/packages/teleterm/src/preload.ts
+++ b/web/packages/teleterm/src/preload.ts
@@ -16,28 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { contextBridge, webUtils } from 'electron';
 import { ChannelCredentials, ServerCredentials } from '@grpc/grpc-js';
 import { GrpcTransport } from '@protobuf-ts/grpc-transport';
+import { contextBridge, webUtils } from 'electron';
 
-import { createTshdClient, createVnetClient } from 'teleterm/services/tshd';
-import { loggingInterceptor } from 'teleterm/services/tshd/interceptors';
-import createMainProcessClient from 'teleterm/mainProcess/mainProcessClient';
-import { createFileLoggerService } from 'teleterm/services/logger';
 import Logger from 'teleterm/logger';
-import { createPtyService } from 'teleterm/services/pty/ptyService';
+import createMainProcessClient from 'teleterm/mainProcess/mainProcessClient';
 import {
-  GrpcCertName,
   createClientCredentials,
-  createServerCredentials,
   createInsecureClientCredentials,
   createInsecureServerCredentials,
+  createServerCredentials,
   generateAndSaveGrpcCert,
+  GrpcCertName,
   readGrpcCert,
   shouldEncryptConnection,
 } from 'teleterm/services/grpcCredentials';
-import { ElectronGlobals, RuntimeSettings } from 'teleterm/types';
+import { createFileLoggerService } from 'teleterm/services/logger';
+import { createPtyService } from 'teleterm/services/pty/ptyService';
+import { createTshdClient, createVnetClient } from 'teleterm/services/tshd';
+import { loggingInterceptor } from 'teleterm/services/tshd/interceptors';
 import { createTshdEventsServer } from 'teleterm/services/tshdEvents';
+import { ElectronGlobals, RuntimeSettings } from 'teleterm/types';
 
 const mainProcessClient = createMainProcessClient();
 const runtimeSettings = mainProcessClient.getRuntimeSettings();
diff --git a/web/packages/teleterm/src/services/config/configService.test.ts b/web/packages/teleterm/src/services/config/configService.test.ts
index 88f7be952bdfe..ef5a718757369 100644
--- a/web/packages/teleterm/src/services/config/configService.test.ts
+++ b/web/packages/teleterm/src/services/config/configService.test.ts
@@ -17,8 +17,8 @@
  */
 
 import Logger, { NullService } from 'teleterm/logger';
-import { createMockFileStorage } from 'teleterm/services/fileStorage/fixtures/mocks';
 import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
+import { createMockFileStorage } from 'teleterm/services/fileStorage/fixtures/mocks';
 
 import { createConfigService } from './configService';
 
diff --git a/web/packages/teleterm/src/services/config/configService.ts b/web/packages/teleterm/src/services/config/configService.ts
index 64abe3fcc3401..6def57378dfd3 100644
--- a/web/packages/teleterm/src/services/config/configService.ts
+++ b/web/packages/teleterm/src/services/config/configService.ts
@@ -19,14 +19,14 @@
 import { z, ZodIssue } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
-import { FileStorage } from 'teleterm/services/fileStorage';
 import Logger from 'teleterm/logger';
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
+import { FileStorage } from 'teleterm/services/fileStorage';
 
 import {
-  createAppConfigSchema,
-  AppConfigSchema,
   AppConfig,
+  AppConfigSchema,
+  createAppConfigSchema,
 } from './appConfigSchema';
 
 const logger = new Logger('ConfigService');
diff --git a/web/packages/teleterm/src/services/config/keyboardShortcutSchema.test.ts b/web/packages/teleterm/src/services/config/keyboardShortcutSchema.test.ts
index da9b3672d3526..16254ee2f7db0 100644
--- a/web/packages/teleterm/src/services/config/keyboardShortcutSchema.test.ts
+++ b/web/packages/teleterm/src/services/config/keyboardShortcutSchema.test.ts
@@ -20,9 +20,9 @@ import { z, ZodError } from 'zod';
 
 import {
   createKeyboardShortcutSchema,
-  invalidModifierIssue,
-  invalidKeyCodeIssue,
   duplicateModifierIssue,
+  invalidKeyCodeIssue,
+  invalidModifierIssue,
   missingModifierIssue,
 } from './keyboardShortcutSchema';
 
diff --git a/web/packages/teleterm/src/services/config/migration.ts b/web/packages/teleterm/src/services/config/migration.ts
index b22e1ebe46b56..a20660567ddd2 100644
--- a/web/packages/teleterm/src/services/config/migration.ts
+++ b/web/packages/teleterm/src/services/config/migration.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { FileStorage } from 'teleterm/services/fileStorage';
 import Logger from 'teleterm/logger';
+import { FileStorage } from 'teleterm/services/fileStorage';
 
 const logger = new Logger('ConfigMigration');
 
diff --git a/web/packages/teleterm/src/services/fileStorage/fileStorage.ts b/web/packages/teleterm/src/services/fileStorage/fileStorage.ts
index 994db45a0e610..0332f29abd618 100644
--- a/web/packages/teleterm/src/services/fileStorage/fileStorage.ts
+++ b/web/packages/teleterm/src/services/fileStorage/fileStorage.ts
@@ -17,8 +17,8 @@
  */
 
 // Both versions are imported because some operations need to be sync.
-import fsAsync from 'node:fs/promises';
 import fs from 'node:fs';
+import fsAsync from 'node:fs/promises';
 import path from 'node:path';
 
 import { debounce } from 'shared/utils/highbar';
diff --git a/web/packages/teleterm/src/services/fileStorage/fileStorageClient.ts b/web/packages/teleterm/src/services/fileStorage/fileStorageClient.ts
index a639dcd949443..c9820a6cb4bbc 100644
--- a/web/packages/teleterm/src/services/fileStorage/fileStorageClient.ts
+++ b/web/packages/teleterm/src/services/fileStorage/fileStorageClient.ts
@@ -22,7 +22,6 @@ import {
   FileStorageEventChannel,
   FileStorageEventType,
 } from '../../mainProcess/types';
-
 import { FileStorage } from './fileStorage';
 
 // TODO(ravicious): The main process should not expose the whole interface of FileStorage to the
diff --git a/web/packages/teleterm/src/services/grpcCredentials/files.ts b/web/packages/teleterm/src/services/grpcCredentials/files.ts
index e639bf6d8382c..3d16676490aa2 100644
--- a/web/packages/teleterm/src/services/grpcCredentials/files.ts
+++ b/web/packages/teleterm/src/services/grpcCredentials/files.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import path from 'path';
 import { watch } from 'fs';
-import { readFile, writeFile, stat, rename } from 'fs/promises';
+import { readFile, rename, stat, writeFile } from 'fs/promises';
+import path from 'path';
 
 import { makeCert } from './makeCert';
 
diff --git a/web/packages/teleterm/src/services/grpcCredentials/makeCert/makeCert.ts b/web/packages/teleterm/src/services/grpcCredentials/makeCert/makeCert.ts
index 4399a38b87765..ae6c4e13e5454 100644
--- a/web/packages/teleterm/src/services/grpcCredentials/makeCert/makeCert.ts
+++ b/web/packages/teleterm/src/services/grpcCredentials/makeCert/makeCert.ts
@@ -43,7 +43,7 @@
 
 import { promisify } from 'util';
 
-import { pki, md } from 'node-forge';
+import { md, pki } from 'node-forge';
 
 const generateKeyPair = promisify(pki.rsa.generateKeyPair.bind(pki.rsa));
 
diff --git a/web/packages/teleterm/src/services/logger/loggerService.ts b/web/packages/teleterm/src/services/logger/loggerService.ts
index e83ce742aee1a..fd580f8f528a4 100644
--- a/web/packages/teleterm/src/services/logger/loggerService.ts
+++ b/web/packages/teleterm/src/services/logger/loggerService.ts
@@ -16,23 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { ChildProcess } from 'node:child_process';
 import stream from 'node:stream';
 
+import split2 from 'split2';
 import winston, {
   createLogger as createWinston,
   format,
   transports,
+  type Logform,
 } from 'winston';
-import { isObject } from 'shared/utils/highbar';
 
-import split2 from 'split2';
+import { isObject } from 'shared/utils/highbar';
 
-import { Logger, LoggerService, NodeLoggerService } from './types';
 import { KeepLastChunks } from './keepLastChunks';
-
-import type { Logform } from 'winston';
-
-import type { ChildProcess } from 'node:child_process';
+import { Logger, LoggerService, NodeLoggerService } from './types';
 
 /**
  * stdout logger should be used in child processes.
diff --git a/web/packages/teleterm/src/services/logger/types.ts b/web/packages/teleterm/src/services/logger/types.ts
index a48068e467651..1bc5f231113bc 100644
--- a/web/packages/teleterm/src/services/logger/types.ts
+++ b/web/packages/teleterm/src/services/logger/types.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { KeepLastChunks } from './keepLastChunks';
-
 import type { ChildProcess } from 'node:child_process';
 
+import { KeepLastChunks } from './keepLastChunks';
+
 export interface Logger {
   error(...args: unknown[]): void;
   warn(...args: unknown[]): void;
diff --git a/web/packages/teleterm/src/services/pty/fixtures/mocks.ts b/web/packages/teleterm/src/services/pty/fixtures/mocks.ts
index 1beeb875b2670..7e731025c9850 100644
--- a/web/packages/teleterm/src/services/pty/fixtures/mocks.ts
+++ b/web/packages/teleterm/src/services/pty/fixtures/mocks.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
 import {
   PtyProcessCreationStatus,
   PtyServiceClient,
 } from 'teleterm/services/pty';
+import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
 
 export class MockPtyProcess implements IPtyProcess {
   start() {}
diff --git a/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.test.ts b/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.test.ts
index 4c3ccc926f40e..4dbab055667d2 100644
--- a/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.test.ts
+++ b/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.test.ts
@@ -16,19 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
-
 import Logger, { NullService } from 'teleterm/logger';
+import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
 
 import {
-  ShellCommand,
-  TshLoginCommand,
   GatewayCliClientCommand,
   PtyProcessCreationStatus,
+  ShellCommand,
   SshOptions,
+  TshLoginCommand,
 } from '../types';
-
-import { getPtyProcessOptions, buildPtyOptions } from './buildPtyOptions';
+import { buildPtyOptions, getPtyProcessOptions } from './buildPtyOptions';
 
 beforeAll(() => {
   Logger.init(new NullService());
diff --git a/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.ts b/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.ts
index d73f888ebefb0..218f7c36cc1ab 100644
--- a/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.ts
+++ b/web/packages/teleterm/src/services/pty/ptyHost/buildPtyOptions.ts
@@ -18,25 +18,24 @@
 
 import path, { delimiter } from 'path';
 
+import { makeCustomShellFromPath, Shell } from 'teleterm/mainProcess/shell';
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
-import { PtyProcessOptions } from 'teleterm/sharedProcess/ptyHost';
-import { assertUnreachable } from 'teleterm/ui/utils';
-import { Shell, makeCustomShellFromPath } from 'teleterm/mainProcess/shell';
-import { CUSTOM_SHELL_ID } from 'teleterm/services/config/appConfigSchema';
 import {
   TSH_AUTOUPDATE_ENV_VAR,
   TSH_AUTOUPDATE_OFF,
 } from 'teleterm/node/tshAutoupdate';
+import { CUSTOM_SHELL_ID } from 'teleterm/services/config/appConfigSchema';
+import { PtyProcessOptions } from 'teleterm/sharedProcess/ptyHost';
+import { assertUnreachable } from 'teleterm/ui/utils';
 
 import {
   PtyCommand,
   PtyProcessCreationStatus,
-  TshKubeLoginCommand,
-  WindowsPty,
   ShellCommand,
   SshOptions,
+  TshKubeLoginCommand,
+  WindowsPty,
 } from '../types';
-
 import {
   resolveShellEnvCached,
   ResolveShellEnvTimeoutError,
diff --git a/web/packages/teleterm/src/services/pty/ptyHost/ptyEventsStreamHandler.ts b/web/packages/teleterm/src/services/pty/ptyHost/ptyEventsStreamHandler.ts
index ef0fdf9a07c83..e82b09938969a 100644
--- a/web/packages/teleterm/src/services/pty/ptyHost/ptyEventsStreamHandler.ts
+++ b/web/packages/teleterm/src/services/pty/ptyHost/ptyEventsStreamHandler.ts
@@ -18,8 +18,12 @@
 
 import { ClientDuplexStream } from '@grpc/grpc-js';
 
+import {
+  ptyEventOneOfIsData,
+  ptyEventOneOfIsExit,
+  ptyEventOneOfIsStartError,
+} from 'teleterm/helpers';
 import Logger from 'teleterm/logger';
-
 import {
   PtyClientEvent,
   PtyEventData,
@@ -27,11 +31,6 @@ import {
   PtyEventStart,
   PtyServerEvent,
 } from 'teleterm/sharedProcess/ptyHost';
-import {
-  ptyEventOneOfIsData,
-  ptyEventOneOfIsExit,
-  ptyEventOneOfIsStartError,
-} from 'teleterm/helpers';
 
 export class PtyEventsStreamHandler {
   private logger: Logger;
diff --git a/web/packages/teleterm/src/services/pty/ptyHost/ptyHostClient.ts b/web/packages/teleterm/src/services/pty/ptyHost/ptyHostClient.ts
index 8990bfb0a1f64..5c0aa57df6cb1 100644
--- a/web/packages/teleterm/src/services/pty/ptyHost/ptyHostClient.ts
+++ b/web/packages/teleterm/src/services/pty/ptyHost/ptyHostClient.ts
@@ -18,16 +18,14 @@
 
 import { ChannelCredentials, Metadata } from '@grpc/grpc-js';
 
+import { Struct } from 'teleterm/sharedProcess/api/protogen/google/protobuf/struct_pb';
 import {
   PtyHostClient as GrpcClient,
   PtyCreate,
   PtyId,
 } from 'teleterm/sharedProcess/ptyHost';
 
-import { Struct } from 'teleterm/sharedProcess/api/protogen/google/protobuf/struct_pb';
-
 import { PtyHostClient } from '../types';
-
 import { PtyEventsStreamHandler } from './ptyEventsStreamHandler';
 
 export function createPtyHostClient(
diff --git a/web/packages/teleterm/src/services/pty/ptyService.ts b/web/packages/teleterm/src/services/pty/ptyService.ts
index 254e029e94f0e..6fadcfe1fe305 100644
--- a/web/packages/teleterm/src/services/pty/ptyService.ts
+++ b/web/packages/teleterm/src/services/pty/ptyService.ts
@@ -24,8 +24,8 @@ import { ConfigService } from 'teleterm/services/config';
 import { buildPtyOptions } from './ptyHost/buildPtyOptions';
 import { createPtyHostClient } from './ptyHost/ptyHostClient';
 import { createPtyProcess } from './ptyHost/ptyProcess';
-import { PtyServiceClient } from './types';
 import { getWindowsPty } from './ptyHost/windowsPty';
+import { PtyServiceClient } from './types';
 
 export function createPtyService(
   address: string,
diff --git a/web/packages/teleterm/src/services/pty/types.ts b/web/packages/teleterm/src/services/pty/types.ts
index 0ccaf91427148..548fb389acfb4 100644
--- a/web/packages/teleterm/src/services/pty/types.ts
+++ b/web/packages/teleterm/src/services/pty/types.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { PtyProcessOptions, IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
 import { Shell } from 'teleterm/mainProcess/shell';
+import { IPtyProcess, PtyProcessOptions } from 'teleterm/sharedProcess/ptyHost';
 
 import { PtyEventsStreamHandler } from './ptyHost/ptyEventsStreamHandler';
 
diff --git a/web/packages/teleterm/src/services/tshd/cloneableClient.test.ts b/web/packages/teleterm/src/services/tshd/cloneableClient.test.ts
index 02e266b490e9e..e1cd6001a253b 100644
--- a/web/packages/teleterm/src/services/tshd/cloneableClient.test.ts
+++ b/web/packages/teleterm/src/services/tshd/cloneableClient.test.ts
@@ -22,21 +22,21 @@
 import { EventEmitter } from 'node:events';
 
 import {
-  UnaryCall,
-  RpcError,
   ClientStreamingCall,
-  ServerStreamingCall,
   DuplexStreamingCall,
+  MethodInfo,
+  RpcError,
   RpcOutputStream,
+  ServerStreamingCall,
   ServiceInfo,
-  MethodInfo,
+  UnaryCall,
 } from '@protobuf-ts/runtime-rpc';
 
 import {
   cloneAbortSignal,
-  TshdRpcError,
   cloneClient,
   isTshdRpcError,
+  TshdRpcError,
 } from './cloneableClient';
 
 function getRpcError() {
diff --git a/web/packages/teleterm/src/services/tshd/cloneableClient.ts b/web/packages/teleterm/src/services/tshd/cloneableClient.ts
index 045622ee8283d..05e4193b7cc1e 100644
--- a/web/packages/teleterm/src/services/tshd/cloneableClient.ts
+++ b/web/packages/teleterm/src/services/tshd/cloneableClient.ts
@@ -17,16 +17,16 @@
  */
 
 import {
-  RpcInputStream,
-  UnaryCall,
   ClientStreamingCall,
-  ServerStreamingCall,
   DuplexStreamingCall,
-  RpcOutputStream,
+  FinishedUnaryCall,
   RpcError,
+  RpcInputStream,
   RpcOptions,
+  RpcOutputStream,
+  ServerStreamingCall,
   ServiceInfo,
-  FinishedUnaryCall,
+  UnaryCall,
 } from '@protobuf-ts/runtime-rpc';
 
 /**
diff --git a/web/packages/teleterm/src/services/tshd/createClient.ts b/web/packages/teleterm/src/services/tshd/createClient.ts
index 31bc749b1589b..23b16517eed93 100644
--- a/web/packages/teleterm/src/services/tshd/createClient.ts
+++ b/web/packages/teleterm/src/services/tshd/createClient.ts
@@ -17,6 +17,7 @@
  */
 
 import { GrpcTransport } from '@protobuf-ts/grpc-transport';
+
 import {
   ITerminalServiceClient,
   TerminalServiceClient,
diff --git a/web/packages/teleterm/src/services/tshd/fixtures/mocks.ts b/web/packages/teleterm/src/services/tshd/fixtures/mocks.ts
index 8d0fa6999711d..5ab36a94f74fb 100644
--- a/web/packages/teleterm/src/services/tshd/fixtures/mocks.ts
+++ b/web/packages/teleterm/src/services/tshd/fixtures/mocks.ts
@@ -17,13 +17,13 @@
  */
 
 import {
-  makeRootCluster,
   makeAppGateway,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
 import { getDefaultUnifiedResourcePreferences } from 'teleterm/ui/services/workspacesService';
 
-import { VnetClient, TshdClient } from '../createClient';
 import { MockedUnaryCall } from '../cloneableClient';
+import { TshdClient, VnetClient } from '../createClient';
 
 export class MockTshClient implements TshdClient {
   listRootClusters = () => new MockedUnaryCall({ clusters: [] });
diff --git a/web/packages/teleterm/src/services/tshd/gateway.ts b/web/packages/teleterm/src/services/tshd/gateway.ts
index 629706188b24e..266732bda6474 100644
--- a/web/packages/teleterm/src/services/tshd/gateway.ts
+++ b/web/packages/teleterm/src/services/tshd/gateway.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { routing, GatewayTargetUri } from 'teleterm/ui/uri';
+import { GatewayTargetUri, routing } from 'teleterm/ui/uri';
 
 import { GatewayCLICommand } from './types';
 
diff --git a/web/packages/teleterm/src/services/tshd/interceptors.test.ts b/web/packages/teleterm/src/services/tshd/interceptors.test.ts
index 917906a8184af..3aa0a354a2063 100644
--- a/web/packages/teleterm/src/services/tshd/interceptors.test.ts
+++ b/web/packages/teleterm/src/services/tshd/interceptors.test.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { UnaryCall, MethodInfo, ServiceInfo } from '@protobuf-ts/runtime-rpc';
+import { MethodInfo, ServiceInfo, UnaryCall } from '@protobuf-ts/runtime-rpc';
 
 import Logger from 'teleterm/logger';
 
diff --git a/web/packages/teleterm/src/services/tshd/testHelpers.ts b/web/packages/teleterm/src/services/tshd/testHelpers.ts
index 0ad30524df7ed..b19fc95725192 100644
--- a/web/packages/teleterm/src/services/tshd/testHelpers.ts
+++ b/web/packages/teleterm/src/services/tshd/testHelpers.ts
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 import {
   ACL,
   ShowResources,
 } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
-import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 
-import * as tsh from './types';
 import { TshdRpcError } from './cloneableClient';
+import * as tsh from './types';
 
 export const rootClusterUri = '/clusters/teleport-local';
 export const leafClusterUri = `${rootClusterUri}/leaves/leaf`;
diff --git a/web/packages/teleterm/src/services/tshdEvents/index.ts b/web/packages/teleterm/src/services/tshdEvents/index.ts
index f33638c1c709a..ea48956ce8ac3 100644
--- a/web/packages/teleterm/src/services/tshdEvents/index.ts
+++ b/web/packages/teleterm/src/services/tshdEvents/index.ts
@@ -17,17 +17,18 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
+
 import * as api from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 import * as apiService from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb.grpc-server';
 
-import * as uri from 'teleterm/ui/uri';
 import Logger from 'teleterm/logger';
+import { filterSensitiveProperties } from 'teleterm/services/tshd/interceptors';
 import {
   ExtractRequestType,
   ExtractResponseType,
   TshdEventContextBridgeService,
 } from 'teleterm/types';
-import { filterSensitiveProperties } from 'teleterm/services/tshd/interceptors';
+import * as uri from 'teleterm/ui/uri';
 
 export interface ReloginRequest extends api.ReloginRequest {
   rootClusterUri: uri.RootClusterUri;
diff --git a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyEventsStreamHandler.ts b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyEventsStreamHandler.ts
index a9aa281451131..8b8639fd6fe94 100644
--- a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyEventsStreamHandler.ts
+++ b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyEventsStreamHandler.ts
@@ -18,13 +18,12 @@
 
 import { ServerDuplexStream } from '@grpc/grpc-js';
 
-import Logger from 'teleterm/logger';
-
 import {
   ptyEventOneOfIsData,
   ptyEventOneOfIsResize,
   ptyEventOneOfIsStart,
 } from 'teleterm/helpers';
+import Logger from 'teleterm/logger';
 
 import {
   PtyClientEvent,
@@ -36,7 +35,6 @@ import {
   PtyEventStartError,
   PtyServerEvent,
 } from '../api/protogen/ptyHostService_pb';
-
 import { PtyProcess } from './ptyProcess';
 
 export class PtyEventsStreamHandler {
diff --git a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyHostService.ts b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyHostService.ts
index ffb1cb524321b..890da62b5ddac 100644
--- a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyHostService.ts
+++ b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyHostService.ts
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { unique } from 'teleterm/ui/utils';
-
 import Logger from 'teleterm/logger';
-
 import { Struct } from 'teleterm/sharedProcess/api/protogen/google/protobuf/struct_pb';
+import { unique } from 'teleterm/ui/utils';
 
-import { PtyProcess } from './ptyProcess';
-import { IPtyHost } from './../api/protogen/ptyHostService_pb.grpc-server';
 import { PtyCwd, PtyId } from './../api/protogen/ptyHostService_pb';
+import { IPtyHost } from './../api/protogen/ptyHostService_pb.grpc-server';
 import { PtyEventsStreamHandler } from './ptyEventsStreamHandler';
+import { PtyProcess } from './ptyProcess';
 
 export function createPtyHostService(): IPtyHost & {
   dispose(): Promise<void>;
diff --git a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyProcess.ts b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyProcess.ts
index 1762ca17a1ef2..771065ded6a67 100644
--- a/web/packages/teleterm/src/sharedProcess/ptyHost/ptyProcess.ts
+++ b/web/packages/teleterm/src/sharedProcess/ptyHost/ptyProcess.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { readlink } from 'node:fs';
 import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
 import { EventEmitter } from 'node:events';
+import { readlink } from 'node:fs';
+import { promisify } from 'node:util';
 
 import * as nodePTY from 'node-pty';
 import which from 'which';
@@ -28,7 +28,7 @@ import { wait } from 'shared/utils/wait';
 
 import Logger from 'teleterm/logger';
 
-import { PtyProcessOptions, IPtyProcess } from './types';
+import { IPtyProcess, PtyProcessOptions } from './types';
 
 type Status = 'open' | 'not_initialized' | 'terminated';
 
diff --git a/web/packages/teleterm/src/sharedProcess/sharedProcess.ts b/web/packages/teleterm/src/sharedProcess/sharedProcess.ts
index 134c80338de36..166e0c1126b28 100644
--- a/web/packages/teleterm/src/sharedProcess/sharedProcess.ts
+++ b/web/packages/teleterm/src/sharedProcess/sharedProcess.ts
@@ -18,8 +18,8 @@
 
 import { Server, ServerCredentials } from '@grpc/grpc-js';
 
-import { createStdoutLoggerService } from 'teleterm/services/logger';
-
+import Logger from 'teleterm/logger';
+import { RuntimeSettings, TERMINATE_MESSAGE } from 'teleterm/mainProcess/types';
 import {
   createInsecureServerCredentials,
   createServerCredentials,
@@ -28,9 +28,7 @@ import {
   readGrpcCert,
   shouldEncryptConnection,
 } from 'teleterm/services/grpcCredentials';
-import { RuntimeSettings, TERMINATE_MESSAGE } from 'teleterm/mainProcess/types';
-import Logger from 'teleterm/logger';
-
+import { createStdoutLoggerService } from 'teleterm/services/logger';
 import { ptyHostDefinition } from 'teleterm/sharedProcess/api/protogen/ptyHostService_pb.grpc-server';
 
 import { createPtyHostService } from './ptyHost/ptyHostService';
diff --git a/web/packages/teleterm/src/types.ts b/web/packages/teleterm/src/types.ts
index 6f41116362a76..fd0d074ff8239 100644
--- a/web/packages/teleterm/src/types.ts
+++ b/web/packages/teleterm/src/types.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ITshdEventsService } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb.grpc-server';
-
 import { sendUnaryData, ServerUnaryCall } from '@grpc/grpc-js';
 
-import { Logger, LoggerService } from 'teleterm/services/logger/types';
-import { FileStorage } from 'teleterm/services/fileStorage';
+import { ITshdEventsService } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb.grpc-server';
+
 import { MainProcessClient, RuntimeSettings } from 'teleterm/mainProcess/types';
+import { FileStorage } from 'teleterm/services/fileStorage';
+import { Logger, LoggerService } from 'teleterm/services/logger/types';
 import { PtyServiceClient } from 'teleterm/services/pty';
-import { VnetClient, TshdClient } from 'teleterm/services/tshd/createClient';
+import { TshdClient, VnetClient } from 'teleterm/services/tshd/createClient';
 
 export type {
   Logger,
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/AccessRequestCheckout.tsx b/web/packages/teleterm/src/ui/AccessRequestCheckout/AccessRequestCheckout.tsx
index 2cc34cb15c676..0ad7e918ac774 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/AccessRequestCheckout.tsx
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/AccessRequestCheckout.tsx
@@ -21,21 +21,20 @@ import { Transition } from 'react-transition-group';
 
 import {
   Box,
-  Flex,
+  ButtonIcon,
   ButtonPrimary,
   ButtonText,
-  Text,
-  ButtonIcon,
+  Flex,
   Label,
+  Text,
 } from 'design';
 import * as Icon from 'design/Icon';
-import { pluralize } from 'shared/utils/text';
-
 import { RequestCheckoutWithSlider } from 'shared/components/AccessRequests/NewRequest';
 import { isKubeClusterWithNamespaces } from 'shared/components/AccessRequests/NewRequest/kube';
+import { pluralize } from 'shared/utils/text';
 
-import useAccessRequestCheckout from './useAccessRequestCheckout';
 import { AssumedRolesBar } from './AssumedRolesBar';
+import useAccessRequestCheckout from './useAccessRequestCheckout';
 
 const MAX_RESOURCES_IN_BAR_TO_SHOW = 5;
 
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/AssumedRolesBar.tsx b/web/packages/teleterm/src/ui/AccessRequestCheckout/AssumedRolesBar.tsx
index 833c719d0b8dc..76e4cc7eebbf6 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/AssumedRolesBar.tsx
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/AssumedRolesBar.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Box, Flex, Text } from 'design';
 import { pluralize } from 'shared/utils/text';
 
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.test.tsx b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.test.tsx
index 7788270ace51f..b08d1075f202d 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.test.tsx
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.test.tsx
@@ -16,19 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, waitFor, act } from '@testing-library/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
 
 import {
+  makeKube,
   makeRootCluster,
   makeServer,
-  makeKube,
   rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 
 import { mapRequestToKubeNamespaceUri } from '../services/workspacesService/accessRequestsService';
-
 import useAccessRequestCheckout, {
   PendingListKubeClusterWithOriginalItem,
 } from './useAccessRequestCheckout';
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.ts b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.ts
index 8c2ca1277f353..521002a1f222e 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.ts
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.ts
@@ -16,38 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
-import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
-
-import useAttempt from 'shared/hooks/useAttemptNext';
+import { useEffect, useState } from 'react';
 
+import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
 import {
   getDryRunMaxDuration,
-  PendingListItem,
-  PendingKubeResourceItem,
   isKubeClusterWithNamespaces,
+  PendingKubeResourceItem,
+  PendingListItem,
   RequestableResourceKind,
 } from 'shared/components/AccessRequests/NewRequest';
 import { useSpecifiableFields } from 'shared/components/AccessRequests/NewRequest/useSpecifiableFields';
-
 import { CreateRequest } from 'shared/components/AccessRequests/Shared/types';
+import useAttempt from 'shared/hooks/useAttemptNext';
 
+import {
+  CreateAccessRequestRequest,
+  AccessRequest as TeletermAccessRequest,
+} from 'teleterm/services/tshd/types';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useWorkspaceServiceState } from 'teleterm/ui/services/workspacesService';
 import {
-  PendingAccessRequest,
   extractResourceRequestProperties,
-  ResourceRequest,
-  mapRequestToKubeNamespaceUri,
   mapKubeNamespaceUriToRequest,
+  mapRequestToKubeNamespaceUri,
+  PendingAccessRequest,
+  ResourceRequest,
 } from 'teleterm/ui/services/workspacesService/accessRequestsService';
-import { retryWithRelogin } from 'teleterm/ui/utils';
-import {
-  CreateAccessRequestRequest,
-  AccessRequest as TeletermAccessRequest,
-} from 'teleterm/services/tshd/types';
-
 import { routing } from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 import { makeUiAccessRequest } from '../DocumentAccessRequests/useAccessRequests';
 
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.test.tsx b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.test.tsx
index 9bcef0bc06467..d0bcc2dcba6f0 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.test.tsx
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.test.tsx
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act, renderHook } from '@testing-library/react';
 import { useEffect } from 'react';
-import { renderHook, act } from '@testing-library/react';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import {
   ResourcesContextProvider,
   useResourcesContext,
 } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { RootClusterUri } from 'teleterm/ui/uri';
 
 import { useAssumedRolesBar } from './useAssumedRolesBar';
diff --git a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.ts b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.ts
index b038ec8d6b283..d43d50c0d531a 100644
--- a/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.ts
+++ b/web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.ts
@@ -16,23 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useCallback } from 'react';
 import {
+  Duration,
+  formatDuration,
   intervalToDuration,
   isBefore,
   secondsToMilliseconds,
-  formatDuration,
-  Duration,
 } from 'date-fns';
-
-import { useAsync } from 'shared/hooks/useAsync';
+import { useCallback, useState } from 'react';
 
 import { useInterval } from 'shared/hooks';
+import { useAsync } from 'shared/hooks/useAsync';
 
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { retryWithRelogin } from 'teleterm/ui/utils';
 import { AssumedRequest } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useResourcesContext } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function useAssumedRolesBar(assumedRequest: AssumedRequest) {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/App.tsx b/web/packages/teleterm/src/ui/App.tsx
index 204a3e467ce04..5bb3a7bbd3faa 100644
--- a/web/packages/teleterm/src/ui/App.tsx
+++ b/web/packages/teleterm/src/ui/App.tsx
@@ -22,14 +22,14 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 
 import { AppInitializer } from 'teleterm/ui/AppInitializer';
 
-import { CatchError } from './components/CatchError';
-import { StyledApp } from './components/App';
-import AppContextProvider from './appContextProvider';
 import AppContext from './appContext';
+import AppContextProvider from './appContextProvider';
+import { StyledApp } from './components/App';
+import { CatchError } from './components/CatchError';
+import { ResourcesContextProvider } from './DocumentCluster/resourcesContext';
 import { ThemeProvider } from './ThemeProvider';
-import { VnetContextProvider } from './Vnet/vnetContext';
 import { ConnectionsContextProvider } from './TopBar/Connections/connectionsContext';
-import { ResourcesContextProvider } from './DocumentCluster/resourcesContext';
+import { VnetContextProvider } from './Vnet/vnetContext';
 
 export const App: React.FC<{ ctx: AppContext }> = ({ ctx }) => {
   return (
diff --git a/web/packages/teleterm/src/ui/AppInitializer/AppInitializer.tsx b/web/packages/teleterm/src/ui/AppInitializer/AppInitializer.tsx
index ef067f0642fbc..06170da12cd70 100644
--- a/web/packages/teleterm/src/ui/AppInitializer/AppInitializer.tsx
+++ b/web/packages/teleterm/src/ui/AppInitializer/AppInitializer.tsx
@@ -18,12 +18,13 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
+
 import { Indicator } from 'design';
 
-import { useLogger } from 'teleterm/ui/hooks/useLogger';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import ModalsHost from 'teleterm/ui/ModalsHost';
+import { useLogger } from 'teleterm/ui/hooks/useLogger';
 import { LayoutManager } from 'teleterm/ui/LayoutManager';
+import ModalsHost from 'teleterm/ui/ModalsHost';
 
 import { showStartupModalsAndNotifications } from './showStartupModalsAndNotifications';
 
diff --git a/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.test.ts b/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.test.ts
index 2a49db9f6fa4e..8803b1e83862e 100644
--- a/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.test.ts
+++ b/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.test.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import Logger, { NullService } from 'teleterm/logger';
 import AppContext from 'teleterm/ui/appContext';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { Dialog } from 'teleterm/ui/services/modals';
 
 import { showStartupModalsAndNotifications } from './showStartupModalsAndNotifications';
diff --git a/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.ts b/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.ts
index 8bbaf525cd116..9b5aebccde3d6 100644
--- a/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.ts
+++ b/web/packages/teleterm/src/ui/AppInitializer/showStartupModalsAndNotifications.ts
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ConfigService } from 'teleterm/services/config';
+import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
 import {
   askAboutUserJobRoleIfNeeded,
   setUpUsageReporting,
 } from 'teleterm/ui/services/usage';
 import { IAppContext } from 'teleterm/ui/types';
-import { ConfigService } from 'teleterm/services/config';
-import { NotificationsService } from 'teleterm/ui/services/notifications';
-import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
 
 /**
  * Runs after the UI becomes visible.
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.story.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.story.tsx
index f9dea4b53193e..d1b0d6a5d379f 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.story.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.story.tsx
@@ -20,16 +20,14 @@ import { PropsWithChildren } from 'react';
 
 import Dialog from 'design/Dialog';
 
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
+import type * as tshd from 'teleterm/services/tshd/types';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 
 import { dialogCss } from '../spacing';
-
 import { ClusterAdd } from './ClusterAdd';
 
-import type * as tshd from 'teleterm/services/tshd/types';
-
 export default {
   title: 'Teleterm/ModalsHost/ClusterAdd',
 };
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.tsx
index 4a8239b5ec3df..68d96c1c0bb95 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.tsx
@@ -17,12 +17,13 @@
  */
 
 import { useState } from 'react';
+
+import { Box, ButtonPrimary, ButtonSecondary, Flex, H2 } from 'design';
 import * as Alerts from 'design/Alert';
-import { Box, Flex, ButtonPrimary, ButtonSecondary, H2 } from 'design';
+import { DialogContent, DialogHeader } from 'design/Dialog';
 import FieldInput from 'shared/components/FieldInput';
 import Validation from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
-import { DialogContent, DialogHeader } from 'design/Dialog';
 import { useAsync } from 'shared/hooks/useAsync';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.story.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.story.tsx
index 2500135faf616..095b7fad3cc15 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.story.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.story.tsx
@@ -18,7 +18,7 @@
 import { makeErrorAttempt, makeProcessingAttempt } from 'shared/hooks/useAsync';
 
 import { ClusterLoginPresentation } from './ClusterLogin';
-import { TestContainer, makeProps } from './storyHelpers';
+import { makeProps, TestContainer } from './storyHelpers';
 
 export default {
   title: 'Teleterm/ModalsHost/ClusterLogin',
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.tsx
index 5503a1e243036..dfdcd774fdc9a 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLogin.tsx
@@ -17,29 +17,29 @@
  */
 
 import React from 'react';
-import * as Alerts from 'design/Alert';
+
 import {
-  ButtonIcon,
-  Text,
-  Indicator,
   Box,
+  ButtonIcon,
+  ButtonPrimary,
   Flex,
   H2,
-  ButtonPrimary,
+  Indicator,
+  Text,
 } from 'design';
+import * as Alerts from 'design/Alert';
+import { DialogContent, DialogHeader } from 'design/Dialog';
 import * as Icons from 'design/Icon';
-import { DialogHeader, DialogContent } from 'design/Dialog';
 import { PrimaryAuthType } from 'shared/services';
 
+import { publicAddrWithTargetPort } from 'teleterm/services/tshd/app';
+import { getTargetNameFromUri } from 'teleterm/services/tshd/gateway';
 import { AuthSettings } from 'teleterm/ui/services/clusters/types';
 import { ClusterConnectReason } from 'teleterm/ui/services/modals';
-import { getTargetNameFromUri } from 'teleterm/services/tshd/gateway';
-import { publicAddrWithTargetPort } from 'teleterm/services/tshd/app';
 
 import { outermostPadding } from '../spacing';
-
 import LoginForm from './FormLogin';
-import useClusterLogin, { State, Props } from './useClusterLogin';
+import useClusterLogin, { Props, State } from './useClusterLogin';
 
 export function ClusterLogin(props: Props & { reason: ClusterConnectReason }) {
   const { reason, ...otherProps } = props;
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLoginReason.story.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLoginReason.story.tsx
index 3c85c93504876..0c295f121e632 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLoginReason.story.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/ClusterLoginReason.story.tsx
@@ -22,8 +22,8 @@ import {
 } from 'teleterm/services/tshd/testHelpers';
 import { routing } from 'teleterm/ui/uri';
 
-import { TestContainer, makeProps } from './storyHelpers';
 import { ClusterLoginPresentation } from './ClusterLogin';
+import { makeProps, TestContainer } from './storyHelpers';
 
 export default {
   title: 'Teleterm/ModalsHost/ClusterLogin/Reason',
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLocal/FormLocal.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLocal/FormLocal.tsx
index bf7decd149c93..ec729af33853d 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLocal/FormLocal.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLocal/FormLocal.tsx
@@ -17,10 +17,10 @@
  */
 
 import React, { useState } from 'react';
-import { ButtonPrimary, Flex } from 'design';
 
-import Validation, { Validator } from 'shared/components/Validation';
+import { ButtonPrimary, Flex } from 'design';
 import FieldInput from 'shared/components/FieldInput';
+import Validation, { Validator } from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 import { useRefAutoFocus } from 'shared/hooks';
 
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLogin.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLogin.tsx
index a5714014de6b5..9fe7b485070e3 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLogin.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormLogin.tsx
@@ -17,24 +17,22 @@
  */
 
 import styled from 'styled-components';
-import { Flex, ButtonText, Box } from 'design';
+
+import { Box, ButtonText, Flex } from 'design';
 import * as Alerts from 'design/Alert';
-import { StepSlider } from 'design/StepSlider';
+import { StepSlider, type StepComponentProps } from 'design/StepSlider';
 import { Attempt } from 'shared/hooks/useAsync';
+import type { PrimaryAuthType } from 'shared/services';
 
 import * as types from 'teleterm/ui/services/clusters/types';
 
 import { outermostPadding } from '../../spacing';
-
-import { PromptPasswordless } from './PromptPasswordless';
-import PromptSsoStatus from './PromptSsoStatus';
+import type { PasswordlessLoginState } from '../useClusterLogin';
+import { FormLocal } from './FormLocal';
 import { FormPasswordless } from './FormPasswordless';
 import { FormSso } from './FormSso';
-import { FormLocal } from './FormLocal';
-
-import type { PasswordlessLoginState } from '../useClusterLogin';
-import type { PrimaryAuthType } from 'shared/services';
-import type { StepComponentProps } from 'design/StepSlider';
+import { PromptPasswordless } from './PromptPasswordless';
+import PromptSsoStatus from './PromptSsoStatus';
 
 export default function LoginForm(props: Props) {
   const {
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormPasswordless/FormPasswordless.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormPasswordless/FormPasswordless.tsx
index cf39b2a140a29..150d5c41338bc 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormPasswordless/FormPasswordless.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormPasswordless/FormPasswordless.tsx
@@ -17,8 +17,9 @@
  */
 
 import styled from 'styled-components';
-import { Text, Flex, ButtonText, Box } from 'design';
-import { Key, ArrowForward } from 'design/Icon';
+
+import { Box, ButtonText, Flex, Text } from 'design';
+import { ArrowForward, Key } from 'design/Icon';
 
 import type { Props } from '../FormLogin';
 
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormSso/FormSso.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormSso/FormSso.tsx
index 0464c1d22a6f1..4b3d4e2d43a58 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormSso/FormSso.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/FormSso/FormSso.tsx
@@ -17,9 +17,8 @@
  */
 import { Box } from 'design';
 
-import SSOButtonList from './SsoButtons';
-
 import type { Props } from '../FormLogin';
+import SSOButtonList from './SsoButtons';
 
 export const FormSso = ({
   loginAttempt,
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/PromptPasswordless.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/PromptPasswordless.tsx
index a7c94d9a7f0f4..f322fc7adc2de 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/PromptPasswordless.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/PromptPasswordless.tsx
@@ -17,17 +17,16 @@
  */
 
 import { useState } from 'react';
-import { Box, ButtonSecondary, ButtonPrimary, Text, Image, Flex } from 'design';
+import styled from 'styled-components';
+
+import { Box, ButtonPrimary, ButtonSecondary, Flex, Image, Text } from 'design';
 import FieldInput from 'shared/components/FieldInput';
 import Validation from 'shared/components/Validation';
 
-import styled from 'styled-components';
-
 import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
 
-import svgHardwareKey from './hardware.svg';
-
 import type { PasswordlessLoginState } from '../../useClusterLogin';
+import svgHardwareKey from './hardware.svg';
 
 type Props = PasswordlessLoginState & {
   onCancel(): void;
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/PromptSsoStatus.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/PromptSsoStatus.tsx
index 812b648caf597..7036156d8351a 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/PromptSsoStatus.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/PromptSsoStatus.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, ButtonSecondary, Text, Flex } from 'design';
+import { Box, ButtonSecondary, Flex, Text } from 'design';
 
 import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
 
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/index.ts b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/index.ts
index cb149a5e44797..d13ccda3d81f0 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/index.ts
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus/index.ts
@@ -17,4 +17,5 @@
  */
 
 import PromptSsoStatus from './PromptSsoStatus';
+
 export default PromptSsoStatus;
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/index.ts b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/index.ts
index 447367bd552b9..0466b1cc850fd 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/index.ts
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/FormLogin/index.ts
@@ -17,4 +17,5 @@
  */
 
 import FormLogin from './FormLogin';
+
 export default FormLogin;
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/storyHelpers.tsx b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/storyHelpers.tsx
index 54b9d94ff265b..ab647bead80f9 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/storyHelpers.tsx
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/storyHelpers.tsx
@@ -17,10 +17,10 @@
  */
 
 import { FC, PropsWithChildren } from 'react';
+
 import Dialog from 'design/Dialog';
 
 import { dialogCss } from '../spacing';
-
 import { ClusterLoginPresentationProps } from './ClusterLogin';
 
 export const TestContainer: FC<PropsWithChildren> = ({ children }) => (
diff --git a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/useClusterLogin.ts b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/useClusterLogin.ts
index fd500a191edb4..2b3c0d6b7e3e8 100644
--- a/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/useClusterLogin.ts
+++ b/web/packages/teleterm/src/ui/ClusterConnect/ClusterLogin/useClusterLogin.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
+
 import { useAsync } from 'shared/hooks/useAsync';
 
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { assertUnreachable } from 'teleterm/ui/utils';
-import { RootClusterUri } from 'teleterm/ui/uri';
 import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
-
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import type * as types from 'teleterm/ui/services/clusters/types';
+import { RootClusterUri } from 'teleterm/ui/uri';
+import { assertUnreachable } from 'teleterm/ui/utils';
 
 export default function useClusterLogin(props: Props) {
   const { onSuccess, clusterUri } = props;
diff --git a/web/packages/teleterm/src/ui/ClusterLogout/ClusterLogout.tsx b/web/packages/teleterm/src/ui/ClusterLogout/ClusterLogout.tsx
index 1cd077c6149bc..8bb36f1ab90d2 100644
--- a/web/packages/teleterm/src/ui/ClusterLogout/ClusterLogout.tsx
+++ b/web/packages/teleterm/src/ui/ClusterLogout/ClusterLogout.tsx
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonIcon, ButtonWarning, H2 } from 'design';
+import * as Alerts from 'design/Alert';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
   DialogHeader,
 } from 'design/DialogConfirmation';
-import * as Alerts from 'design/Alert';
-import { ButtonIcon, ButtonWarning, H2 } from 'design';
-
 import { Cross } from 'design/Icon';
-
 import { P } from 'design/Text/Text';
 
 import { RootClusterUri } from 'teleterm/ui/uri';
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.test.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.test.tsx
index 77821a082e5bf..0be8b764cc7d3 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.test.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.test.tsx
@@ -17,13 +17,14 @@
  */
 
 import { screen } from '@testing-library/react';
+
 import { render } from 'design/utils/testing';
 
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 
 import {
   checkAgentCompatibility,
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.tsx
index dbd3bfb5a0777..59e3ba048dd4b 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/CompatibilityPromise.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, ButtonPrimary, Alert, Flex } from 'design';
+import { Alert, ButtonPrimary, Flex, Text } from 'design';
 import Link from 'design/Link';
 
+import { RuntimeSettings } from 'teleterm/mainProcess/types';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { RuntimeSettings } from 'teleterm/mainProcess/types';
 
 const CONNECT_MY_COMPUTER_RELEASE_VERSION = '14.1.0';
 const CONNECT_MY_COMPUTER_RELEASE_MAJOR_VERSION = 14;
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/DocumentConnectMyComputer.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/DocumentConnectMyComputer.tsx
index 768e0c6d59f05..e71c08cac2340 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/DocumentConnectMyComputer.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/DocumentConnectMyComputer.tsx
@@ -20,14 +20,13 @@ import { useCallback } from 'react';
 
 import Indicator from 'design/Indicator';
 
-import * as types from 'teleterm/ui/services/workspacesService';
 import Document from 'teleterm/ui/Document';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import * as types from 'teleterm/ui/services/workspacesService';
 
 import { useConnectMyComputerContext } from '../connectMyComputerContext';
-
-import { Status } from './Status';
 import { Setup } from './Setup';
+import { Status } from './Status';
 
 export function DocumentConnectMyComputer(props: {
   visible: boolean;
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/ProgressBar.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/ProgressBar.tsx
index c533e35b1ca33..83393be253fe2 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/ProgressBar.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/ProgressBar.tsx
@@ -18,7 +18,8 @@
 
 import React from 'react';
 import styled, { useTheme } from 'styled-components';
-import { Flex, Box, rotate360 } from 'design';
+
+import { Box, Flex, rotate360 } from 'design';
 import * as icons from 'design/Icon';
 import { decomposeColor, emphasize } from 'design/theme/utils/colorManipulator';
 import { AttemptStatus } from 'shared/hooks/useAsync';
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.story.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.story.tsx
index 59dae741e9283..4d1ab55176e3a 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.story.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.story.tsx
@@ -16,21 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useRef, useLayoutEffect } from 'react';
+import { useEffect, useLayoutEffect, useRef } from 'react';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import {
   makeRootCluster,
   makeServer,
 } from 'teleterm/services/tshd/testHelpers';
-import { IAppContext } from 'teleterm/ui/types';
 import { Cluster, LoggedInUser_UserType } from 'teleterm/services/tshd/types';
 import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import { IAppContext } from 'teleterm/ui/types';
 
 import { ConnectMyComputerContextProvider } from '../connectMyComputerContext';
-
 import { Setup } from './Setup';
 
 export default {
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.test.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.test.tsx
index f3c90df14a358..41912c9b4adc6 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.test.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.test.tsx
@@ -16,25 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act } from '@testing-library/react';
 import React from 'react';
-import { render, screen, waitFor } from 'design/utils/testing';
 
-import { act } from '@testing-library/react';
+import { render, screen, waitFor } from 'design/utils/testing';
 
+import Logger, { NullService } from 'teleterm/logger';
 import {
   makeAcl,
   makeLoggedInUser,
   makeRootCluster,
   makeServer,
 } from 'teleterm/services/tshd/testHelpers';
+import * as useResourcesContext from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import Logger, { NullService } from 'teleterm/logger';
-import * as useResourcesContext from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 
 import * as connectMyComputerContext from '../connectMyComputerContext';
-
 import { Setup } from './Setup';
 
 beforeAll(() => {
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.tsx
index 42097cf8d200f..25fddf6c12c7e 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.tsx
@@ -18,29 +18,29 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { Box, ButtonPrimary, Flex, Text, Alert, H1 } from 'design';
+
+import { Alert, Box, ButtonPrimary, Flex, H1, Text } from 'design';
+import * as Alerts from 'design/Alert';
 import { Attempt, makeEmptyAttempt, useAsync } from 'shared/hooks/useAsync';
 import { wait } from 'shared/utils/wait';
-import * as Alerts from 'design/Alert';
 
+import { isTshdRpcError } from 'teleterm/services/tshd/cloneableClient';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { assertUnreachable, retryWithRelogin } from 'teleterm/ui/utils';
 import {
   AgentProcessError,
   NodeWaitJoinTimeout,
   useConnectMyComputerContext,
 } from 'teleterm/ui/ConnectMyComputer';
-import { codeOrSignal } from 'teleterm/ui/utils/process';
-import { isTshdRpcError } from 'teleterm/services/tshd/cloneableClient';
 import { useResourcesContext } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { DocumentConnectMyComputer } from 'teleterm/ui/services/workspacesService';
+import { assertUnreachable, retryWithRelogin } from 'teleterm/ui/utils';
+import { codeOrSignal } from 'teleterm/ui/utils/process';
 
-import { useAgentProperties } from '../useAgentProperties';
-import { Logs } from '../Logs';
-import { CompatibilityError } from '../CompatibilityPromise';
 import { ConnectMyComputerAccessNoAccess } from '../access';
-
+import { CompatibilityError } from '../CompatibilityPromise';
+import { Logs } from '../Logs';
+import { useAgentProperties } from '../useAgentProperties';
 import { ProgressBar } from './ProgressBar';
 
 export function Setup(props: {
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.story.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.story.tsx
index 9076e099e1d64..fe659cd9ee305 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.story.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.story.tsx
@@ -18,26 +18,24 @@
 
 import { useLayoutEffect } from 'react';
 
+import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
+import { AgentProcessState } from 'teleterm/mainProcess/types';
 import {
+  makeLabelsList,
   makeRootCluster,
   makeServer,
-  makeLabelsList,
 } from 'teleterm/services/tshd/testHelpers';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import AppContext from 'teleterm/ui/appContext';
-
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { AgentProcessState } from 'teleterm/mainProcess/types';
-import { makeRuntimeSettings } from 'teleterm/mainProcess/fixtures/mocks';
 import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 
 import {
   AgentCompatibilityError,
   ConnectMyComputerContextProvider,
   NodeWaitJoinTimeout,
 } from '../connectMyComputerContext';
-
 import { Status } from './Status';
 
 export default {
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx
index 9b84a6002cb83..b013558d0baf1 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx
@@ -17,47 +17,46 @@
  */
 
 import React, { useCallback, useRef } from 'react';
+import { Transition } from 'react-transition-group';
+import styled, { css } from 'styled-components';
+
 import {
   Alert,
   Box,
   ButtonPrimary,
+  ButtonSecondary,
   Flex,
+  H1,
   Label,
   MenuItem,
   Text,
-  ButtonSecondary,
-  H1,
 } from 'design';
-import styled, { css } from 'styled-components';
-import { Transition } from 'react-transition-group';
-
-import { makeLabelTag } from 'teleport/components/formatters';
-import { MenuIcon } from 'shared/components/MenuAction';
 import * as icons from 'design/Icon';
+import type { IconProps } from 'design/Icon/Icon';
 import Indicator from 'design/Indicator';
+import { MenuIcon } from 'shared/components/MenuAction';
 
+import { makeLabelTag } from 'teleport/components/formatters';
+import type * as tsh from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import {
   AgentProcessError,
   CurrentAction,
   NodeWaitJoinTimeout,
   useConnectMyComputerContext,
 } from 'teleterm/ui/ConnectMyComputer';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import { connectToServer } from 'teleterm/ui/services/workspacesService';
 import { assertUnreachable } from 'teleterm/ui/utils';
 import { codeOrSignal } from 'teleterm/ui/utils/process';
-import { connectToServer } from 'teleterm/ui/services/workspacesService';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
 
-import { useAgentProperties } from '../useAgentProperties';
-import { Logs } from '../Logs';
 import { CompatibilityError, useVersions } from '../CompatibilityPromise';
+import { Logs } from '../Logs';
 import {
   shouldShowAgentUpgradeSuggestion,
   UpgradeAgentSuggestion,
 } from '../UpgradeAgentSuggestion';
-
-import type * as tsh from 'teleterm/services/tshd/types';
-import type { IconProps } from 'design/Icon/Icon';
+import { useAgentProperties } from '../useAgentProperties';
 
 export function Status(props: { closeDocument?: () => void }) {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.story.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.story.tsx
index 057bbad92f54f..c3f037e9151f4 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.story.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.story.tsx
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useEffect, useRef, useLayoutEffect } from 'react';
+import { useEffect, useLayoutEffect, useRef } from 'react';
 
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import { AgentProcessState } from 'teleterm/mainProcess/types';
 import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
-import { AgentProcessState } from 'teleterm/mainProcess/types';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 
-import { NavigationMenu } from './NavigationMenu';
 import { ConnectMyComputerContextProvider } from './connectMyComputerContext';
+import { NavigationMenu } from './NavigationMenu';
 
 export default {
   title: 'Teleterm/ConnectMyComputer/NavigationMenu',
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.tsx
index 4066d3db6692a..fa99e966de397 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.tsx
@@ -18,9 +18,9 @@
 
 import { forwardRef, useRef, useState } from 'react';
 import styled, { css } from 'styled-components';
-import { Box, Button, Indicator, Menu, MenuItem, blink } from 'design';
-import { Laptop, Warning } from 'design/Icon';
 
+import { blink, Box, Button, Indicator, Menu, MenuItem } from 'design';
+import { Laptop, Warning } from 'design/Icon';
 import { Attempt, AttemptStatus } from 'shared/hooks/useAsync';
 
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.test.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.test.tsx
index b70c4e3be2ad9..5bb04a92fbd4f 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.test.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.test.tsx
@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render } from 'design/utils/testing';
 import { screen } from '@testing-library/react';
 
+import { render } from 'design/utils/testing';
+
 import {
-  UpgradeAgentSuggestion,
   shouldShowAgentUpgradeSuggestion,
+  UpgradeAgentSuggestion,
 } from './UpgradeAgentSuggestion';
 
 test('upgradeAgentSuggestion renders correct versions', async () => {
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.tsx
index 6ffc9ddf785cb..67126afa27577 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/UpgradeAgentSuggestion.tsx
@@ -18,7 +18,6 @@
 
 import { Alert, Text } from 'design';
 import Link from 'design/Link';
-
 import { compareSemVers } from 'shared/utils/semVer';
 
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.test.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.test.tsx
index 55913e30c231a..ee0a84a9272c2 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.test.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.test.tsx
@@ -19,19 +19,22 @@
 import { EventEmitter } from 'node:events';
 
 import { act, renderHook, waitFor } from '@testing-library/react';
+
 import { makeErrorAttempt } from 'shared/hooks/useAsync';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import Logger, { NullService } from 'teleterm/logger';
 import { AgentProcessState } from 'teleterm/mainProcess/types';
-import * as resourcesContext from 'teleterm/ui/DocumentCluster/resourcesContext';
 import {
   makeAcl,
   makeLoggedInUser,
   makeRootCluster,
   makeServer,
 } from 'teleterm/services/tshd/testHelpers';
-import Logger, { NullService } from 'teleterm/logger';
+import type { Cluster } from 'teleterm/services/tshd/types';
+import * as resourcesContext from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import type { IAppContext } from 'teleterm/ui/types';
 
 import {
   AgentCompatibilityError,
@@ -40,9 +43,6 @@ import {
   useConnectMyComputerContext,
 } from './connectMyComputerContext';
 
-import type { IAppContext } from 'teleterm/ui/types';
-import type { Cluster } from 'teleterm/services/tshd/types';
-
 beforeAll(() => {
   Logger.init(new NullService());
 });
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx
index e6c6929ef25fa..dc2b23db8beb0 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx
@@ -26,37 +26,36 @@ import {
   useMemo,
   useState,
 } from 'react';
+
 import {
   Attempt,
+  makeEmptyAttempt,
   makeSuccessAttempt,
   useAsync,
-  makeEmptyAttempt,
 } from 'shared/hooks/useAsync';
 import { wait } from 'shared/utils/wait';
 
-import { RootClusterUri, routing } from 'teleterm/ui/uri';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { Server } from 'teleterm/services/tshd/types';
+import type {
+  AgentProcessState,
+  MainProcessClient,
+} from 'teleterm/mainProcess/types';
 import {
   cloneAbortSignal,
   isTshdRpcError,
 } from 'teleterm/services/tshd/cloneableClient';
+import { Server } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useResourcesContext } from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { useLogger } from 'teleterm/ui/hooks/useLogger';
+import { RootClusterUri, routing } from 'teleterm/ui/uri';
 
 import { assertUnreachable, retryWithRelogin } from '../utils';
-
 import { ConnectMyComputerAccess, getConnectMyComputerAccess } from './access';
 import {
-  checkAgentCompatibility,
   AgentCompatibility,
+  checkAgentCompatibility,
 } from './CompatibilityPromise';
 
-import type {
-  AgentProcessState,
-  MainProcessClient,
-} from 'teleterm/mainProcess/types';
-
 export type CurrentAction =
   | {
       kind: 'download';
diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/useAgentProperties.ts b/web/packages/teleterm/src/ui/ConnectMyComputer/useAgentProperties.ts
index 4331bcb765c5f..97552aa36bfc1 100644
--- a/web/packages/teleterm/src/ui/ConnectMyComputer/useAgentProperties.ts
+++ b/web/packages/teleterm/src/ui/ConnectMyComputer/useAgentProperties.ts
@@ -20,8 +20,8 @@ import { useMemo } from 'react';
 
 import * as connectMyComputer from 'shared/connectMyComputer';
 
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 
 export function useAgentProperties(): {
   systemUsername: string;
diff --git a/web/packages/teleterm/src/ui/Document/Document.tsx b/web/packages/teleterm/src/ui/Document/Document.tsx
index 879f0c700b85c..3a5d48f140b94 100644
--- a/web/packages/teleterm/src/ui/Document/Document.tsx
+++ b/web/packages/teleterm/src/ui/Document/Document.tsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+
 import { Flex } from 'design';
 import { useRefAutoFocus } from 'shared/hooks';
 
diff --git a/web/packages/teleterm/src/ui/Document/index.ts b/web/packages/teleterm/src/ui/Document/index.ts
index 53f8277a52916..16c6ec99d3f61 100644
--- a/web/packages/teleterm/src/ui/Document/index.ts
+++ b/web/packages/teleterm/src/ui/Document/index.ts
@@ -17,4 +17,5 @@
  */
 
 import Document from './Document';
+
 export default Document;
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.story.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.story.tsx
index 830d239c5a190..fc0c623198ae0 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.story.tsx
@@ -19,15 +19,15 @@
 import { AccessRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/access_request_pb';
 import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import AppContextProvider from 'teleterm/ui/appContextProvider';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
-import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { DocumentAccessRequests } from 'teleterm/ui/DocumentAccessRequests/DocumentAccessRequests';
-import * as types from 'teleterm/ui/services/workspacesService';
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
+import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import * as types from 'teleterm/ui/services/workspacesService';
 import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 
 const rootCluster = makeRootCluster();
 
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.tsx
index b3e01af9d6cb9..711f05bf26c46 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.tsx
@@ -16,20 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { RequestFlags } from 'shared/components/AccessRequests/ReviewRequests';
 import { Attempt } from 'shared/hooks/useAsync';
-
 import { AccessRequest } from 'shared/services/accessRequests';
-import { RequestFlags } from 'shared/components/AccessRequests/ReviewRequests';
 
 import Document from 'teleterm/ui/Document';
 import * as types from 'teleterm/ui/services/workspacesService';
 
-import { useAssumeAccess } from './useAssumeAccess';
-
-import useAccessRequests from './useAccessRequests';
+import { NewRequest } from './NewRequest';
 import { RequestList } from './RequestList/RequestList';
 import { ReviewAccessRequest } from './ReviewAccessRequest';
-import { NewRequest } from './NewRequest';
+import useAccessRequests from './useAccessRequests';
+import { useAssumeAccess } from './useAssumeAccess';
 
 export function DocumentAccessRequests(props: DocumentProps) {
   const state = useAccessRequests(props.doc);
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
index 2abff7de4834b..48be2ff66f127 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Link, Flex, Box } from 'design';
+import { Box, Flex, Link } from 'design';
 import { Info } from 'design/Alert';
-
 import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
-
-import { useAsync } from 'shared/hooks/useAsync';
 import { Roles } from 'shared/components/AccessRequests/NewRequest';
+import { useAsync } from 'shared/hooks/useAsync';
 
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 
 /**
  * Only allows requesting roles (resources can be requested through the unified
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.test.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.test.tsx
index 30cb79a4e3a2f..051d4c2f63344 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.test.tsx
@@ -17,11 +17,11 @@
  */
 
 import { MemoryRouter } from 'react-router-dom';
-import { fireEvent, render, screen } from 'design/utils/testing';
 
+import { fireEvent, render, screen } from 'design/utils/testing';
 import { requestRoleApproved } from 'shared/components/AccessRequests/fixtures';
-import { AccessRequest } from 'shared/services/accessRequests';
 import { RequestFlags } from 'shared/components/AccessRequests/ReviewRequests';
+import { AccessRequest } from 'shared/services/accessRequests';
 
 import { RequestList } from './RequestList';
 
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.tsx
index 8a0df6adbc8b0..32096606826ca 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/RequestList/RequestList.tsx
@@ -18,24 +18,23 @@
 
 import styled from 'styled-components';
 
-import { Label, Alert, ButtonBorder, Flex, ButtonPrimary, Box } from 'design';
+import { Alert, Box, ButtonBorder, ButtonPrimary, Flex, Label } from 'design';
 import Table, { Cell } from 'design/DataTable';
-import { Attempt } from 'shared/hooks/useAttemptNext';
-import { Attempt as AsyncAttempt } from 'shared/hooks/useAsync';
-
-import { AccessRequest, canAssumeNow } from 'shared/services/accessRequests';
+import { requestMatcher } from 'shared/components/AccessRequests/NewRequest/matcher';
 import {
+  formattedName,
   renderIdCell,
   renderStatusCell,
   renderUserCell,
-  formattedName,
   RequestFlags,
 } from 'shared/components/AccessRequests/ReviewRequests';
 import {
   BlockedByStartTimeButton,
   ButtonPromotedInfo,
 } from 'shared/components/AccessRequests/Shared/Shared';
-import { requestMatcher } from 'shared/components/AccessRequests/NewRequest/matcher';
+import { Attempt as AsyncAttempt } from 'shared/hooks/useAsync';
+import { Attempt } from 'shared/hooks/useAttemptNext';
+import { AccessRequest, canAssumeNow } from 'shared/services/accessRequests';
 
 export function RequestList({
   attempt,
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/ReviewAccessRequest.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/ReviewAccessRequest.tsx
index 8aa8aba5057bd..8b8acecb3bca0 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/ReviewAccessRequest.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/ReviewAccessRequest.tsx
@@ -18,17 +18,15 @@
 
 import styled from 'styled-components';
 
-import { Text, Flex, Box, Alert, H1 } from 'design';
+import { Alert, Box, Flex, H1, Text } from 'design';
 import { ArrowBack } from 'design/Icon';
-import { makeEmptyAttempt } from 'shared/hooks/useAsync';
-
 import {
   RequestDelete,
   RequestView,
 } from 'shared/components/AccessRequests/ReviewRequests';
+import { makeEmptyAttempt } from 'shared/hooks/useAsync';
 
 import { useAssumeAccess } from '../useAssumeAccess';
-
 import { useReviewAccessRequest } from './useReviewAccessRequest';
 
 export function ReviewAccessRequest(props: {
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/useReviewAccessRequest.ts b/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/useReviewAccessRequest.ts
index ed0f182ca9c33..04f7eeb8aaf40 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/useReviewAccessRequest.ts
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/useReviewAccessRequest.ts
@@ -16,23 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
+import { useCallback, useEffect, useState } from 'react';
 
-import { AccessRequest } from 'shared/services/accessRequests';
+import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
 import {
+  RequestFlags,
   SubmitReview,
   SuggestedAccessList,
-  RequestFlags,
 } from 'shared/components/AccessRequests/ReviewRequests';
-
 import { useAsync } from 'shared/hooks/useAsync';
+import { AccessRequest } from 'shared/services/accessRequests';
 
 import * as tsh from 'teleterm/services/tshd/types';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { useWorkspaceLoggedInUser } from 'teleterm/ui/hooks/useLoggedInUser';
 import { retryWithRelogin } from 'teleterm/ui/utils';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
 
 import { makeUiAccessRequest } from '../useAccessRequests';
 
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.test.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.test.tsx
index e2b9366714425..cd6501bb62746 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.test.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AccessRequest } from 'shared/services/accessRequests';
-
 import { AccessRequest as TshdAccessRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/access_request_pb';
+import { AccessRequest } from 'shared/services/accessRequests';
 
 import { makeUiAccessRequest } from './useAccessRequests';
 
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.tsx
index 240625c22797c..5a1573acf9566 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.tsx
@@ -16,28 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
+import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
+import { AccessRequest as TshdAccessRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/access_request_pb';
+import { LoggedInUser } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
+import { RequestFlags } from 'shared/components/AccessRequests/ReviewRequests';
 import useAttempt from 'shared/hooks/useAttemptNext';
-
 import {
-  makeAccessRequest,
   AccessRequest,
+  makeAccessRequest,
 } from 'shared/services/accessRequests';
 
-import { RequestFlags } from 'shared/components/AccessRequests/ReviewRequests';
-
-import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
-import { LoggedInUser } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
-import { AccessRequest as TshdAccessRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/access_request_pb';
-
-import * as types from 'teleterm/ui/services/workspacesService';
 import { AssumedRequest } from 'teleterm/services/tshd/types';
-
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { retryWithRelogin } from 'teleterm/ui/utils';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { useWorkspaceLoggedInUser } from 'teleterm/ui/hooks/useLoggedInUser';
+import * as types from 'teleterm/ui/services/workspacesService';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export default function useAccessRequests(doc: types.DocumentAccessRequests) {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAssumeAccess.ts b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAssumeAccess.ts
index 8493052ba7b5b..ed4742889ada8 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/useAssumeAccess.ts
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/useAssumeAccess.ts
@@ -18,10 +18,10 @@
 
 import { useAsync } from 'shared/hooks/useAsync';
 
-import { retryWithRelogin } from 'teleterm/ui/utils';
-import { useResourcesContext } from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useResourcesContext } from 'teleterm/ui/DocumentCluster/resourcesContext';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function useAssumeAccess() {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.story.tsx b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.story.tsx
index 1ffe93e4cb080..4c5cb5d4f267f 100644
--- a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.story.tsx
@@ -17,18 +17,19 @@
  */
 
 import { Meta } from '@storybook/react';
+
 import { wait } from 'shared/utils/wait';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import {
-  makeRootCluster,
   makeLoggedInUser,
+  makeRootCluster,
   rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import * as types from 'teleterm/ui/services/workspacesService';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 
 import { DocumentAuthorizeWebSession } from './DocumentAuthorizeWebSession';
 
diff --git a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.test.tsx b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.test.tsx
index 67f47026cde36..59246adf0cf32 100644
--- a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.test.tsx
@@ -16,18 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import userEvent from '@testing-library/user-event';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import { render, screen } from 'design/utils/testing';
+
 import {
-  makeRootCluster,
   makeLoggedInUser,
+  makeRootCluster,
   rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
-import * as types from 'teleterm/ui/services/workspacesService';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import * as types from 'teleterm/ui/services/workspacesService';
 
 import { DocumentAuthorizeWebSession } from './DocumentAuthorizeWebSession';
 
diff --git a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.tsx b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.tsx
index 18ff95e499575..da23ed37a4e0c 100644
--- a/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text, Alert, ButtonPrimary, H1, ButtonText } from 'design';
+import { Alert, ButtonPrimary, ButtonText, H1, Text } from 'design';
 import Flex from 'design/Flex';
-import { useAsync, Attempt } from 'shared/hooks/useAsync';
-import { processRedirectUri } from 'shared/redirects';
-import { Cluster } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 import { DeviceConfirmationToken } from 'gen-proto-ts/teleport/devicetrust/v1/device_confirmation_token_pb';
+import { Cluster } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
+import { processRedirectUri } from 'shared/redirects';
 
-import Document from 'teleterm/ui/Document';
-import { routing } from 'teleterm/ui/uri';
-import { retryWithRelogin } from 'teleterm/ui/utils';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import Document from 'teleterm/ui/Document';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import * as types from 'teleterm/ui/services/workspacesService';
 import { WebSessionRequest } from 'teleterm/ui/services/workspacesService';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import { routing } from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function DocumentAuthorizeWebSession(props: {
   doc: types.DocumentAuthorizeWebSession;
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.story.tsx b/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.story.tsx
index 30d09f3abc99a..b48efa290d497 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.story.tsx
@@ -16,28 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, Text, Box } from 'design';
-
 import { Meta } from '@storybook/react';
 
+import { Box, Flex, Text } from 'design';
+
 import {
   makeApp,
-  makeRootCluster,
-  makeServer,
   makeDatabase,
   makeKube,
+  makeRootCluster,
+  makeServer,
 } from 'teleterm/services/tshd/testHelpers';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { VnetContextProvider } from 'teleterm/ui/Vnet';
 import { ConnectionsContextProvider } from 'teleterm/ui/TopBar/Connections/connectionsContext';
+import { VnetContextProvider } from 'teleterm/ui/Vnet';
 
 import {
+  AccessRequestButton,
   ConnectAppActionButton,
-  ConnectServerActionButton,
   ConnectDatabaseActionButton,
   ConnectKubeActionButton,
-  AccessRequestButton,
+  ConnectServerActionButton,
 } from './ActionButtons';
 
 type StoryProps = {
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.tsx b/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.tsx
index dd6b44489c29e..c16dd1d5fa779 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/ActionButtons.tsx
@@ -17,43 +17,44 @@
  */
 
 import React from 'react';
-import {
-  MenuInputType,
-  MenuLogin,
-  MenuLoginProps,
-} from 'shared/components/MenuLogin';
-import { AwsLaunchButton } from 'shared/components/AwsLaunchButton';
-import { ButtonBorder, ButtonWithMenu, MenuItem, ButtonPrimary } from 'design';
+
+import { ButtonBorder, ButtonPrimary, ButtonWithMenu, MenuItem } from 'design';
 import {
   MenuItemSectionLabel,
   MenuItemSectionSeparator,
 } from 'design/Menu/MenuItem';
-import { Server } from 'gen-proto-ts/teleport/lib/teleterm/v1/server_pb';
-import { Kube } from 'gen-proto-ts/teleport/lib/teleterm/v1/kube_pb';
-import { Database } from 'gen-proto-ts/teleport/lib/teleterm/v1/database_pb';
 import { App } from 'gen-proto-ts/teleport/lib/teleterm/v1/app_pb';
 import { Cluster } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
+import { Database } from 'gen-proto-ts/teleport/lib/teleterm/v1/database_pb';
+import { Kube } from 'gen-proto-ts/teleport/lib/teleterm/v1/kube_pb';
+import { Server } from 'gen-proto-ts/teleport/lib/teleterm/v1/server_pb';
+import { AwsLaunchButton } from 'shared/components/AwsLaunchButton';
+import {
+  MenuInputType,
+  MenuLogin,
+  MenuLoginProps,
+} from 'shared/components/MenuLogin';
 
 import {
-  connectToServer,
+  formatPortRange,
+  getAwsAppLaunchUrl,
+  getSamlAppSsoUrl,
+  getWebAppLaunchUrl,
+  isWebApp,
+} from 'teleterm/services/tshd/app';
+import { GatewayProtocol } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import {
+  captureAppLaunchInBrowser,
+  connectToAppWithVnet,
   connectToDatabase,
   connectToKube,
-  connectToAppWithVnet,
-  captureAppLaunchInBrowser,
+  connectToServer,
   setUpAppGateway,
 } from 'teleterm/ui/services/workspacesService';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { GatewayProtocol } from 'teleterm/services/tshd/types';
-import { DatabaseUri, routing } from 'teleterm/ui/uri';
 import { IAppContext } from 'teleterm/ui/types';
+import { DatabaseUri, routing } from 'teleterm/ui/uri';
 import { retryWithRelogin } from 'teleterm/ui/utils';
-import {
-  getWebAppLaunchUrl,
-  isWebApp,
-  getAwsAppLaunchUrl,
-  getSamlAppSsoUrl,
-  formatPortRange,
-} from 'teleterm/services/tshd/app';
 import { useVnetContext, useVnetLauncher } from 'teleterm/ui/Vnet';
 
 export function ConnectServerActionButton(props: {
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.story.tsx b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.story.tsx
index d81283a01f4c8..b1043c9600789 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.story.tsx
@@ -19,34 +19,33 @@
 import { useEffect } from 'react';
 import styled from 'styled-components';
 
-import AppContextProvider from 'teleterm/ui/appContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import {
-  createClusterServiceState,
-  ClustersServiceState,
-} from 'teleterm/ui/services/clusters';
-import { routing } from 'teleterm/ui/uri';
 import {
+  leafClusterUri,
+  makeAcl,
+  makeApp,
+  makeDatabase,
+  makeKube,
   makeLoggedInUser,
   makeRootCluster,
   makeServer,
-  makeDatabase,
-  makeKube,
-  makeApp,
   rootClusterUri,
-  leafClusterUri,
-  makeAcl,
 } from 'teleterm/services/tshd/testHelpers';
-
-import { ResourcesService } from 'teleterm/ui/services/resources';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
-import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer';
-import * as docTypes from 'teleterm/ui/services/workspacesService/documentsService/types';
 import * as tsh from 'teleterm/services/tshd/types';
-import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
-import { VnetContextProvider } from 'teleterm/ui/Vnet';
+import AppContextProvider from 'teleterm/ui/appContextProvider';
+import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import {
+  ClustersServiceState,
+  createClusterServiceState,
+} from 'teleterm/ui/services/clusters';
+import { ResourcesService } from 'teleterm/ui/services/resources';
 import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';
+import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
+import * as docTypes from 'teleterm/ui/services/workspacesService/documentsService/types';
 import { ConnectionsContextProvider } from 'teleterm/ui/TopBar/Connections/connectionsContext';
+import { routing } from 'teleterm/ui/uri';
+import { VnetContextProvider } from 'teleterm/ui/Vnet';
 
 import DocumentCluster from './DocumentCluster';
 import { ResourcesContextProvider } from './resourcesContext';
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.test.tsx b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.test.tsx
index fa8cf8ecb858f..02d89810e9b47 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.test.tsx
@@ -17,25 +17,25 @@
  */
 
 import { act } from '@testing-library/react';
-import { render, screen } from 'design/utils/testing';
 import { mockIntersectionObserver } from 'jsdom-testing-mocks';
 
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import { render, screen } from 'design/utils/testing';
+
 import {
-  makeRootCluster,
-  makeLoggedInUser,
   makeAcl,
+  makeLoggedInUser,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
 import * as tsh from 'teleterm/services/tshd/types';
 import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer';
-import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';
-
-import { ResourcesContextProvider } from './resourcesContext';
+import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
 
 import DocumentCluster from './DocumentCluster';
+import { ResourcesContextProvider } from './resourcesContext';
 
 const mio = mockIntersectionObserver();
 
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.tsx b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.tsx
index 7853310bdfb52..3f6e0a59eb934 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.tsx
@@ -18,18 +18,18 @@
 
 import { useEffect } from 'react';
 import styled from 'styled-components';
-import { Box, ButtonPrimary, Flex, Text, Alert, H2 } from 'design';
-import { useAsync, Attempt } from 'shared/hooks/useAsync';
 
+import { Alert, Box, ButtonPrimary, Flex, H2, Text } from 'design';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
+
+import { Cluster } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import Document from 'teleterm/ui/Document';
 import * as types from 'teleterm/ui/services/workspacesService';
 import { DocumentClusterQueryParams } from 'teleterm/ui/services/workspacesService';
-import Document from 'teleterm/ui/Document';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { retryWithRelogin } from 'teleterm/ui/utils';
-import { Cluster } from 'teleterm/services/tshd/types';
-
 import * as uri from 'teleterm/ui/uri';
 import { routing } from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 import { UnifiedResources } from './UnifiedResources';
 
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.test.tsx b/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.test.tsx
index a69d79f3eb9ea..c6d81570b11c2 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.test.tsx
@@ -16,36 +16,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useImperativeHandle, forwardRef, createRef } from 'react';
-import { render, screen } from 'design/utils/testing';
-import { mockIntersectionObserver } from 'jsdom-testing-mocks';
 import { act } from '@testing-library/react';
+import { mockIntersectionObserver } from 'jsdom-testing-mocks';
+import { createRef, forwardRef, useImperativeHandle } from 'react';
 
+import { render, screen } from 'design/utils/testing';
+import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 import {
   AvailableResourceMode,
   DefaultTab,
-  ViewMode,
   LabelsViewMode,
+  ViewMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 
-import { UnifiedResources } from 'teleterm/ui/DocumentCluster/UnifiedResources';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import {
+  makeRootCluster,
+  makeServer,
+  rootClusterUri,
+} from 'teleterm/services/tshd/testHelpers';
+import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer';
 import {
   ResourcesContextProvider,
   useResourcesContext,
 } from 'teleterm/ui/DocumentCluster/resourcesContext';
-import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer';
-import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
-import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
+import { UnifiedResources } from 'teleterm/ui/DocumentCluster/UnifiedResources';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import {
-  makeRootCluster,
-  rootClusterUri,
-  makeServer,
-} from 'teleterm/services/tshd/testHelpers';
+import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
 import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
 import * as uri from 'teleterm/ui/uri';
 
 const mio = mockIntersectionObserver();
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.tsx b/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.tsx
index b3f9de5fe0c73..2cc75761bf832 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.tsx
@@ -16,63 +16,55 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useCallback, useEffect, useMemo, memo } from 'react';
+import { memo, useCallback, useEffect, useMemo } from 'react';
 
+import { ButtonPrimary, Flex, H1, Link, ResourceIcon, Text } from 'design';
+import * as icons from 'design/Icon';
+import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
+import {
+  ListUnifiedResourcesRequest,
+  UserPreferences,
+} from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
+import { DefaultTab } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 import {
-  UnifiedResources as SharedUnifiedResources,
-  useUnifiedResourcesFetch,
-  UnifiedResourcesQueryParams,
-  SharedUnifiedResource,
-  UnifiedResourcesPinning,
   getResourceAvailabilityFilter,
   ResourceAvailabilityFilter,
+  SharedUnifiedResource,
+  UnifiedResources as SharedUnifiedResources,
+  UnifiedResourcesPinning,
+  UnifiedResourcesQueryParams,
+  useUnifiedResourcesFetch,
 } from 'shared/components/UnifiedResources';
+import { Attempt } from 'shared/hooks/useAsync';
+import { NodeSubKind } from 'shared/services';
 import {
   DbProtocol,
-  formatDatabaseInfo,
   DbType,
+  formatDatabaseInfo,
 } from 'shared/services/databases';
-
-import { Flex, ButtonPrimary, Text, Link, H1, ResourceIcon } from 'design';
-
-import * as icons from 'design/Icon';
-
-import { Attempt } from 'shared/hooks/useAsync';
-
-import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
-import { DefaultTab } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
-import { NodeSubKind } from 'shared/services';
 import { waitForever } from 'shared/utils/wait';
 
-import {
-  UserPreferences,
-  ListUnifiedResourcesRequest,
-} from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
-
-import { UnifiedResourceResponse } from 'teleterm/ui/services/resources';
+import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import * as uri from 'teleterm/ui/uri';
+import { useConnectMyComputerContext } from 'teleterm/ui/ConnectMyComputer';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { useWorkspaceLoggedInUser } from 'teleterm/ui/hooks/useLoggedInUser';
-import { useConnectMyComputerContext } from 'teleterm/ui/ConnectMyComputer';
-
-import { retryWithRelogin } from 'teleterm/ui/utils';
+import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
+import { UnifiedResourceResponse } from 'teleterm/ui/services/resources';
 import {
-  DocumentClusterQueryParams,
   DocumentCluster,
+  DocumentClusterQueryParams,
   DocumentClusterResourceKind,
 } from 'teleterm/ui/services/workspacesService';
-import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
-
-import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
+import * as uri from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 import {
-  ConnectServerActionButton,
-  ConnectKubeActionButton,
-  ConnectDatabaseActionButton,
-  ConnectAppActionButton,
   AccessRequestButton,
+  ConnectAppActionButton,
+  ConnectDatabaseActionButton,
+  ConnectKubeActionButton,
+  ConnectServerActionButton,
 } from './ActionButtons';
 import { useResourcesContext } from './resourcesContext';
 import { useUserPreferences } from './useUserPreferences';
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/index.ts b/web/packages/teleterm/src/ui/DocumentCluster/index.ts
index b3a60f29ec442..47714280d83ab 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/index.ts
+++ b/web/packages/teleterm/src/ui/DocumentCluster/index.ts
@@ -17,4 +17,5 @@
  */
 
 import DocumentCluster from './DocumentCluster';
+
 export default DocumentCluster;
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.test.tsx b/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.test.tsx
index 9fb6636900c9f..be8994d3ce0fd 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, act } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react';
 
 import {
   AvailableResourceMode,
@@ -25,16 +25,15 @@ import {
   ViewMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import {
-  UserPreferences,
   GetUserPreferencesResponse,
   UpdateUserPreferencesResponse,
+  UserPreferences,
 } from 'teleterm/services/tshd/types';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 
 import { useUserPreferences } from './useUserPreferences';
 
diff --git a/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.ts b/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.ts
index 6c747d296990c..4786baaadece1 100644
--- a/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.ts
+++ b/web/packages/teleterm/src/ui/DocumentCluster/useUserPreferences.ts
@@ -16,29 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useCallback, useEffect, useRef, useState, useMemo } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
+import { UnifiedResourcePreferences } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 import {
-  useAsync,
   Attempt,
+  CanceledError,
+  hasFinished,
   makeEmptyAttempt,
-  makeProcessingAttempt,
   makeErrorAttempt,
+  makeProcessingAttempt,
   makeSuccessAttempt,
   mapAttempt,
-  CanceledError,
-  hasFinished,
+  useAsync,
 } from 'shared/hooks/useAsync';
 
-import { UnifiedResourcePreferences } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
-
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-
-import { routing, ClusterUri } from 'teleterm/ui/uri';
-
+import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
 import { UserPreferences } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { ClusterUri, routing } from 'teleterm/ui/uri';
 import { retryWithRelogin } from 'teleterm/ui/utils';
-import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
 
 export function useUserPreferences(clusterUri: ClusterUri): {
   userPreferencesAttempt: Attempt<void>;
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/CliCommand.tsx b/web/packages/teleterm/src/ui/DocumentGateway/CliCommand.tsx
index 8be53cdfdfed6..55bb09b733ba9 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/CliCommand.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGateway/CliCommand.tsx
@@ -17,9 +17,10 @@
  */
 
 import { useEffect, useState } from 'react';
+import styled from 'styled-components';
+
 import { Box, ButtonPrimary, Flex, Indicator } from 'design';
 import { fade } from 'design/theme/utils/colorManipulator';
-import styled from 'styled-components';
 
 interface CliCommandProps {
   cliCommand: string;
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.story.tsx b/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.story.tsx
index 809b4e92e5956..239e75dc51c45 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.story.tsx
@@ -18,16 +18,16 @@
 
 import { Meta } from '@storybook/react';
 import { ComponentProps } from 'react';
+
 import {
   makeEmptyAttempt,
-  makeProcessingAttempt,
   makeErrorAttempt,
+  makeProcessingAttempt,
 } from 'shared/hooks/useAsync';
 
 import { makeDatabaseGateway } from 'teleterm/services/tshd/testHelpers';
 
 import { OfflineGateway } from '../components/OfflineGateway';
-
 import { OnlineDocumentGateway } from './OnlineDocumentGateway';
 
 type StoryProps = {
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.tsx b/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.tsx
index 47d42a3bcf731..6c0a3585bb98a 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGateway/DocumentGateway.tsx
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { getCliCommandArgv0 } from 'teleterm/services/tshd/gateway';
 import Document from 'teleterm/ui/Document';
 import * as types from 'teleterm/ui/services/workspacesService';
-import { getCliCommandArgv0 } from 'teleterm/services/tshd/gateway';
 
 import { OfflineGateway } from '../components/OfflineGateway';
 import { useWorkspaceContext } from '../Documents';
-
-import { useGateway } from './useGateway';
 import { OnlineDocumentGateway } from './OnlineDocumentGateway';
+import { useGateway } from './useGateway';
 
 export function DocumentGateway(props: {
   visible: boolean;
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx b/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx
index a2d76b6cd1cea..df80c599cea92 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx
@@ -17,17 +17,15 @@
  */
 
 import { useMemo, useRef } from 'react';
-import { debounce } from 'shared/utils/highbar';
+
 import { Alert, Box, ButtonSecondary, Flex, H1, H2, Link, Text } from 'design';
-import Validation from 'shared/components/Validation';
 import * as Alerts from 'design/Alert';
-
-import { Attempt, RunFuncReturnValue } from 'shared/hooks/useAsync';
-
 import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
+import Validation from 'shared/components/Validation';
+import { Attempt, RunFuncReturnValue } from 'shared/hooks/useAsync';
+import { debounce } from 'shared/utils/highbar';
 
 import { ConfigFieldInput, PortFieldInput } from '../components/FieldInputs';
-
 import { CliCommand } from './CliCommand';
 
 export function OnlineDocumentGateway(props: {
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/useGateway.test.tsx b/web/packages/teleterm/src/ui/DocumentGateway/useGateway.test.tsx
index 5786b67ba7b0b..5f7cef9704cfd 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/useGateway.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGateway/useGateway.test.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { renderHook, act, waitFor } from '@testing-library/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
 
 import {
-  makeRootCluster,
   makeDatabaseGateway,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { DocumentGateway } from 'teleterm/ui/services/workspacesService';
@@ -28,7 +28,6 @@ import { DatabaseUri } from 'teleterm/ui/uri';
 
 import { WorkspaceContextProvider } from '../Documents';
 import { MockAppContextProvider } from '../fixtures/MockAppContextProvider';
-
 import { useGateway } from './useGateway';
 
 beforeEach(() => {
diff --git a/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts b/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts
index c84a215136d2e..1c08bae058742 100644
--- a/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts
+++ b/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts
@@ -18,15 +18,15 @@
 
 import { useCallback, useEffect } from 'react';
 
-import { useAsync } from 'shared/hooks/useAsync';
 import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
+import { useAsync } from 'shared/hooks/useAsync';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { DocumentGateway } from 'teleterm/ui/services/workspacesService';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { retryWithRelogin } from 'teleterm/ui/utils';
-import { isDatabaseUri, isAppUri } from 'teleterm/ui/uri';
 import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
+import { DocumentGateway } from 'teleterm/ui/services/workspacesService';
+import { isAppUri, isDatabaseUri } from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function useGateway(doc: DocumentGateway) {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayApp/AppGateway.tsx b/web/packages/teleterm/src/ui/DocumentGatewayApp/AppGateway.tsx
index edef6c5f673ed..1c2981ce9f42b 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayApp/AppGateway.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayApp/AppGateway.tsx
@@ -19,21 +19,20 @@
 import { useMemo, useRef } from 'react';
 
 import {
-  Flex,
-  Text,
-  ButtonSecondary,
-  Link,
-  Box,
   Alert,
-  Indicator,
+  Box,
+  ButtonSecondary,
+  Flex,
   H1,
+  Indicator,
+  Link,
+  Text,
 } from 'design';
-
+import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
+import { TextSelectCopy } from 'shared/components/TextSelectCopy';
 import Validation from 'shared/components/Validation';
 import { Attempt } from 'shared/hooks/useAsync';
 import { debounce } from 'shared/utils/highbar';
-import { TextSelectCopy } from 'shared/components/TextSelectCopy';
-import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
 
 import { PortFieldInput } from '../components/FieldInputs';
 
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.story.tsx b/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.story.tsx
index 65a128c887c8f..c0b4ec802b28e 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.story.tsx
@@ -16,19 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { wait } from 'shared/utils/wait';
-
 import { Meta } from '@storybook/react';
 
 import { Flex } from 'design';
+import { wait } from 'shared/utils/wait';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { makeAppGateway } from 'teleterm/services/tshd/testHelpers';
 import { DocumentGatewayApp } from 'teleterm/ui/DocumentGatewayApp/DocumentGatewayApp';
-import * as types from 'teleterm/ui/services/workspacesService';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
-import { makeAppGateway } from 'teleterm/services/tshd/testHelpers';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import * as types from 'teleterm/ui/services/workspacesService';
 
 type StoryProps = {
   appType: 'web' | 'tcp';
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.tsx b/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.tsx
index 61b8ce5927c23..ba70a7dfbdbe3 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayApp/DocumentGatewayApp.tsx
@@ -15,13 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { DocumentGateway } from 'teleterm/ui/services/workspacesService';
 import Document from 'teleterm/ui/Document';
-
-import { useGateway } from '../DocumentGateway/useGateway';
+import { DocumentGateway } from 'teleterm/ui/services/workspacesService';
 
 import { OfflineGateway } from '../components/OfflineGateway';
-
+import { useGateway } from '../DocumentGateway/useGateway';
 import { AppGateway } from './AppGateway';
 
 export function DocumentGatewayApp(props: {
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayCliClient/DocumentGatewayCliClient.tsx b/web/packages/teleterm/src/ui/DocumentGatewayCliClient/DocumentGatewayCliClient.tsx
index 98ad8c3dabf87..2918f84f32819 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayCliClient/DocumentGatewayCliClient.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayCliClient/DocumentGatewayCliClient.tsx
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { Flex, Text, ButtonPrimary } from 'design';
 
-import Document from 'teleterm/ui/Document';
-import * as types from 'teleterm/ui/services/workspacesService';
+import { ButtonPrimary, Flex, Text } from 'design';
+
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { DocumentTerminal } from 'teleterm/ui/DocumentTerminal';
+import Document from 'teleterm/ui/Document';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import { DocumentTerminal } from 'teleterm/ui/DocumentTerminal';
+import * as types from 'teleterm/ui/services/workspacesService';
 import { connectToDatabase } from 'teleterm/ui/services/workspacesService';
 
 /**
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.story.tsx b/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.story.tsx
index 0a6e04c06a355..15a68c41e2c9c 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.story.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.story.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as types from 'teleterm/ui/services/workspacesService';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-
 import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
+import * as types from 'teleterm/ui/services/workspacesService';
 
 import { DocumentGatewayKube } from './DocumentGatewayKube';
 
diff --git a/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.tsx b/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.tsx
index e05b0a59adf09..8d75b876e389f 100644
--- a/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.tsx
+++ b/web/packages/teleterm/src/ui/DocumentGatewayKube/DocumentGatewayKube.tsx
@@ -20,13 +20,13 @@ import { useEffect } from 'react';
 
 import { useAsync } from 'shared/hooks/useAsync';
 
-import * as types from 'teleterm/ui/services/workspacesService';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { retryWithRelogin } from 'teleterm/ui/utils';
 import Document from 'teleterm/ui/Document';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
 import { DocumentTerminal } from 'teleterm/ui/DocumentTerminal';
+import * as types from 'teleterm/ui/services/workspacesService';
 import { routing } from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 import { OfflineGateway } from '../components/OfflineGateway';
 
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/DocumentTerminal.tsx b/web/packages/teleterm/src/ui/DocumentTerminal/DocumentTerminal.tsx
index 707ab6380c880..e1dd90a7bd0b1 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/DocumentTerminal.tsx
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/DocumentTerminal.tsx
@@ -17,24 +17,24 @@
  */
 
 import { useCallback, useState } from 'react';
+
 import {
-  FileTransferActionBar,
   FileTransfer,
+  FileTransferActionBar,
   FileTransferContextProvider,
 } from 'shared/components/FileTransfer';
 import { TerminalSearch } from 'shared/components/TerminalSearch';
 
-import Document from 'teleterm/ui/Document';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import Document from 'teleterm/ui/Document';
 import { isDocumentTshNodeWithServerId } from 'teleterm/ui/services/workspacesService';
+import type * as types from 'teleterm/ui/services/workspacesService';
 
-import { Terminal } from './Terminal';
 import { Reconnect } from './Reconnect';
+import { Terminal } from './Terminal';
 import { useDocumentTerminal } from './useDocumentTerminal';
 import { useTshFileTransferHandlers } from './useTshFileTransferHandlers';
 
-import type * as types from 'teleterm/ui/services/workspacesService';
-
 export function DocumentTerminal(props: {
   doc: types.DocumentTerminal;
   visible: boolean;
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/Reconnect.tsx b/web/packages/teleterm/src/ui/DocumentTerminal/Reconnect.tsx
index 481829590a014..c6568b0f6d6a2 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/Reconnect.tsx
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/Reconnect.tsx
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flex, Text, ButtonPrimary } from 'design';
+import { ButtonPrimary, Flex, Text } from 'design';
 import { Danger } from 'design/Alert';
 import { Attempt } from 'shared/hooks/useAsync';
 
-import { assertUnreachable } from 'teleterm/ui/utils';
-
 import type * as types from 'teleterm/ui/services/workspacesService';
+import { assertUnreachable } from 'teleterm/ui/utils';
 
 export function Reconnect(props: {
   docKind: types.DocumentTerminal['kind'];
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.test.tsx b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.test.tsx
index 1fe5f522280d1..007627e43ea88 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.test.tsx
@@ -17,14 +17,16 @@
  */
 
 import 'jest-canvas-mock';
+
 import { EventEmitter } from 'node:events';
 
-import userEvent from '@testing-library/user-event';
 import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
 import { render } from 'design/utils/testing';
 
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import Logger, { NullService } from 'teleterm/logger';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { IAppContext } from 'teleterm/ui/types';
 
 import { Terminal } from './Terminal';
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.tsx b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.tsx
index 3217f60c38ae3..1db5f8d8b85ed 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.tsx
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/Terminal.tsx
@@ -18,24 +18,23 @@
 
 import React, { useEffect, useRef, useState } from 'react';
 import styled, { useTheme } from 'styled-components';
+
 import { Box, Flex } from 'design';
-import { debounce } from 'shared/utils/highbar';
 import {
   Attempt,
   makeEmptyAttempt,
   makeErrorAttemptWithStatusText,
   makeSuccessAttempt,
 } from 'shared/hooks/useAsync';
+import { debounce } from 'shared/utils/highbar';
 
+import { ConfigService } from 'teleterm/services/config';
 import { WindowsPty } from 'teleterm/services/pty';
 import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
-import { DocumentTerminal } from 'teleterm/ui/services/workspacesService';
 import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
-
-import { ConfigService } from 'teleterm/services/config';
+import { DocumentTerminal } from 'teleterm/ui/services/workspacesService';
 
 import { Reconnect } from '../Reconnect';
-
 import XTermCtrl from './ctrl';
 
 type TerminalProps = {
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts
index d6877b69fcecd..a96d462490b8f 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts
@@ -17,18 +17,20 @@
  */
 
 import '@xterm/xterm/css/xterm.css';
-import { IDisposable, ITheme, Terminal } from '@xterm/xterm';
+
 import { FitAddon } from '@xterm/addon-fit';
+import { IDisposable, ITheme, Terminal } from '@xterm/xterm';
+
 import {
   SearchAddon,
   TerminalSearcher,
 } from 'shared/components/TerminalSearch';
 import { debounce } from 'shared/utils/highbar';
 
+import Logger from 'teleterm/logger';
+import { AppConfig, ConfigService } from 'teleterm/services/config';
 import { WindowsPty } from 'teleterm/services/pty';
 import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
-import Logger from 'teleterm/logger';
-import { ConfigService, AppConfig } from 'teleterm/services/config';
 import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
 
 const WINDOW_RESIZE_DEBOUNCE_DELAY = 200;
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.test.tsx b/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.test.tsx
index f2bba179b6a01..09e34e6787149 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.test.tsx
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.test.tsx
@@ -17,38 +17,37 @@
  */
 
 import { renderHook, waitFor } from '@testing-library/react';
+
 import 'jest-canvas-mock';
 
 import Logger, { NullService } from 'teleterm/logger';
 import { PtyCommand, PtyProcessCreationStatus } from 'teleterm/services/pty';
+import {
+  makeLeafCluster,
+  makeRootCluster,
+  makeServer,
+} from 'teleterm/services/tshd/testHelpers';
+import type * as tsh from 'teleterm/services/tshd/types';
+import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
+  AmbiguousHostnameError,
+  ResourcesService,
+} from 'teleterm/ui/services/resources';
+import {
+  DocumentPtySession,
   DocumentTerminal,
   DocumentTshNode,
   DocumentTshNodeWithLoginHost,
   DocumentTshNodeWithServerId,
-  DocumentPtySession,
 } from 'teleterm/ui/services/workspacesService';
-import {
-  ResourcesService,
-  AmbiguousHostnameError,
-} from 'teleterm/ui/services/resources';
-import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
-import {
-  makeRootCluster,
-  makeLeafCluster,
-  makeServer,
-} from 'teleterm/services/tshd/testHelpers';
+import type { IAppContext } from 'teleterm/ui/types';
+import type * as uri from 'teleterm/ui/uri';
 
 import { WorkspaceContextProvider } from '../Documents';
-
 import { useDocumentTerminal } from './useDocumentTerminal';
 
-import type { IAppContext } from 'teleterm/ui/types';
-import type * as tsh from 'teleterm/services/tshd/types';
-import type * as uri from 'teleterm/ui/uri';
-
 beforeAll(() => {
   Logger.init(new NullService());
 });
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.ts b/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.ts
index b4b30c01bcfd7..1245045473f0d 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.ts
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.ts
@@ -17,34 +17,34 @@
  */
 
 import { useEffect, useRef } from 'react';
+
 import { useAsync } from 'shared/hooks/useAsync';
 import { runOnce } from 'shared/utils/highbar';
 
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { IAppContext } from 'teleterm/ui/types';
-import {
-  DocumentsService,
-  isDocumentTshNodeWithLoginHost,
-  canDocChangeShell,
-} from 'teleterm/ui/services/workspacesService';
-import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
-import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { routing } from 'teleterm/ui/uri';
+import Logger from 'teleterm/logger';
+import type { Shell } from 'teleterm/mainProcess/shell';
 import {
   PtyCommand,
   PtyProcessCreationStatus,
   WindowsPty,
 } from 'teleterm/services/pty';
-import { AmbiguousHostnameError } from 'teleterm/ui/services/resources';
-import { retryWithRelogin } from 'teleterm/ui/utils';
-import Logger from 'teleterm/logger';
-import { ClustersService } from 'teleterm/ui/services/clusters';
 import * as tshdGateway from 'teleterm/services/tshd/gateway';
-
-import type { Shell } from 'teleterm/mainProcess/shell';
+import type * as tsh from 'teleterm/services/tshd/types';
+import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useWorkspaceContext } from 'teleterm/ui/Documents';
+import { ClustersService } from 'teleterm/ui/services/clusters';
+import { AmbiguousHostnameError } from 'teleterm/ui/services/resources';
+import {
+  canDocChangeShell,
+  DocumentsService,
+  isDocumentTshNodeWithLoginHost,
+} from 'teleterm/ui/services/workspacesService';
 import type * as types from 'teleterm/ui/services/workspacesService';
+import { IAppContext } from 'teleterm/ui/types';
+import { routing } from 'teleterm/ui/uri';
 import type * as uri from 'teleterm/ui/uri';
-import type * as tsh from 'teleterm/services/tshd/types';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function useDocumentTerminal(doc: types.DocumentTerminal) {
   const logger = useRef(new Logger('useDocumentTerminal'));
diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/useTshFileTransferHandlers.ts b/web/packages/teleterm/src/ui/DocumentTerminal/useTshFileTransferHandlers.ts
index 5fdc9c3b2835e..7c1c5387b935b 100644
--- a/web/packages/teleterm/src/ui/DocumentTerminal/useTshFileTransferHandlers.ts
+++ b/web/packages/teleterm/src/ui/DocumentTerminal/useTshFileTransferHandlers.ts
@@ -16,18 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { FileTransferDirection } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
 import {
-  FileTransferListeners,
   createFileTransferEventsEmitter,
+  FileTransferListeners,
 } from 'shared/components/FileTransfer';
 
-import { FileTransferDirection } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
-
-import { retryWithRelogin } from 'teleterm/ui/utils';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { IAppContext } from 'teleterm/ui/types';
-
 import type * as uri from 'teleterm/ui/uri';
+import { retryWithRelogin } from 'teleterm/ui/utils';
 
 export function useTshFileTransferHandlers() {
   const appContext = useAppContext();
diff --git a/web/packages/teleterm/src/ui/Documents/DocumentsRenderer.tsx b/web/packages/teleterm/src/ui/Documents/DocumentsRenderer.tsx
index cfa686bb99696..8f406309117d3 100644
--- a/web/packages/teleterm/src/ui/Documents/DocumentsRenderer.tsx
+++ b/web/packages/teleterm/src/ui/Documents/DocumentsRenderer.tsx
@@ -18,36 +18,34 @@
 
 import { useMemo } from 'react';
 import { createPortal } from 'react-dom';
-
 import styled from 'styled-components';
+
 import { Text } from 'design';
 
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import {
+  ConnectMyComputerContextProvider,
+  ConnectMyComputerNavigationMenu,
+  DocumentConnectMyComputer,
+} from 'teleterm/ui/ConnectMyComputer';
+import Document from 'teleterm/ui/Document';
 import { DocumentAccessRequests } from 'teleterm/ui/DocumentAccessRequests';
+import { DocumentAuthorizeWebSession } from 'teleterm/ui/DocumentAuthorizeWebSession';
+import DocumentCluster from 'teleterm/ui/DocumentCluster';
+import { DocumentGateway } from 'teleterm/ui/DocumentGateway';
+import { DocumentGatewayApp } from 'teleterm/ui/DocumentGatewayApp';
 import { DocumentGatewayCliClient } from 'teleterm/ui/DocumentGatewayCliClient';
-
-import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { DocumentGatewayKube } from 'teleterm/ui/DocumentGatewayKube';
+import { DocumentTerminal } from 'teleterm/ui/DocumentTerminal';
 import * as types from 'teleterm/ui/services/workspacesService';
 import {
   DocumentsService,
   Workspace,
 } from 'teleterm/ui/services/workspacesService';
-import DocumentCluster from 'teleterm/ui/DocumentCluster';
-import { DocumentGateway } from 'teleterm/ui/DocumentGateway';
-import { DocumentTerminal } from 'teleterm/ui/DocumentTerminal';
-import {
-  ConnectMyComputerContextProvider,
-  DocumentConnectMyComputer,
-  ConnectMyComputerNavigationMenu,
-} from 'teleterm/ui/ConnectMyComputer';
-import { DocumentGatewayKube } from 'teleterm/ui/DocumentGatewayKube';
-import { DocumentGatewayApp } from 'teleterm/ui/DocumentGatewayApp';
-import { DocumentAuthorizeWebSession } from 'teleterm/ui/DocumentAuthorizeWebSession';
+import { isAppUri, isDatabaseUri, RootClusterUri } from 'teleterm/ui/uri';
 
-import Document from 'teleterm/ui/Document';
-import { RootClusterUri, isDatabaseUri, isAppUri } from 'teleterm/ui/uri';
-
-import { WorkspaceContextProvider } from './workspaceContext';
 import { KeyboardShortcutsPanel } from './KeyboardShortcutsPanel';
+import { WorkspaceContextProvider } from './workspaceContext';
 
 export function DocumentsRenderer(props: {
   topBarContainerRef: React.MutableRefObject<HTMLDivElement>;
diff --git a/web/packages/teleterm/src/ui/Documents/KeyboardShortcutsPanel.tsx b/web/packages/teleterm/src/ui/Documents/KeyboardShortcutsPanel.tsx
index 4e1913307fdde..aa3cb66f8abff 100644
--- a/web/packages/teleterm/src/ui/Documents/KeyboardShortcutsPanel.tsx
+++ b/web/packages/teleterm/src/ui/Documents/KeyboardShortcutsPanel.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Text } from 'design';
-
 import styled from 'styled-components';
 
-import Document from 'teleterm/ui/Document';
-import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
+import { Text } from 'design';
+
 import { KeyboardShortcutAction } from 'teleterm/services/config';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import Document from 'teleterm/ui/Document';
+import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
 
 export function KeyboardShortcutsPanel() {
   const { mainProcessClient } = useAppContext();
diff --git a/web/packages/teleterm/src/ui/Documents/workspaceContext.tsx b/web/packages/teleterm/src/ui/Documents/workspaceContext.tsx
index 949ef3e96cefc..c36a01ddb13e2 100644
--- a/web/packages/teleterm/src/ui/Documents/workspaceContext.tsx
+++ b/web/packages/teleterm/src/ui/Documents/workspaceContext.tsx
@@ -17,17 +17,17 @@
  */
 
 import {
+  createContext,
   FC,
   PropsWithChildren,
   useCallback,
   useContext,
-  createContext,
 } from 'react';
 
+import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
 import { DocumentsService } from 'teleterm/ui/services/workspacesService';
 import { AccessRequestsService } from 'teleterm/ui/services/workspacesService/accessRequestsService';
 import { ClusterUri, RootClusterUri } from 'teleterm/ui/uri';
-import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
 
 const WorkspaceContext = createContext<{
   rootClusterUri: RootClusterUri;
diff --git a/web/packages/teleterm/src/ui/DocumentsReopen/DocumentsReopen.tsx b/web/packages/teleterm/src/ui/DocumentsReopen/DocumentsReopen.tsx
index 9898d2c16dd72..1dfbbbd3c3903 100644
--- a/web/packages/teleterm/src/ui/DocumentsReopen/DocumentsReopen.tsx
+++ b/web/packages/teleterm/src/ui/DocumentsReopen/DocumentsReopen.tsx
@@ -16,19 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonIcon, ButtonPrimary, ButtonSecondary, H2 } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
   DialogHeader,
 } from 'design/DialogConfirmation';
-import { ButtonIcon, ButtonPrimary, ButtonSecondary, H2 } from 'design';
 import { Cross } from 'design/Icon';
-import { pluralize } from 'shared/utils/text';
-
 import { P } from 'design/Text/Text';
+import { pluralize } from 'shared/utils/text';
 
-import { RootClusterUri, routing } from 'teleterm/ui/uri';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { RootClusterUri, routing } from 'teleterm/ui/uri';
 
 export function DocumentsReopen(props: {
   rootClusterUri: RootClusterUri;
diff --git a/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessAuthentication.tsx b/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessAuthentication.tsx
index 2e7cf90babd27..addefcffb6480 100644
--- a/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessAuthentication.tsx
+++ b/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessAuthentication.tsx
@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useEffect } from 'react';
-
-import { useAsync } from 'shared/hooks/useAsync';
+import { useEffect, useRef } from 'react';
 
 import { HeadlessAuthenticationState } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
+import { useAsync } from 'shared/hooks/useAsync';
 
+import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { RootClusterUri } from 'teleterm/ui/uri';
 
-import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
-
 import { HeadlessPrompt } from './HeadlessPrompt';
 
 interface HeadlessAuthenticationProps {
diff --git a/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessPrompt/HeadlessPrompt.tsx b/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessPrompt/HeadlessPrompt.tsx
index 1645807756a5f..29a3732033ec3 100644
--- a/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessPrompt/HeadlessPrompt.tsx
+++ b/web/packages/teleterm/src/ui/HeadlessAuthn/HeadlessPrompt/HeadlessPrompt.tsx
@@ -17,30 +17,29 @@
  */
 
 import { useState } from 'react';
-import * as Alerts from 'design/Alert';
+
 import {
+  Box,
   ButtonIcon,
-  Text,
   ButtonSecondary,
-  Image,
   Flex,
-  Box,
   H2,
+  Image,
+  Text,
 } from 'design';
+import * as Alerts from 'design/Alert';
 import DialogConfirmation, {
   DialogContent,
-  DialogHeader,
   DialogFooter,
+  DialogHeader,
 } from 'design/DialogConfirmation';
-import { Attempt } from 'shared/hooks/useAsync';
 import * as Icons from 'design/Icon';
-
 import { P, P3 } from 'design/Text/Text';
-
-import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
-import svgHardwareKey from 'teleterm/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/hardware.svg';
+import { Attempt } from 'shared/hooks/useAsync';
 
 import type * as tsh from 'teleterm/services/tshd/types';
+import svgHardwareKey from 'teleterm/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/hardware.svg';
+import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
 
 export type HeadlessPromptProps = {
   cluster: tsh.Cluster;
diff --git a/web/packages/teleterm/src/ui/LayoutManager.tsx b/web/packages/teleterm/src/ui/LayoutManager.tsx
index e75ca7a8ae767..2435abb98f503 100644
--- a/web/packages/teleterm/src/ui/LayoutManager.tsx
+++ b/web/packages/teleterm/src/ui/LayoutManager.tsx
@@ -17,13 +17,14 @@
  */
 
 import { useRef } from 'react';
+
 import { Flex } from 'design';
 
 import { AccessRequestCheckout } from 'teleterm/ui/AccessRequestCheckout';
+import { NotificationsHost } from 'teleterm/ui/components/Notifcations';
+import { StatusBar } from 'teleterm/ui/StatusBar';
 import { TabHostContainer } from 'teleterm/ui/TabHost';
 import { TopBar } from 'teleterm/ui/TopBar';
-import { StatusBar } from 'teleterm/ui/StatusBar';
-import { NotificationsHost } from 'teleterm/ui/components/Notifcations';
 
 export function LayoutManager() {
   const topBarContainerRef = useRef<HTMLDivElement>();
diff --git a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.story.tsx b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.story.tsx
index 03e0f7f7ea2db..16b10f66230d8 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.story.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.story.tsx
@@ -20,9 +20,9 @@ import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvi
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
   DialogDocumentsReopen,
-  ModalsService,
-  DialogHardwareKeyTouch,
   DialogHardwareKeyPin,
+  DialogHardwareKeyTouch,
+  ModalsService,
 } from 'teleterm/ui/services/modals';
 
 import ModalsHost from './ModalsHost';
diff --git a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.test.tsx b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.test.tsx
index 90dc4931914b0..f31667bc325d4 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.test.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.test.tsx
@@ -16,16 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen } from 'design/utils/testing';
 import { act } from '@testing-library/react';
 
+import { render, screen } from 'design/utils/testing';
+
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
-  ModalsService,
-  DialogDocumentsReopen,
   DialogClusterConnect,
+  DialogDocumentsReopen,
   DialogHardwareKeyTouch,
+  ModalsService,
 } from 'teleterm/ui/services/modals';
 
 import ModalsHost from './ModalsHost';
diff --git a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.tsx b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.tsx
index 81fc3bfb5827e..3eb2b5e20ea73 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/ModalsHost.tsx
@@ -19,21 +19,19 @@
 import { Fragment } from 'react';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-
 import { ClusterConnect } from 'teleterm/ui/ClusterConnect';
 import { DocumentsReopen } from 'teleterm/ui/DocumentsReopen';
-import { Dialog } from 'teleterm/ui/services/modals';
 import { HeadlessAuthentication } from 'teleterm/ui/HeadlessAuthn';
+import { Dialog } from 'teleterm/ui/services/modals';
 
 import { ClusterLogout } from '../ClusterLogout';
 import { ResourceSearchErrors } from '../Search/ResourceSearchErrors';
 import { assertUnreachable } from '../utils';
-
-import { UsageData } from './modals/UsageData';
-import { UserJobRole } from './modals/UserJobRole';
-import { ReAuthenticate } from './modals/ReAuthenticate';
 import { ChangeAccessRequestKind } from './modals/ChangeAccessRequestKind';
 import { AskPin, ChangePin, OverwriteSlot, Touch } from './modals/HardwareKeys';
+import { ReAuthenticate } from './modals/ReAuthenticate';
+import { UsageData } from './modals/UsageData';
+import { UserJobRole } from './modals/UserJobRole';
 
 export default function ModalsHost() {
   const { modalsService } = useAppContext();
diff --git a/web/packages/teleterm/src/ui/ModalsHost/index.ts b/web/packages/teleterm/src/ui/ModalsHost/index.ts
index caa8458fdaa29..0f2214c9936fb 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/index.ts
+++ b/web/packages/teleterm/src/ui/ModalsHost/index.ts
@@ -17,4 +17,5 @@
  */
 
 import ModalsHost from './ModalsHost';
+
 export default ModalsHost;
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/AskPin.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/AskPin.tsx
index 964ec26cd54cf..a476b8f04189c 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/AskPin.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/AskPin.tsx
@@ -18,17 +18,16 @@
 
 import { useState } from 'react';
 
+import { ButtonPrimary, Flex, P2 } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
 } from 'design/DialogConfirmation';
-import { ButtonPrimary, Flex, P2 } from 'design';
+import { PromptHardwareKeyPINRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 import FieldInput from 'shared/components/FieldInput';
 import Validation from 'shared/components/Validation';
 import { requiredField } from 'shared/components/Validation/rules';
 
-import { PromptHardwareKeyPINRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
-
 import { CommonHeader } from './CommonHeader';
 
 export function AskPin(props: {
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/ChangePin.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/ChangePin.tsx
index 29b19e5e08eac..97b5b3e25dd4c 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/ChangePin.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/ChangePin.tsx
@@ -18,22 +18,21 @@
 
 import { useState } from 'react';
 
+import { ButtonPrimary, Flex, P2, Toggle } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
 } from 'design/DialogConfirmation';
-import { ButtonPrimary, Flex, Toggle, P2 } from 'design';
-import Validation from 'shared/components/Validation';
-import FieldInput from 'shared/components/FieldInput';
 import {
   PromptHardwareKeyPINChangeRequest,
   PromptHardwareKeyPINChangeResponse,
 } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
-
+import FieldInput from 'shared/components/FieldInput';
+import Validation from 'shared/components/Validation';
 import {
+  requiredAll,
   requiredField,
   Rule,
-  requiredAll,
 } from 'shared/components/Validation/rules';
 
 import { CommonHeader } from './CommonHeader';
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/CommonHeader.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/CommonHeader.tsx
index 8027886e8fa64..fd41eaddaed6f 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/CommonHeader.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/CommonHeader.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { H2, ButtonIcon } from 'design';
-import * as icons from 'design/Icon';
+import { ButtonIcon, H2 } from 'design';
 import { DialogHeader } from 'design/Dialog';
+import * as icons from 'design/Icon';
 
 import { RootClusterUri, routing } from 'teleterm/ui/uri';
 
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/OverwriteSlot.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/OverwriteSlot.tsx
index 7a7aa9ab5bedc..8b0fccf6daca4 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/OverwriteSlot.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/OverwriteSlot.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonPrimary, ButtonSecondary, Flex, P2 } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
 } from 'design/DialogConfirmation';
-import { ButtonPrimary, ButtonSecondary, Flex, P2 } from 'design';
 import { ConfirmHardwareKeySlotOverwriteRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 
 import { CommonHeader } from './CommonHeader';
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/Touch.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/Touch.tsx
index 60f1ac9123339..389b129008056 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/Touch.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/Touch.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import DialogConfirmation, { DialogContent } from 'design/DialogConfirmation';
 import { Flex, Image, P2 } from 'design';
-
+import DialogConfirmation, { DialogContent } from 'design/DialogConfirmation';
 import { PromptHardwareKeyTouchRequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 
 import svgHardwareKey from 'teleterm/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/hardware.svg';
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/index.story.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/index.story.tsx
index 835e3b17606b6..34e7418554c3c 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/index.story.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/HardwareKeys/index.story.tsx
@@ -20,10 +20,10 @@ import { Meta } from '@storybook/react';
 
 import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 
-import { Touch as TouchComponent } from './Touch';
-import { OverwriteSlot as OverwriteSlotComponent } from './OverwriteSlot';
-import { ChangePin as ChangePinComponent } from './ChangePin';
 import { AskPin as AskPinComponent } from './AskPin';
+import { ChangePin as ChangePinComponent } from './ChangePin';
+import { OverwriteSlot as OverwriteSlotComponent } from './OverwriteSlot';
+import { Touch as TouchComponent } from './Touch';
 
 const rootCluster = makeRootCluster();
 
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.story.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.story.tsx
index bfcaf6f49a4d2..8f28ee87be091 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.story.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.story.tsx
@@ -17,8 +17,8 @@
  */
 
 import {
-  makeRootCluster,
   makeLeafCluster,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.tsx
index 8d6a11053bde6..25b18f679d8b9 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/ReAuthenticate/ReAuthenticate.tsx
@@ -18,36 +18,34 @@
 
 import { FC, useEffect, useState } from 'react';
 
-import { PromptMFARequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
-
-import DialogConfirmation, {
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-} from 'design/DialogConfirmation';
 import {
+  Box,
   ButtonIcon,
   ButtonPrimary,
   ButtonSecondary,
-  Text,
-  Image,
   Flex,
-  Box,
   H2,
+  Image,
+  Text,
 } from 'design';
+import DialogConfirmation, {
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+} from 'design/DialogConfirmation';
 import * as icons from 'design/Icon';
-import Validation from 'shared/components/Validation';
-import { requiredToken } from 'shared/components/Validation/rules';
+import { PromptMFARequest } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 import FieldInput from 'shared/components/FieldInput';
 import { FieldSelect } from 'shared/components/FieldSelect';
-
 import { Option } from 'shared/components/Select';
+import Validation from 'shared/components/Validation';
+import { requiredToken } from 'shared/components/Validation/rules';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
 import svgHardwareKey from 'teleterm/ui/ClusterConnect/ClusterLogin/FormLogin/PromptPasswordless/hardware.svg';
-import { routing } from 'teleterm/ui/uri';
 import PromptSsoStatus from 'teleterm/ui/ClusterConnect/ClusterLogin/FormLogin/PromptSsoStatus';
+import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
+import { routing } from 'teleterm/ui/uri';
 
 export const ReAuthenticate: FC<{
   promptMfaRequest: PromptMFARequest;
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/UsageData/UsageData.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/UsageData/UsageData.tsx
index c3125d8aa92c7..f3f708c818195 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/UsageData/UsageData.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/UsageData/UsageData.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonIcon, ButtonPrimary, ButtonSecondary, H2, Link } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
   DialogHeader,
 } from 'design/DialogConfirmation';
-import { ButtonIcon, ButtonPrimary, ButtonSecondary, H2, Link } from 'design';
 import { Cross } from 'design/Icon';
 import { P } from 'design/Text/Text';
 
diff --git a/web/packages/teleterm/src/ui/ModalsHost/modals/UserJobRole/UserJobRole.tsx b/web/packages/teleterm/src/ui/ModalsHost/modals/UserJobRole/UserJobRole.tsx
index 81b6c7b99a546..c3f3d1577f6d2 100644
--- a/web/packages/teleterm/src/ui/ModalsHost/modals/UserJobRole/UserJobRole.tsx
+++ b/web/packages/teleterm/src/ui/ModalsHost/modals/UserJobRole/UserJobRole.tsx
@@ -18,6 +18,7 @@
 
 import { useRef, useState } from 'react';
 import styled from 'styled-components';
+
 import { ButtonIcon, ButtonPrimary, ButtonSecondary, H2, Input } from 'design';
 import DialogConfirmation, {
   DialogContent,
diff --git a/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.story.tsx b/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.story.tsx
index 9dff88de7b2c0..c2085536999a6 100644
--- a/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.story.tsx
+++ b/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.story.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { routing } from 'teleterm/ui/uri';
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
+import { routing } from 'teleterm/ui/uri';
 
 import { ResourceSearchErrors } from './ResourceSearchErrors';
 
diff --git a/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.tsx b/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.tsx
index 9903b70f36bb7..a827a11fd31cc 100644
--- a/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.tsx
+++ b/web/packages/teleterm/src/ui/Search/ResourceSearchErrors.tsx
@@ -16,16 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ButtonIcon, ButtonSecondary, H2, Text } from 'design';
 import DialogConfirmation, {
   DialogContent,
   DialogFooter,
   DialogHeader,
 } from 'design/DialogConfirmation';
-import { ButtonIcon, ButtonSecondary, H2, Text } from 'design';
 import { Cross } from 'design/Icon';
 
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
-
 import type * as uri from 'teleterm/ui/uri';
 
 export function ResourceSearchErrors(props: {
diff --git a/web/packages/teleterm/src/ui/Search/SearchBar.test.tsx b/web/packages/teleterm/src/ui/Search/SearchBar.test.tsx
index 28e49399fd98b..412d39a8be931 100644
--- a/web/packages/teleterm/src/ui/Search/SearchBar.test.tsx
+++ b/web/packages/teleterm/src/ui/Search/SearchBar.test.tsx
@@ -17,30 +17,29 @@
  */
 
 import userEvent from '@testing-library/user-event';
-import { render, screen, waitFor, act } from 'design/utils/testing';
+
+import { act, render, screen, waitFor } from 'design/utils/testing';
 import { makeSuccessAttempt } from 'shared/hooks/useAsync';
 
 import Logger, { NullService } from 'teleterm/logger';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { ResourceSearchError } from 'teleterm/ui/services/resources';
-import ModalsHost from 'teleterm/ui/ModalsHost';
 import {
-  makeRootCluster,
   makeRetryableError,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import ModalsHost from 'teleterm/ui/ModalsHost';
+import { ResourceSearchError } from 'teleterm/ui/services/resources';
+import { ConnectionsContextProvider } from 'teleterm/ui/TopBar/Connections/connectionsContext';
 import { ClusterUri } from 'teleterm/ui/uri';
 import { VnetContextProvider } from 'teleterm/ui/Vnet';
-import { ConnectionsContextProvider } from 'teleterm/ui/TopBar/Connections/connectionsContext';
 
 import { SearchAction } from './actions';
-
 import * as pickers from './pickers/pickers';
 import * as useActionAttempts from './pickers/useActionAttempts';
-import * as useSearch from './useSearch';
-import * as SearchContext from './SearchContext';
-
 import { SearchBarConnected } from './SearchBar';
+import * as SearchContext from './SearchContext';
+import * as useSearch from './useSearch';
 
 beforeAll(() => {
   Logger.init(new NullService());
diff --git a/web/packages/teleterm/src/ui/Search/SearchBar.tsx b/web/packages/teleterm/src/ui/Search/SearchBar.tsx
index a25ef17f75aa6..70c85248a9e05 100644
--- a/web/packages/teleterm/src/ui/Search/SearchBar.tsx
+++ b/web/packages/teleterm/src/ui/Search/SearchBar.tsx
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useRef, useEffect, useCallback } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 import styled from 'styled-components';
+
 import { Box, Flex } from 'design';
 
+import { KeyboardShortcutAction } from 'teleterm/services/config';
 import {
   SearchContextProvider,
   useSearchContext,
 } from 'teleterm/ui/Search/SearchContext';
-import { KeyboardShortcutAction } from 'teleterm/services/config';
 import {
   useKeyboardShortcutFormatters,
   useKeyboardShortcuts,
diff --git a/web/packages/teleterm/src/ui/Search/SearchContext.test.tsx b/web/packages/teleterm/src/ui/Search/SearchContext.test.tsx
index dd0252d438d0e..841eafe91fadb 100644
--- a/web/packages/teleterm/src/ui/Search/SearchContext.test.tsx
+++ b/web/packages/teleterm/src/ui/Search/SearchContext.test.tsx
@@ -17,14 +17,21 @@
  */
 
 import { PropsWithChildren } from 'react';
+
 import '@testing-library/jest-dom';
-import { fireEvent, createEvent, render, screen } from '@testing-library/react';
-import { renderHook, act } from '@testing-library/react';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import {
+  act,
+  createEvent,
+  fireEvent,
+  render,
+  renderHook,
+  screen,
+} from '@testing-library/react';
 
-import { IAppContext } from 'teleterm/ui/types';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { IAppContext } from 'teleterm/ui/types';
 
 import { SearchContextProvider, useSearchContext } from './SearchContext';
 
diff --git a/web/packages/teleterm/src/ui/Search/SearchContext.tsx b/web/packages/teleterm/src/ui/Search/SearchContext.tsx
index a24d1787dacd1..afa4b4abc676c 100644
--- a/web/packages/teleterm/src/ui/Search/SearchContext.tsx
+++ b/web/packages/teleterm/src/ui/Search/SearchContext.tsx
@@ -17,19 +17,18 @@
  */
 
 import {
-  useContext,
-  useState,
-  FC,
-  useCallback,
   createContext,
-  useRef,
+  FC,
   MutableRefObject,
   PropsWithChildren,
+  useCallback,
+  useContext,
+  useRef,
+  useState,
 } from 'react';
 
-import { SearchFilter } from 'teleterm/ui/Search/searchResult';
-
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { SearchFilter } from 'teleterm/ui/Search/searchResult';
 import {
   Document,
   DocumentClusterQueryParams,
diff --git a/web/packages/teleterm/src/ui/Search/actions.tsx b/web/packages/teleterm/src/ui/Search/actions.tsx
index d2a693a92496f..1525b89a5b6dd 100644
--- a/web/packages/teleterm/src/ui/Search/actions.tsx
+++ b/web/packages/teleterm/src/ui/Search/actions.tsx
@@ -16,20 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { IAppContext } from 'teleterm/ui/types';
-import { SearchResult } from 'teleterm/ui/Search/searchResult';
 import { SearchContext } from 'teleterm/ui/Search/SearchContext';
+import { SearchResult } from 'teleterm/ui/Search/searchResult';
 import {
+  connectToApp,
   connectToDatabase,
   connectToKube,
   connectToServer,
-  connectToApp,
   DocumentCluster,
   getDefaultDocumentClusterQueryParams,
 } from 'teleterm/ui/services/workspacesService';
-import { retryWithRelogin, assertUnreachable } from 'teleterm/ui/utils';
-import { routing } from 'teleterm/ui/uri';
 import { ResourceRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';
+import { IAppContext } from 'teleterm/ui/types';
+import { routing } from 'teleterm/ui/uri';
+import { assertUnreachable, retryWithRelogin } from 'teleterm/ui/utils';
 
 export interface SimpleAction {
   type: 'simple-action';
diff --git a/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.test.ts b/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.test.ts
index bb778e29ad25f..1b8637a109024 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.test.ts
+++ b/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.test.ts
@@ -19,8 +19,8 @@
 import { makeSuccessAttempt } from 'shared/hooks/useAsync';
 
 import {
-  makeRootCluster,
   makeRetryableError,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
 
diff --git a/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.tsx b/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.tsx
index 56726db89d0f0..ec383509c4359 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/ActionPicker.tsx
@@ -18,38 +18,39 @@
 
 import React, { ReactElement, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
-import { Box, ButtonBorder, Flex, Label as DesignLabel, Text } from 'design';
+
+import { Box, ButtonBorder, Label as DesignLabel, Flex, Text } from 'design';
 import * as icons from 'design/Icon';
 import { Cross as CloseIcon } from 'design/Icon';
+import { AdvancedSearchToggle } from 'shared/components/AdvancedSearchToggle';
 import { Highlight } from 'shared/components/Highlight';
 import {
   Attempt,
   hasFinished,
   makeSuccessAttempt,
 } from 'shared/hooks/useAsync';
-import { AdvancedSearchToggle } from 'shared/components/AdvancedSearchToggle';
 
+import { isWebApp } from 'teleterm/services/tshd/app';
+import * as tsh from 'teleterm/services/tshd/types';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import {
+  DisplayResults,
+  isClusterSearchFilter,
   ResourceMatch,
   ResourceSearchResult,
   SearchFilter,
   SearchResult,
+  SearchResultApp,
   SearchResultCluster,
   SearchResultDatabase,
   SearchResultKube,
-  SearchResultApp,
   SearchResultResourceType,
   SearchResultServer,
-  DisplayResults,
-  isClusterSearchFilter,
 } from 'teleterm/ui/Search/searchResult';
-import * as tsh from 'teleterm/services/tshd/types';
-import * as uri from 'teleterm/ui/uri';
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
-import { isRetryable } from 'teleterm/ui/utils/retryWithRelogin';
+import * as uri from 'teleterm/ui/uri';
 import { assertUnreachable } from 'teleterm/ui/utils';
-import { isWebApp } from 'teleterm/services/tshd/app';
+import { isRetryable } from 'teleterm/ui/utils/retryWithRelogin';
 import { useVnetContext } from 'teleterm/ui/Vnet';
 
 import { SearchAction } from '../actions';
@@ -58,11 +59,10 @@ import {
   CrossClusterResourceSearchResult,
   resourceTypeToReadableName,
 } from '../useSearch';
-
-import { useActionAttempts } from './useActionAttempts';
-import { getParameterPicker } from './pickers';
-import { ResultList, NonInteractiveItem, IconAndContent } from './ResultList';
 import { PickerContainer } from './PickerContainer';
+import { getParameterPicker } from './pickers';
+import { IconAndContent, NonInteractiveItem, ResultList } from './ResultList';
+import { useActionAttempts } from './useActionAttempts';
 
 export function ActionPicker(props: { input: ReactElement }) {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/Search/pickers/ParameterPicker.tsx b/web/packages/teleterm/src/ui/Search/pickers/ParameterPicker.tsx
index dca9846f2247b..de0acb64e34e4 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/ParameterPicker.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/ParameterPicker.tsx
@@ -17,22 +17,22 @@
  */
 
 import { ReactElement, useCallback, useEffect } from 'react';
+
+import { Text } from 'design';
+import * as icons from 'design/Icon';
 import { Highlight } from 'shared/components/Highlight';
 import {
+  Attempt,
   makeSuccessAttempt,
   mapAttempt,
   useAsync,
-  Attempt,
 } from 'shared/hooks/useAsync';
-import { Text } from 'design';
-import * as icons from 'design/Icon';
 
+import { Parameter, ParametrizedAction } from '../actions';
 import { useSearchContext } from '../SearchContext';
-import { ParametrizedAction, Parameter } from '../actions';
-
-import { IconAndContent, NonInteractiveItem, ResultList } from './ResultList';
-import { actionPicker } from './pickers';
 import { PickerContainer } from './PickerContainer';
+import { actionPicker } from './pickers';
+import { IconAndContent, NonInteractiveItem, ResultList } from './ResultList';
 
 interface ParameterPickerProps {
   action: ParametrizedAction;
diff --git a/web/packages/teleterm/src/ui/Search/pickers/ResultList.tsx b/web/packages/teleterm/src/ui/Search/pickers/ResultList.tsx
index ff9137f36ba5e..5d77fc5e40721 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/ResultList.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/ResultList.tsx
@@ -18,14 +18,15 @@
 
 import React, {
   ReactElement,
+  useCallback,
   useEffect,
   useRef,
   useState,
-  useCallback,
 } from 'react';
+import styled, { css } from 'styled-components';
+
 import { Flex } from 'design';
 import { IconProps } from 'design/Icon/Icon';
-import styled, { css } from 'styled-components';
 import { Attempt } from 'shared/hooks/useAsync';
 
 import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
diff --git a/web/packages/teleterm/src/ui/Search/pickers/pickers.tsx b/web/packages/teleterm/src/ui/Search/pickers/pickers.tsx
index 770ab05d091ec..493b2e3fd068a 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/pickers.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/pickers.tsx
@@ -19,7 +19,6 @@
 import React from 'react';
 
 import { ParametrizedAction } from '../actions';
-
 import { ActionPicker } from './ActionPicker';
 import { ParameterPicker } from './ParameterPicker';
 
diff --git a/web/packages/teleterm/src/ui/Search/pickers/results.story.tsx b/web/packages/teleterm/src/ui/Search/pickers/results.story.tsx
index c74d0a29777e8..e409b5b6c970c 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/results.story.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/results.story.tsx
@@ -17,40 +17,37 @@
  */
 
 import { useState } from 'react';
-import { makeSuccessAttempt } from 'shared/hooks/useAsync';
 
 import { Flex } from 'design';
-
 import { App } from 'gen-proto-ts/teleport/lib/teleterm/v1/app_pb';
+import { makeSuccessAttempt } from 'shared/hooks/useAsync';
 
-import { routing } from 'teleterm/ui/uri';
+import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
 import {
+  makeApp,
   makeDatabase,
   makeKube,
-  makeServer,
   makeLabelsList,
   makeRootCluster,
-  makeApp,
+  makeServer,
 } from 'teleterm/services/tshd/testHelpers';
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
-import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
+import { routing } from 'teleterm/ui/uri';
+import type * as uri from 'teleterm/ui/uri';
 
 import { SearchResult, SearchResultApp } from '../searchResult';
 import { makeResourceResult } from '../testHelpers';
-
 import {
+  AdvancedSearchEnabledItem,
+  AppItem,
   ComponentMap,
   NoResultsItem,
   ResourceSearchErrorsItem,
   TypeToSearchItem,
-  AdvancedSearchEnabledItem,
-  AppItem,
 } from './ActionPicker';
-import { SuggestionsError, NoSuggestionsAvailable } from './ParameterPicker';
+import { NoSuggestionsAvailable, SuggestionsError } from './ParameterPicker';
 import { NonInteractiveItem, ResultList } from './ResultList';
 
-import type * as uri from 'teleterm/ui/uri';
-
 export default {
   title: 'Teleterm/Search',
 };
diff --git a/web/packages/teleterm/src/ui/Search/pickers/useActionAttempts.ts b/web/packages/teleterm/src/ui/Search/pickers/useActionAttempts.ts
index c5218ea2b0977..49b024db6b4c8 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/useActionAttempts.ts
+++ b/web/packages/teleterm/src/ui/Search/pickers/useActionAttempts.ts
@@ -17,24 +17,25 @@
  */
 
 import {
+  useCallback,
   useEffect,
   useLayoutEffect,
   useMemo,
   useRef,
-  useCallback,
 } from 'react';
+
 import { makeEmptyAttempt, mapAttempt, useAsync } from 'shared/hooks/useAsync';
 import { debounce } from 'shared/utils/highbar';
 
+import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { mapToAction } from 'teleterm/ui/Search/actions';
+import { useSearchContext } from 'teleterm/ui/Search/SearchContext';
+import { SearchFilter } from 'teleterm/ui/Search/searchResult';
 import {
   rankResults,
   useFilterSearch,
   useResourceSearch,
 } from 'teleterm/ui/Search/useSearch';
-import { mapToAction } from 'teleterm/ui/Search/actions';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { useSearchContext } from 'teleterm/ui/Search/SearchContext';
-import { SearchFilter } from 'teleterm/ui/Search/searchResult';
 import { routing } from 'teleterm/ui/uri';
 import { isRetryable } from 'teleterm/ui/utils/retryWithRelogin';
 import { useVnetContext, useVnetLauncher } from 'teleterm/ui/Vnet';
diff --git a/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.test.tsx b/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.test.tsx
index 8208b96d84094..0d60c80125215 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.test.tsx
+++ b/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.test.tsx
@@ -18,8 +18,8 @@
 
 import { renderHook } from '@testing-library/react';
 
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
 
 import { useDisplayResults } from './useDisplayResults';
diff --git a/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.ts b/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.ts
index 8e98ad977f6ec..a419ced751386 100644
--- a/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.ts
+++ b/web/packages/teleterm/src/ui/Search/pickers/useDisplayResults.ts
@@ -18,13 +18,13 @@
 
 import { useMemo } from 'react';
 
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import {
+  DisplayResults,
   isClusterSearchFilter,
   isResourceTypeSearchFilter,
   SearchFilter,
-  DisplayResults,
 } from 'teleterm/ui/Search/searchResult';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useWorkspaceServiceState } from 'teleterm/ui/services/workspacesService';
 
 export function useDisplayResults(args: {
diff --git a/web/packages/teleterm/src/ui/Search/searchResult.ts b/web/packages/teleterm/src/ui/Search/searchResult.ts
index 16f47dfcb9778..fa1a89a5609e9 100644
--- a/web/packages/teleterm/src/ui/Search/searchResult.ts
+++ b/web/packages/teleterm/src/ui/Search/searchResult.ts
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import type { ClusterUri, DocumentUri } from 'teleterm/ui/uri';
 import type { Cluster } from 'teleterm/services/tshd/types';
-
 import type * as resourcesServiceTypes from 'teleterm/ui/services/resources';
 import type { DocumentClusterResourceKind } from 'teleterm/ui/services/workspacesService';
+import type { ClusterUri, DocumentUri } from 'teleterm/ui/uri';
 
 type ResourceSearchResultBase<
   Result extends resourcesServiceTypes.SearchResult,
diff --git a/web/packages/teleterm/src/ui/Search/useSearch.test.tsx b/web/packages/teleterm/src/ui/Search/useSearch.test.tsx
index 3cc784bb4f8b3..9c32610705483 100644
--- a/web/packages/teleterm/src/ui/Search/useSearch.test.tsx
+++ b/web/packages/teleterm/src/ui/Search/useSearch.test.tsx
@@ -20,19 +20,18 @@ import { renderHook } from '@testing-library/react';
 
 import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 
-import { ServerUri } from 'teleterm/ui/uri';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { SearchResult } from 'teleterm/ui/services/resources';
 import {
-  makeServer,
   makeKube,
   makeLabelsList,
-  makeRootCluster,
   makeLeafCluster,
+  makeRootCluster,
+  makeServer,
 } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { SearchResult } from 'teleterm/ui/services/resources';
+import { ServerUri } from 'teleterm/ui/uri';
 
 import { MockAppContextProvider } from '../fixtures/MockAppContextProvider';
-
 import { makeResourceResult } from './testHelpers';
 import { rankResults, useFilterSearch, useResourceSearch } from './useSearch';
 
diff --git a/web/packages/teleterm/src/ui/Search/useSearch.ts b/web/packages/teleterm/src/ui/Search/useSearch.ts
index e656ae8066617..a28288f72cac4 100644
--- a/web/packages/teleterm/src/ui/Search/useSearch.ts
+++ b/web/packages/teleterm/src/ui/Search/useSearch.ts
@@ -20,25 +20,24 @@ import { useCallback } from 'react';
 
 import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 
-import { assertUnreachable } from 'teleterm/ui/utils';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import type * as resourcesServiceTypes from 'teleterm/ui/services/resources';
+import { assertUnreachable } from 'teleterm/ui/utils';
 
 import {
-  isResourceTypeSearchFilter,
+  FilterSearchResult,
   isClusterSearchFilter,
-  SearchFilter,
+  isResourceTypeSearchFilter,
   LabelMatch,
   mainResourceField,
   mainResourceName,
   ResourceMatch,
-  searchableFields,
   ResourceSearchResult,
-  FilterSearchResult,
   ResourceTypeFilter,
+  searchableFields,
+  SearchFilter,
 } from './searchResult';
 
-import type * as resourcesServiceTypes from 'teleterm/ui/services/resources';
-
 export type CrossClusterResourceSearchResult = {
   results: resourcesServiceTypes.SearchResult[];
   errors: resourcesServiceTypes.ResourceSearchError[];
diff --git a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.test.tsx b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.test.tsx
index 6e88d8c1ebba0..2544856b5da64 100644
--- a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.test.tsx
+++ b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.test.tsx
@@ -17,16 +17,16 @@
  */
 
 import { screen } from '@testing-library/react';
-import { fireEvent, render } from 'design/utils/testing';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { IAppContext } from 'teleterm/ui/types';
+import { fireEvent, render } from 'design/utils/testing';
 
 import {
   makeLoggedInUser,
   makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { IAppContext } from 'teleterm/ui/types';
 
 import { ShareFeedback } from './ShareFeedback';
 
diff --git a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.tsx b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.tsx
index 5e508eba644bf..436a4d280c299 100644
--- a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.tsx
+++ b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedback.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ButtonIcon, Popover } from 'design';
-import { ChatBubble } from 'design/Icon';
 import { useRef } from 'react';
 import styled from 'styled-components';
 
+import { ButtonIcon, Popover } from 'design';
+import { ChatBubble } from 'design/Icon';
+
 import { ShareFeedbackForm } from './ShareFeedbackForm';
 import { useShareFeedback } from './useShareFeedback';
 
diff --git a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackForm.tsx b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackForm.tsx
index fd95d43cc4f8b..7c2505e5c6edb 100644
--- a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackForm.tsx
+++ b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackForm.tsx
@@ -17,15 +17,14 @@
  */
 
 import { ButtonIcon, ButtonPrimary, Flex, H2, Link } from 'design';
-import Validation from 'shared/components/Validation';
+import * as Alerts from 'design/Alert';
 import { Cross } from 'design/Icon';
-
+import Validation from 'shared/components/Validation';
 import { Attempt } from 'shared/hooks/useAsync';
-import * as Alerts from 'design/Alert';
 
 import { ShareFeedbackFormFields } from './ShareFeedbackFormFields';
-import { FEEDBACK_TOO_LONG_ERROR } from './useShareFeedback';
 import { ShareFeedbackFormValues } from './types';
+import { FEEDBACK_TOO_LONG_ERROR } from './useShareFeedback';
 
 interface ShareFeedbackProps {
   submitFeedbackAttempt: Attempt<string>;
diff --git a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackFormFields.tsx b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackFormFields.tsx
index 56c9e7c535063..47a9cdf997dcc 100644
--- a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackFormFields.tsx
+++ b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackFormFields.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Text, Toggle } from 'design';
 import FieldInput from 'shared/components/FieldInput';
-import { requiredField } from 'shared/components/Validation/rules';
 import { FieldTextArea } from 'shared/components/FieldTextArea';
-import { Text, Toggle } from 'design';
+import { requiredField } from 'shared/components/Validation/rules';
 
 import { ShareFeedbackFormValues } from './types';
 
diff --git a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/useShareFeedback.ts b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/useShareFeedback.ts
index a180c47b2fa41..8793b8c59febe 100644
--- a/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/useShareFeedback.ts
+++ b/web/packages/teleterm/src/ui/StatusBar/ShareFeedback/useShareFeedback.ts
@@ -21,7 +21,6 @@ import { useCallback, useState } from 'react';
 import { makeEmptyAttempt, useAsync } from 'shared/hooks/useAsync';
 
 import { staticConfig } from 'teleterm/staticConfig';
-
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
 
diff --git a/web/packages/teleterm/src/ui/StatusBar/StatusBar.tsx b/web/packages/teleterm/src/ui/StatusBar/StatusBar.tsx
index 7787285af1969..cf4b4fdf1a938 100644
--- a/web/packages/teleterm/src/ui/StatusBar/StatusBar.tsx
+++ b/web/packages/teleterm/src/ui/StatusBar/StatusBar.tsx
@@ -18,9 +18,9 @@
 
 import { Flex, Text } from 'design';
 
-import { useActiveDocumentClusterBreadcrumbs } from './useActiveDocumentClusterBreadcrumbs';
-import { ShareFeedback } from './ShareFeedback';
 import { AccessRequestCheckoutButton } from './AccessRequestCheckoutButton';
+import { ShareFeedback } from './ShareFeedback';
+import { useActiveDocumentClusterBreadcrumbs } from './useActiveDocumentClusterBreadcrumbs';
 
 export function StatusBar() {
   const clusterBreadcrumbs = useActiveDocumentClusterBreadcrumbs();
diff --git a/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/ClusterConnectPanel.tsx b/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/ClusterConnectPanel.tsx
index 2c86daeb67a30..773f5808cc6e6 100644
--- a/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/ClusterConnectPanel.tsx
+++ b/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/ClusterConnectPanel.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, ButtonPrimary, Flex, H1, ResourceIcon, Text } from 'design';
 import styled from 'styled-components';
 
+import { Box, ButtonPrimary, Flex, H1, ResourceIcon, Text } from 'design';
+
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 
 import { RecentClusters } from './RecentClusters';
diff --git a/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/RecentClusters.tsx b/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/RecentClusters.tsx
index 13d8c6df6ac96..c1b7264633c6d 100644
--- a/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/RecentClusters.tsx
+++ b/web/packages/teleterm/src/ui/TabHost/ClusterConnectPanel/RecentClusters.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Box, ButtonBorder, Card, Text, Flex } from 'design';
+import { Box, ButtonBorder, Card, Flex, Text } from 'design';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { getUserWithClusterName } from 'teleterm/ui/utils';
-import { RootClusterUri } from 'teleterm/ui/uri';
 import { ProfileStatusError } from 'teleterm/ui/components/ProfileStatusError';
+import { RootClusterUri } from 'teleterm/ui/uri';
+import { getUserWithClusterName } from 'teleterm/ui/utils';
 
 export function RecentClusters() {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/TabHost/TabHost.test.tsx b/web/packages/teleterm/src/ui/TabHost/TabHost.test.tsx
index 55b3cfc9abd35..a224cfb3221cc 100644
--- a/web/packages/teleterm/src/ui/TabHost/TabHost.test.tsx
+++ b/web/packages/teleterm/src/ui/TabHost/TabHost.test.tsx
@@ -17,21 +17,23 @@
  */
 
 import 'jest-canvas-mock';
+
 import { createRef } from 'react';
-import { fireEvent, render, screen, act } from 'design/utils/testing';
 
-import { TabHost } from 'teleterm/ui/TabHost/TabHost';
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { Document } from 'teleterm/ui/services/workspacesService';
+import { act, fireEvent, render, screen } from 'design/utils/testing';
+
 import { TabContextMenuOptions } from 'teleterm/mainProcess/types';
-import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
   makeRootCluster,
   rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
-import { routing } from 'teleterm/ui/uri';
 import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { Document } from 'teleterm/ui/services/workspacesService';
+import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
+import { TabHost } from 'teleterm/ui/TabHost/TabHost';
+import { routing } from 'teleterm/ui/uri';
 
 function getMockDocuments(): Document[] {
   return [
diff --git a/web/packages/teleterm/src/ui/TabHost/TabHost.tsx b/web/packages/teleterm/src/ui/TabHost/TabHost.tsx
index 504c53583e143..879e8f6d95706 100644
--- a/web/packages/teleterm/src/ui/TabHost/TabHost.tsx
+++ b/web/packages/teleterm/src/ui/TabHost/TabHost.tsx
@@ -18,23 +18,23 @@
 
 import React, { useCallback } from 'react';
 import styled from 'styled-components';
+
 import { Flex } from 'design';
 
+import { Shell } from 'teleterm/mainProcess/shell';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { DocumentsRenderer } from 'teleterm/ui/Documents/DocumentsRenderer';
+import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
 import { useWorkspaceServiceState } from 'teleterm/ui/services/workspacesService';
 import * as types from 'teleterm/ui/services/workspacesService/documentsService/types';
 import { canDocChangeShell } from 'teleterm/ui/services/workspacesService/documentsService/types';
 import { Tabs } from 'teleterm/ui/Tabs';
-import { DocumentsRenderer } from 'teleterm/ui/Documents/DocumentsRenderer';
 import { IAppContext } from 'teleterm/ui/types';
-import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
-import { Shell } from 'teleterm/mainProcess/shell';
 
 import { useStoreSelector } from '../hooks/useStoreSelector';
-
-import { useTabShortcuts } from './useTabShortcuts';
-import { useNewTabOpener } from './useNewTabOpener';
 import { ClusterConnectPanel } from './ClusterConnectPanel/ClusterConnectPanel';
+import { useNewTabOpener } from './useNewTabOpener';
+import { useTabShortcuts } from './useTabShortcuts';
 
 export function TabHostContainer(props: {
   topBarContainerRef: React.MutableRefObject<HTMLDivElement>;
diff --git a/web/packages/teleterm/src/ui/TabHost/useTabShortcuts.test.tsx b/web/packages/teleterm/src/ui/TabHost/useTabShortcuts.test.tsx
index f96372ca2df79..ce65290c2eb1f 100644
--- a/web/packages/teleterm/src/ui/TabHost/useTabShortcuts.test.tsx
+++ b/web/packages/teleterm/src/ui/TabHost/useTabShortcuts.test.tsx
@@ -17,17 +17,18 @@
  */
 
 import { PropsWithChildren } from 'react';
+
 import renderHook from 'design/utils/renderHook';
 
-import { useTabShortcuts } from 'teleterm/ui/TabHost/useTabShortcuts';
-import { Document } from 'teleterm/ui/services/workspacesService/documentsService';
+import AppContextProvider from 'teleterm/ui/appContextProvider';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
   KeyboardShortcutEvent,
   KeyboardShortcutEventSubscriber,
 } from 'teleterm/ui/services/keyboardShortcuts';
-import AppContextProvider from 'teleterm/ui/appContextProvider';
+import { Document } from 'teleterm/ui/services/workspacesService/documentsService';
 import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
+import { useTabShortcuts } from 'teleterm/ui/TabHost/useTabShortcuts';
 
 function getMockDocuments(): Document[] {
   return [
diff --git a/web/packages/teleterm/src/ui/Tabs/TabItem.tsx b/web/packages/teleterm/src/ui/Tabs/TabItem.tsx
index dc1c0ddc44c02..c69f5535c1658 100644
--- a/web/packages/teleterm/src/ui/Tabs/TabItem.tsx
+++ b/web/packages/teleterm/src/ui/Tabs/TabItem.tsx
@@ -18,8 +18,9 @@
 
 import { useRef } from 'react';
 import styled from 'styled-components';
-import * as Icons from 'design/Icon';
+
 import { ButtonIcon, Text } from 'design';
+import * as Icons from 'design/Icon';
 
 import { LinearProgress } from 'teleterm/ui/components/LinearProgress';
 
diff --git a/web/packages/teleterm/src/ui/Tabs/Tabs.tsx b/web/packages/teleterm/src/ui/Tabs/Tabs.tsx
index cea550fd612c5..509324cb7d192 100644
--- a/web/packages/teleterm/src/ui/Tabs/Tabs.tsx
+++ b/web/packages/teleterm/src/ui/Tabs/Tabs.tsx
@@ -17,14 +17,14 @@
  */
 
 import styled from 'styled-components';
-import { typography } from 'design/system';
-import { Box } from 'design';
 
+import { Box } from 'design';
+import { typography } from 'design/system';
 import { TypographyProps } from 'design/system/typography';
 
 import { Document } from 'teleterm/ui/services/workspacesService';
 
-import { TabItem, NewTabItem } from './TabItem';
+import { NewTabItem, TabItem } from './TabItem';
 
 export function Tabs(props: Props) {
   const {
diff --git a/web/packages/teleterm/src/ui/ThemeProvider/ThemeProvider.tsx b/web/packages/teleterm/src/ui/ThemeProvider/ThemeProvider.tsx
index 2771dcba14404..ab1177b016139 100644
--- a/web/packages/teleterm/src/ui/ThemeProvider/ThemeProvider.tsx
+++ b/web/packages/teleterm/src/ui/ThemeProvider/ThemeProvider.tsx
@@ -23,7 +23,6 @@ import {
 } from 'styled-components';
 
 import { Theme } from 'design/theme/themes/types';
-
 import { shouldForwardProp } from 'design/ThemeProvider';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
diff --git a/web/packages/teleterm/src/ui/ThemeProvider/globals.ts b/web/packages/teleterm/src/ui/ThemeProvider/globals.ts
index 9d2a9a2982795..772dbd9beb3d1 100644
--- a/web/packages/teleterm/src/ui/ThemeProvider/globals.ts
+++ b/web/packages/teleterm/src/ui/ThemeProvider/globals.ts
@@ -17,6 +17,7 @@
  */
 
 import { createGlobalStyle, css } from 'styled-components';
+
 import { getPlatformType } from 'design/platform';
 
 const GlobalStyle = createGlobalStyle`
diff --git a/web/packages/teleterm/src/ui/ThemeProvider/theme.ts b/web/packages/teleterm/src/ui/ThemeProvider/theme.ts
index 09d1c3a5806d3..5f03e7ef2dcdf 100644
--- a/web/packages/teleterm/src/ui/ThemeProvider/theme.ts
+++ b/web/packages/teleterm/src/ui/ThemeProvider/theme.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { fonts } from 'design/theme/fonts';
 import {
   darkTheme as designDarkTheme,
   lightTheme as designLightTheme,
 } from 'design/theme';
+import { fonts } from 'design/theme/fonts';
 
 const sansSerif = 'system-ui';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/AdditionalActions.tsx b/web/packages/teleterm/src/ui/TopBar/AdditionalActions.tsx
index 0d2514b9b2ba1..009fba4b94219 100644
--- a/web/packages/teleterm/src/ui/TopBar/AdditionalActions.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/AdditionalActions.tsx
@@ -16,21 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React, { useState, useRef } from 'react';
+import React, { useRef, useState } from 'react';
 import styled from 'styled-components';
 
-import { Flex, Text, Popover } from 'design';
+import { Flex, Popover, Text } from 'design';
 import * as icons from 'design/Icon';
 
-import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { TopBarButton } from 'teleterm/ui/TopBar/TopBarButton';
-import { IAppContext } from 'teleterm/ui/types';
-import { Cluster } from 'teleterm/services/tshd/types';
 import { KeyboardShortcutAction } from 'teleterm/services/config';
-import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
+import { Cluster } from 'teleterm/services/tshd/types';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { ListItem } from 'teleterm/ui/components/ListItem';
-import { useNewTabOpener } from 'teleterm/ui/TabHost';
+import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
 import { useWorkspaceServiceState } from 'teleterm/ui/services/workspacesService';
+import { useNewTabOpener } from 'teleterm/ui/TabHost';
+import { TopBarButton } from 'teleterm/ui/TopBar/TopBarButton';
+import { IAppContext } from 'teleterm/ui/types';
 
 type MenuItem = {
   title: string;
diff --git a/web/packages/teleterm/src/ui/TopBar/Clusters/ClusterSelector/ClusterSelector.tsx b/web/packages/teleterm/src/ui/TopBar/Clusters/ClusterSelector/ClusterSelector.tsx
index 962ac42a654a5..d9e533739a598 100644
--- a/web/packages/teleterm/src/ui/TopBar/Clusters/ClusterSelector/ClusterSelector.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Clusters/ClusterSelector/ClusterSelector.tsx
@@ -17,9 +17,10 @@
  */
 
 import { forwardRef } from 'react';
-import { ChevronUp, ChevronDown } from 'design/Icon';
 import styled from 'styled-components';
+
 import { Text } from 'design';
+import { ChevronDown, ChevronUp } from 'design/Icon';
 
 import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Clusters/Clusters.tsx b/web/packages/teleterm/src/ui/TopBar/Clusters/Clusters.tsx
index ec638d186a649..97161b1b70c89 100644
--- a/web/packages/teleterm/src/ui/TopBar/Clusters/Clusters.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Clusters/Clusters.tsx
@@ -17,17 +17,18 @@
  */
 
 import { useCallback, useMemo, useRef, useState } from 'react';
-import Popover from 'design/Popover';
 import styled from 'styled-components';
+
 import { Box } from 'design';
+import Popover from 'design/Popover';
 
-import { useKeyboardShortcuts } from 'teleterm/ui/services/keyboardShortcuts';
 import { KeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
+import { useKeyboardShortcuts } from 'teleterm/ui/services/keyboardShortcuts';
 import { ClusterUri } from 'teleterm/ui/uri';
 
-import { useClusters } from './useClusters';
 import { ClusterSelector } from './ClusterSelector/ClusterSelector';
 import { ClustersFilterableList } from './ClustersFilterableList/ClustersFilterableList';
+import { useClusters } from './useClusters';
 
 export function Clusters() {
   const iconRef = useRef();
diff --git a/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClusterItem.tsx b/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClusterItem.tsx
index aac8bb0d0e61c..e6deb71557da9 100644
--- a/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClusterItem.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClusterItem.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useEffect } from 'react';
-import { Flex, Label, Text } from 'design';
-
+import { useEffect, useRef } from 'react';
 import styled from 'styled-components';
 
-import { ListItem } from 'teleterm/ui/components/ListItem';
-import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
+import { Flex, Label, Text } from 'design';
+
 import { Cluster } from 'teleterm/services/tshd/types';
+import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
+import { ListItem } from 'teleterm/ui/components/ListItem';
 
 interface ClusterItemProps {
   index: number;
diff --git a/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClustersFilterableList.tsx b/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClustersFilterableList.tsx
index ce1437e91f79f..59f397fae16c4 100644
--- a/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClustersFilterableList.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Clusters/ClustersFilterableList/ClustersFilterableList.tsx
@@ -18,9 +18,9 @@
 
 import { Box, Text } from 'design';
 
+import { Cluster } from 'teleterm/services/tshd/types';
 import { FilterableList } from 'teleterm/ui/components/FilterableList';
 import { useKeyboardArrowsNavigationStateUpdate } from 'teleterm/ui/components/KeyboardArrowsNavigation';
-import { Cluster } from 'teleterm/services/tshd/types';
 
 import { ClusterItem } from './ClusterItem';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.story.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.story.tsx
index 47fe727ab873f..dbc7e0ab3e6dd 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.story.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.story.tsx
@@ -17,13 +17,14 @@
  */
 
 import { useLayoutEffect } from 'react';
+
 import { Flex, Text } from 'design';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import AppContextProvider from 'teleterm/ui/appContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { VnetContextProvider } from 'teleterm/ui/Vnet';
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 
 import { Connections } from './Connections';
 import { ConnectionsContextProvider } from './connectionsContext';
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.test.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.test.tsx
index c9f27f0f4669c..b09cca9588228 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.test.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.test.tsx
@@ -19,17 +19,16 @@
 import { act, render, screen, userEvent } from 'design/utils/testing';
 
 import Logger, { NullService } from 'teleterm/logger';
-import { VnetContextProvider } from 'teleterm/ui/Vnet';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import {
   DocumentTshNode,
   Workspace,
 } from 'teleterm/ui/services/workspacesService';
-
 import { routing } from 'teleterm/ui/uri';
 import { unique } from 'teleterm/ui/utils';
+import { VnetContextProvider } from 'teleterm/ui/Vnet';
 
 import { Connections } from './Connections';
 import { ConnectionsContextProvider } from './connectionsContext';
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.tsx
index 31384e58f7ecc..003026bedd190 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/Connections.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/Connections.tsx
@@ -17,16 +17,17 @@
  */
 
 import { useMemo, useRef } from 'react';
-import Popover from 'design/Popover';
+
 import { Box, StepSlider } from 'design';
+import Popover from 'design/Popover';
 
-import { useKeyboardShortcuts } from 'teleterm/ui/services/keyboardShortcuts';
-import { VnetSliderStep, useVnetContext } from 'teleterm/ui/Vnet';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useKeyboardShortcuts } from 'teleterm/ui/services/keyboardShortcuts';
+import { useVnetContext, VnetSliderStep } from 'teleterm/ui/Vnet';
 
+import { Step, useConnectionsContext } from './connectionsContext';
 import { ConnectionsIcon } from './ConnectionsIcon/ConnectionsIcon';
 import { ConnectionsSliderStep } from './ConnectionsSliderStep';
-import { Step, useConnectionsContext } from './connectionsContext';
 
 export function Connections() {
   const { connectionTracker } = useAppContext();
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionItem.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionItem.tsx
index 88b3efedd75e0..551180a129d8f 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionItem.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionItem.tsx
@@ -17,15 +17,14 @@
  */
 
 import { useEffect, useRef } from 'react';
-import { ButtonIcon, Flex, Text } from 'design';
-import { Trash, Unlink } from 'design/Icon';
-
 import styled from 'styled-components';
 
-import { ExtendedTrackedConnection } from 'teleterm/ui/services/connectionTracker';
-import { ListItem } from 'teleterm/ui/components/ListItem';
+import { ButtonIcon, Flex, Text } from 'design';
+import { Trash, Unlink } from 'design/Icon';
 
 import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
+import { ListItem } from 'teleterm/ui/components/ListItem';
+import { ExtendedTrackedConnection } from 'teleterm/ui/services/connectionTracker';
 import { isAppUri, isDatabaseUri } from 'teleterm/ui/uri';
 
 import { ConnectionStatusIndicator } from './ConnectionStatusIndicator';
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.story.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.story.tsx
index ac16885608d71..94e1d63482ba3 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.story.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.story.tsx
@@ -17,7 +17,8 @@
  */
 
 import styled from 'styled-components';
-import { Flex, Box, Text, H2 } from 'design';
+
+import { Box, Flex, H2, Text } from 'design';
 
 import { StaticListItem } from 'teleterm/ui/components/ListItem';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.tsx
index ed22c089ed274..37215041d7698 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator.tsx
@@ -17,7 +17,8 @@
  */
 
 import styled, { css } from 'styled-components';
-import { Box, blink } from 'design';
+
+import { blink, Box } from 'design';
 
 type Status = 'on' | 'off' | 'error' | 'warning' | 'processing';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionsFilterableList.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionsFilterableList.tsx
index c826182025eb4..8ced7e7b1267f 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionsFilterableList.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionsFilterableList.tsx
@@ -18,11 +18,11 @@
 
 import { Text } from 'design';
 
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { FilterableList } from 'teleterm/ui/components/FilterableList';
-import { ExtendedTrackedConnection } from 'teleterm/ui/services/connectionTracker';
 import { useKeyboardArrowsNavigationStateUpdate } from 'teleterm/ui/components/KeyboardArrowsNavigation';
-import { VnetConnectionItem, useVnetContext } from 'teleterm/ui/Vnet';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { ExtendedTrackedConnection } from 'teleterm/ui/services/connectionTracker';
+import { useVnetContext, VnetConnectionItem } from 'teleterm/ui/Vnet';
 
 import { ConnectionItem } from './ConnectionItem';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIcon.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIcon.tsx
index 074a004a5eaca..1a5f36033bfa1 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIcon.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIcon.tsx
@@ -17,9 +17,10 @@
  */
 
 import { forwardRef } from 'react';
-import { Cluster } from 'design/Icon';
 import styled from 'styled-components';
+
 import { ButtonSecondary } from 'design';
+import { Cluster } from 'design/Icon';
 
 import { useKeyboardShortcutFormatters } from 'teleterm/ui/services/keyboardShortcuts';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIconStatusIndicator.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIconStatusIndicator.tsx
index 2951230709391..007f8036eabc8 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIconStatusIndicator.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsIcon/ConnectionsIconStatusIndicator.tsx
@@ -18,6 +18,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
+
 import { Box } from 'design';
 
 export const ConnectionsIconStatusIndicator: React.FC<Props> = props => {
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsSliderStep.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsSliderStep.tsx
index 64e4d327fc181..ee36aa5ee7155 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsSliderStep.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/ConnectionsSliderStep.tsx
@@ -17,14 +17,15 @@
  */
 
 import { useState } from 'react';
+
 import { Box } from 'design';
 import { StepComponentProps } from 'design/StepSlider';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { KeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
 
-import { ConnectionsFilterableList } from './ConnectionsFilterableList/ConnectionsFilterableList';
 import { useConnectionsContext } from './connectionsContext';
+import { ConnectionsFilterableList } from './ConnectionsFilterableList/ConnectionsFilterableList';
 
 export const ConnectionsSliderStep = (props: StepComponentProps) => {
   const { connectionTracker } = useAppContext();
diff --git a/web/packages/teleterm/src/ui/TopBar/Connections/connectionsContext.tsx b/web/packages/teleterm/src/ui/TopBar/Connections/connectionsContext.tsx
index e3b46972e0440..7e311869145b3 100644
--- a/web/packages/teleterm/src/ui/TopBar/Connections/connectionsContext.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Connections/connectionsContext.tsx
@@ -17,9 +17,9 @@
  */
 
 import {
+  createContext,
   FC,
   PropsWithChildren,
-  createContext,
   useCallback,
   useContext,
   useState,
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.story.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.story.tsx
index e31c53415feac..9abacf8a59480 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.story.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.story.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useRef, useEffect } from 'react';
+import { useEffect, useRef } from 'react';
+
 import Flex from 'design/Flex';
 import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.test.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.test.tsx
index c6940c311a440..ba52b2a9a872c 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.test.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.test.tsx
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render } from 'design/utils/testing';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+
+import { render } from 'design/utils/testing';
 import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 
-import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import {
-  rootClusterUri,
-  makeRootCluster,
   makeLoggedInUser,
+  makeRootCluster,
+  rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 
 import { IdentityContainer } from './Identity';
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.tsx
index 9d124005ba6a9..f5c7cd25cbc1f 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/Identity.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/Identity.tsx
@@ -19,27 +19,27 @@
 import {
   forwardRef,
   useCallback,
+  useImperativeHandle,
   useMemo,
   useRef,
   useState,
-  useImperativeHandle,
 } from 'react';
 import styled from 'styled-components';
+
 import { Box } from 'design';
 import Popover from 'design/Popover';
 import { TrustedDeviceRequirement } from 'gen-proto-ts/teleport/legacy/types/trusted_device_requirement_pb';
 
+import * as tshd from 'teleterm/services/tshd/types';
 import {
-  useKeyboardShortcuts,
   useKeyboardShortcutFormatters,
+  useKeyboardShortcuts,
 } from 'teleterm/ui/services/keyboardShortcuts';
 
-import * as tshd from 'teleterm/services/tshd/types';
-
-import { IdentityRootCluster, useIdentity } from './useIdentity';
+import { EmptyIdentityList } from './EmptyIdentityList/EmptyIdentityList';
 import { IdentityList } from './IdentityList/IdentityList';
 import { IdentitySelector } from './IdentitySelector/IdentitySelector';
-import { EmptyIdentityList } from './EmptyIdentityList/EmptyIdentityList';
+import { IdentityRootCluster, useIdentity } from './useIdentity';
 
 export function IdentityContainer() {
   const {
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/AddNewClusterItem.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/AddNewClusterItem.tsx
index bb0ebd52d3ac7..71755da3d4a21 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/AddNewClusterItem.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/AddNewClusterItem.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Add } from 'design/Icon';
-
 import styled from 'styled-components';
 
+import { Add } from 'design/Icon';
+
 import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
 import { ListItem } from 'teleterm/ui/components/ListItem';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityList.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityList.tsx
index 1ba4cefd263f2..9f2d023272023 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityList.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityList.tsx
@@ -18,18 +18,18 @@
 
 import { JSX } from 'react';
 import styled from 'styled-components';
-import { Box, Flex, Text, Label, P3 } from 'design';
+
+import { Box, Flex, Label, P3, Text } from 'design';
 import { ShieldCheck, ShieldWarning } from 'design/Icon';
 import Link from 'design/Link';
 
-import { KeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
 import { LoggedInUser } from 'teleterm/services/tshd/types';
+import { KeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
 import { DeviceTrustStatus } from 'teleterm/ui/TopBar/Identity/Identity';
 
 import { IdentityRootCluster } from '../useIdentity';
-
-import { IdentityListItem } from './IdentityListItem';
 import { AddNewClusterItem } from './AddNewClusterItem';
+import { IdentityListItem } from './IdentityListItem';
 
 export function IdentityList(props: {
   loggedInUser: LoggedInUser;
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityListItem.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityListItem.tsx
index 6725d53ffec5b..d1d053612d1dd 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityListItem.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/IdentityList/IdentityListItem.tsx
@@ -17,13 +17,14 @@
  */
 
 import { useState } from 'react';
+
 import { ButtonIcon, Flex, Label, Text } from 'design';
 import { Logout } from 'design/Icon';
 
-import { ListItem } from 'teleterm/ui/components/ListItem';
 import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
-import { getUserWithClusterName } from 'teleterm/ui/utils';
+import { ListItem } from 'teleterm/ui/components/ListItem';
 import { ProfileStatusError } from 'teleterm/ui/components/ProfileStatusError';
+import { getUserWithClusterName } from 'teleterm/ui/utils';
 
 import { IdentityRootCluster } from '../useIdentity';
 
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/IdentitySelector.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/IdentitySelector.tsx
index 633ebdf293270..c99d3f20ff729 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/IdentitySelector.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/IdentitySelector.tsx
@@ -17,16 +17,16 @@
  */
 
 import { forwardRef } from 'react';
-import { Box } from 'design';
 
-import { getUserWithClusterName } from 'teleterm/ui/utils';
+import { Box } from 'design';
 
-import { TopBarButton } from 'teleterm/ui/TopBar/TopBarButton';
-import { DeviceTrustStatus } from 'teleterm/ui/TopBar/Identity/Identity';
 import { ConnectionStatusIndicator } from 'teleterm/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator';
+import { DeviceTrustStatus } from 'teleterm/ui/TopBar/Identity/Identity';
+import { TopBarButton } from 'teleterm/ui/TopBar/TopBarButton';
+import { getUserWithClusterName } from 'teleterm/ui/utils';
 
-import { UserIcon } from './UserIcon';
 import { PamIcon } from './PamIcon';
+import { UserIcon } from './UserIcon';
 
 interface IdentitySelectorProps {
   isOpened: boolean;
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/PamIcon.tsx b/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/PamIcon.tsx
index 8d7a385bd7be6..a7a4c9d4dc282 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/PamIcon.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/IdentitySelector/PamIcon.tsx
@@ -17,6 +17,7 @@
  */
 
 import styled from 'styled-components';
+
 import { Image } from 'design';
 
 import pam from './pam.svg';
diff --git a/web/packages/teleterm/src/ui/TopBar/Identity/useIdentity.ts b/web/packages/teleterm/src/ui/TopBar/Identity/useIdentity.ts
index 581061db169aa..a19e5201b3322 100644
--- a/web/packages/teleterm/src/ui/TopBar/Identity/useIdentity.ts
+++ b/web/packages/teleterm/src/ui/TopBar/Identity/useIdentity.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { Cluster, LoggedInUser } from 'teleterm/services/tshd/types';
-import { RootClusterUri } from 'teleterm/ui/uri';
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useWorkspaceServiceState } from 'teleterm/ui/services/workspacesService';
+import { RootClusterUri } from 'teleterm/ui/uri';
 
 export function useIdentity() {
   const ctx = useAppContext();
diff --git a/web/packages/teleterm/src/ui/TopBar/TopBar.tsx b/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
index 450287ecaee52..49298d20d3e89 100644
--- a/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
@@ -18,14 +18,14 @@
 
 import React from 'react';
 import styled from 'styled-components';
+
 import { Flex } from 'design';
 
 import { SearchBar } from '../Search';
-
-import { Connections } from './Connections';
+import { AdditionalActions } from './AdditionalActions';
 import { Clusters } from './Clusters';
+import { Connections } from './Connections';
 import { Identity } from './Identity';
-import { AdditionalActions } from './AdditionalActions';
 
 export function TopBar(props: {
   topBarContainerRef: React.MutableRefObject<HTMLDivElement>;
diff --git a/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.test.tsx b/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.test.tsx
index cc9336847e9ed..f39151682c80a 100644
--- a/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.test.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.test.tsx
@@ -18,12 +18,12 @@
 import { render, screen, userEvent } from 'design/utils/testing';
 import { wait } from 'shared/utils/wait';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 
-import { VnetContextProvider } from './vnetContext';
 import { VnetSliderStepHeader } from './VnetConnectionItem';
+import { VnetContextProvider } from './vnetContext';
 
 describe('VnetSliderStepHeader', () => {
   it('allows to tab through the header itself as well as the buttons', async () => {
diff --git a/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.tsx b/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.tsx
index 84eda8882e53a..ad19b95c014ee 100644
--- a/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/VnetConnectionItem.tsx
@@ -18,14 +18,15 @@
 
 import React, { forwardRef, useEffect, useRef } from 'react';
 import styled from 'styled-components';
-import { Text, ButtonIcon, Flex, rotate360 } from 'design';
+
+import { ButtonIcon, Flex, rotate360, Text } from 'design';
 import * as icons from 'design/Icon';
 import { copyToClipboard } from 'design/utils/copyToClipboard';
 
-import { ConnectionStatusIndicator } from 'teleterm/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator';
-import { ListItem, StaticListItem } from 'teleterm/ui/components/ListItem';
-import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
+import { useKeyboardArrowsNavigation } from 'teleterm/ui/components/KeyboardArrowsNavigation';
+import { ListItem, StaticListItem } from 'teleterm/ui/components/ListItem';
+import { ConnectionStatusIndicator } from 'teleterm/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator';
 
 import { useVnetContext } from './vnetContext';
 
diff --git a/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.story.tsx b/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.story.tsx
index 4a9eb7d9ab8aa..4093f921533bf 100644
--- a/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.story.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.story.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { useEffect } from 'react';
-import { Box } from 'design';
 
+import { Box } from 'design';
 import { usePromiseRejectedOnUnmount } from 'shared/utils/wait';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 
 import { useVnetContext, VnetContextProvider } from './vnetContext';
 import { VnetSliderStep } from './VnetSliderStep';
diff --git a/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.tsx b/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.tsx
index 234fe9c95344c..034e637127832 100644
--- a/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/VnetSliderStep.tsx
@@ -17,16 +17,17 @@
  */
 
 import { PropsWithChildren, useEffect, useRef } from 'react';
-import { StepComponentProps } from 'design/StepSlider';
+
 import { Box, ButtonSecondary, Flex, Text } from 'design';
-import { mergeRefs } from 'shared/libs/mergeRefs';
+import { StepComponentProps } from 'design/StepSlider';
 import { useRefAutoFocus } from 'shared/hooks';
 import { useDelayedRepeatedAttempt } from 'shared/hooks/useAsync';
+import { mergeRefs } from 'shared/libs/mergeRefs';
 
 import { ConnectionStatusIndicator } from 'teleterm/ui/TopBar/Connections/ConnectionsFilterableList/ConnectionStatusIndicator';
 
-import { useVnetContext } from './vnetContext';
 import { VnetSliderStepHeader } from './VnetConnectionItem';
+import { useVnetContext } from './vnetContext';
 
 /**
  * VnetSliderStep is the second step of StepSlider used in TopBar/Connections. It is shown after
diff --git a/web/packages/teleterm/src/ui/Vnet/vnetContext.test.tsx b/web/packages/teleterm/src/ui/Vnet/vnetContext.test.tsx
index 21360ee5e1872..6a60814b21db8 100644
--- a/web/packages/teleterm/src/ui/Vnet/vnetContext.test.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/vnetContext.test.tsx
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { act, renderHook, waitFor } from '@testing-library/react';
 import { PropsWithChildren } from 'react';
-import { renderHook, waitFor, act } from '@testing-library/react';
 
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
-import { IAppContext } from 'teleterm/ui/types';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { IAppContext } from 'teleterm/ui/types';
 
 import {
+  useVnetContext,
   VnetContextProvider,
   VnetStatus,
   VnetStoppedReason,
-  useVnetContext,
 } from './vnetContext';
 
 describe('autostart', () => {
diff --git a/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx b/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx
index 4caf7ece9b3e5..887f4a86b82ea 100644
--- a/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx
+++ b/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx
@@ -17,22 +17,23 @@
  */
 
 import {
+  createContext,
   FC,
   PropsWithChildren,
-  createContext,
-  useContext,
-  useState,
   useCallback,
-  useMemo,
+  useContext,
   useEffect,
+  useMemo,
+  useState,
 } from 'react';
-import { useAsync, Attempt } from 'shared/hooks/useAsync';
+
 import { BackgroundItemStatus } from 'gen-proto-ts/teleport/lib/teleterm/vnet/v1/vnet_service_pb';
+import { Attempt, useAsync } from 'shared/hooks/useAsync';
 
+import { isTshdRpcError } from 'teleterm/services/tshd';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { usePersistedState } from 'teleterm/ui/hooks/usePersistedState';
 import { useStoreSelector } from 'teleterm/ui/hooks/useStoreSelector';
-import { isTshdRpcError } from 'teleterm/services/tshd';
 import { IAppContext } from 'teleterm/ui/types';
 
 /**
diff --git a/web/packages/teleterm/src/ui/appContext.ts b/web/packages/teleterm/src/ui/appContext.ts
index 506e441986071..c58911076eace 100644
--- a/web/packages/teleterm/src/ui/appContext.ts
+++ b/web/packages/teleterm/src/ui/appContext.ts
@@ -18,32 +18,32 @@
 
 import { debounce } from 'shared/utils/highbar';
 
+import { parseDeepLink } from 'teleterm/deepLinks';
+import Logger from 'teleterm/logger';
+import { ConfigService } from 'teleterm/services/config';
+import { TshdClient, VnetClient } from 'teleterm/services/tshd/createClient';
 import {
-  MainProcessClient,
   ElectronGlobals,
+  MainProcessClient,
   TshdEventContextBridgeService,
 } from 'teleterm/types';
-import Logger from 'teleterm/logger';
 import { ClustersService } from 'teleterm/ui/services/clusters';
-import { ModalsService } from 'teleterm/ui/services/modals';
-import { TerminalsService } from 'teleterm/ui/services/terminals';
 import { ConnectionTrackerService } from 'teleterm/ui/services/connectionTracker';
-import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
+import { ConnectMyComputerService } from 'teleterm/ui/services/connectMyComputer';
+import { DeepLinksService } from 'teleterm/ui/services/deepLinks';
+import { FileTransferService } from 'teleterm/ui/services/fileTransferClient';
+import { HeadlessAuthenticationService } from 'teleterm/ui/services/headlessAuthn/headlessAuthnService';
 import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
-import { WorkspacesService } from 'teleterm/ui/services/workspacesService/workspacesService';
+import { ModalsService } from 'teleterm/ui/services/modals';
 import { NotificationsService } from 'teleterm/ui/services/notifications';
-import { FileTransferService } from 'teleterm/ui/services/fileTransferClient';
 import { ReloginService } from 'teleterm/ui/services/relogin/reloginService';
+import { ResourcesService } from 'teleterm/ui/services/resources';
+import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
+import { TerminalsService } from 'teleterm/ui/services/terminals';
 import { TshdNotificationsService } from 'teleterm/ui/services/tshdNotifications/tshdNotificationService';
-import { HeadlessAuthenticationService } from 'teleterm/ui/services/headlessAuthn/headlessAuthnService';
 import { UsageService } from 'teleterm/ui/services/usage';
-import { ResourcesService } from 'teleterm/ui/services/resources';
-import { ConnectMyComputerService } from 'teleterm/ui/services/connectMyComputer';
-import { ConfigService } from 'teleterm/services/config';
-import { TshdClient, VnetClient } from 'teleterm/services/tshd/createClient';
+import { WorkspacesService } from 'teleterm/ui/services/workspacesService/workspacesService';
 import { IAppContext, UnexpectedVnetShutdownListener } from 'teleterm/ui/types';
-import { DeepLinksService } from 'teleterm/ui/services/deepLinks';
-import { parseDeepLink } from 'teleterm/deepLinks';
 
 import { CommandLauncher } from './commandLauncher';
 import { createTshdEventsContextBridgeService } from './tshdEvents';
diff --git a/web/packages/teleterm/src/ui/boot.tsx b/web/packages/teleterm/src/ui/boot.tsx
index b74f2172c9819..868f31e8bfa09 100644
--- a/web/packages/teleterm/src/ui/boot.tsx
+++ b/web/packages/teleterm/src/ui/boot.tsx
@@ -17,14 +17,13 @@
  */
 
 import React from 'react';
-
 import { createRoot } from 'react-dom/client';
 
+import Logger from 'teleterm/logger';
 import { ElectronGlobals } from 'teleterm/types';
 import { App } from 'teleterm/ui/App';
-import { FailedApp } from 'teleterm/ui/components/App';
 import AppContext from 'teleterm/ui/appContext';
-import Logger from 'teleterm/logger';
+import { FailedApp } from 'teleterm/ui/components/App';
 
 async function boot(): Promise<void> {
   Logger.init(window['loggerService']);
diff --git a/web/packages/teleterm/src/ui/components/App.test.tsx b/web/packages/teleterm/src/ui/components/App.test.tsx
index 6ef9d04853b3e..4de458ff65435 100644
--- a/web/packages/teleterm/src/ui/components/App.test.tsx
+++ b/web/packages/teleterm/src/ui/components/App.test.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { screen, render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+
 import '@testing-library/jest-dom';
 
 import { FailedApp } from './App';
diff --git a/web/packages/teleterm/src/ui/components/App.tsx b/web/packages/teleterm/src/ui/components/App.tsx
index c7ea226126ac2..597202b43b978 100644
--- a/web/packages/teleterm/src/ui/components/App.tsx
+++ b/web/packages/teleterm/src/ui/components/App.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import styled from 'styled-components';
+
 import { Failed } from 'design/CardError';
 
 import { StaticThemeProvider } from 'teleterm/ui/ThemeProvider';
diff --git a/web/packages/teleterm/src/ui/components/CatchError/CatchError.jsx b/web/packages/teleterm/src/ui/components/CatchError/CatchError.jsx
index 8fe03c926fc21..f04c687c3953c 100644
--- a/web/packages/teleterm/src/ui/components/CatchError/CatchError.jsx
+++ b/web/packages/teleterm/src/ui/components/CatchError/CatchError.jsx
@@ -20,8 +20,8 @@ import { Component } from 'react';
 
 import { UnhandledCaseError } from 'shared/utils/assertUnreachable';
 
-import { FailedApp } from 'teleterm/ui/components/App';
 import Logger from 'teleterm/logger';
+import { FailedApp } from 'teleterm/ui/components/App';
 
 export class CatchError extends Component {
   logger = new Logger('CatchError');
diff --git a/web/packages/teleterm/src/ui/components/CatchError/CatchError.test.tsx b/web/packages/teleterm/src/ui/components/CatchError/CatchError.test.tsx
index 436e840f2eaf5..69806a4b9a5a3 100644
--- a/web/packages/teleterm/src/ui/components/CatchError/CatchError.test.tsx
+++ b/web/packages/teleterm/src/ui/components/CatchError/CatchError.test.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { screen, render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+
 import '@testing-library/jest-dom';
 
 import Logger, { NullService } from 'teleterm/logger';
diff --git a/web/packages/teleterm/src/ui/components/FieldInputs.tsx b/web/packages/teleterm/src/ui/components/FieldInputs.tsx
index e6a640e7fa9c9..21086d8f9bb23 100644
--- a/web/packages/teleterm/src/ui/components/FieldInputs.tsx
+++ b/web/packages/teleterm/src/ui/components/FieldInputs.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import FieldInput, { FieldInputProps } from 'shared/components/FieldInput';
 import { forwardRef } from 'react';
 
+import FieldInput, { FieldInputProps } from 'shared/components/FieldInput';
+
 export const ConfigFieldInput = forwardRef<HTMLInputElement, FieldInputProps>(
   (props, ref) => <FieldInput size="small" ref={ref} {...props} />
 );
diff --git a/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.test.tsx b/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.test.tsx
index 64343efb60242..a28cae9809331 100644
--- a/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.test.tsx
+++ b/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.test.tsx
@@ -17,6 +17,7 @@
  */
 
 import { screen, within } from '@testing-library/react';
+
 import { fireEvent, render } from 'design/utils/testing';
 
 import { FilterableList } from './FilterableList';
diff --git a/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.tsx b/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.tsx
index ded2158666a12..7981740a254a6 100644
--- a/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.tsx
+++ b/web/packages/teleterm/src/ui/components/FilterableList/FilterableList.tsx
@@ -17,9 +17,10 @@
  */
 
 import { Fragment, ReactNode, useMemo, useState } from 'react';
-import { Input } from 'design';
 import styled from 'styled-components';
 
+import { Input } from 'design';
+
 interface FilterableListProps<T> {
   items: T[];
   filterBy: keyof T;
diff --git a/web/packages/teleterm/src/ui/components/KeyboardArrowsNavigation/KeyboardArrowsNavigation.test.tsx b/web/packages/teleterm/src/ui/components/KeyboardArrowsNavigation/KeyboardArrowsNavigation.test.tsx
index ea70634fa74fd..a03aa446e5234 100644
--- a/web/packages/teleterm/src/ui/components/KeyboardArrowsNavigation/KeyboardArrowsNavigation.test.tsx
+++ b/web/packages/teleterm/src/ui/components/KeyboardArrowsNavigation/KeyboardArrowsNavigation.test.tsx
@@ -23,6 +23,7 @@ import {
   useCallback,
   useImperativeHandle,
 } from 'react';
+
 import { act, fireEvent, render, screen } from 'design/utils/testing';
 
 import { KeyboardArrowsNavigation } from './KeyboardArrowsNavigation';
diff --git a/web/packages/teleterm/src/ui/components/Notifcations/Notifications.story.tsx b/web/packages/teleterm/src/ui/components/Notifcations/Notifications.story.tsx
index e76a93b6765a7..1f5ae12f23b4d 100644
--- a/web/packages/teleterm/src/ui/components/Notifcations/Notifications.story.tsx
+++ b/web/packages/teleterm/src/ui/components/Notifcations/Notifications.story.tsx
@@ -17,16 +17,16 @@
  */
 
 import { useState } from 'react';
-import { ButtonPrimary, Flex } from 'design';
-
-import { unique } from 'teleterm/ui/utils/uid';
-
-import { Notifications } from '.';
 
 import type {
   NotificationItem,
   NotificationSeverity,
 } from '@gravitational/shared/components/Notification';
+import { ButtonPrimary, Flex } from 'design';
+
+import { unique } from 'teleterm/ui/utils/uid';
+
+import { Notifications } from '.';
 
 export default {
   title: 'Teleterm/components/Notifications',
diff --git a/web/packages/teleterm/src/ui/components/Notifcations/Notifications.tsx b/web/packages/teleterm/src/ui/components/Notifcations/Notifications.tsx
index 84bbecdfd752a..7308877085b48 100644
--- a/web/packages/teleterm/src/ui/components/Notifcations/Notifications.tsx
+++ b/web/packages/teleterm/src/ui/components/Notifcations/Notifications.tsx
@@ -17,9 +17,11 @@
  */
 
 import styled from 'styled-components';
-import { Notification } from 'shared/components/Notification';
 
-import type { NotificationItem } from 'shared/components/Notification';
+import {
+  Notification,
+  type NotificationItem,
+} from 'shared/components/Notification';
 
 interface NotificationsProps {
   items: NotificationItem[];
diff --git a/web/packages/teleterm/src/ui/components/OfflineGateway.tsx b/web/packages/teleterm/src/ui/components/OfflineGateway.tsx
index cd9c647043e1c..500a85951ba9a 100644
--- a/web/packages/teleterm/src/ui/components/OfflineGateway.tsx
+++ b/web/packages/teleterm/src/ui/components/OfflineGateway.tsx
@@ -17,8 +17,8 @@
  */
 
 import { useState } from 'react';
-import { ButtonPrimary, Flex, H2, Text } from 'design';
 
+import { ButtonPrimary, Flex, H2, Text } from 'design';
 import * as Alerts from 'design/Alert';
 import Validation from 'shared/components/Validation';
 import { Attempt } from 'shared/hooks/useAsync';
diff --git a/web/packages/teleterm/src/ui/components/ProfileStatusError.tsx b/web/packages/teleterm/src/ui/components/ProfileStatusError.tsx
index f08ccc3f72722..dfc6be8684823 100644
--- a/web/packages/teleterm/src/ui/components/ProfileStatusError.tsx
+++ b/web/packages/teleterm/src/ui/components/ProfileStatusError.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Flex, P3 } from 'design';
 import { Warning } from 'design/Icon';
-import { P3, Flex } from 'design';
 
 export function ProfileStatusError(props: {
   error: string;
diff --git a/web/packages/teleterm/src/ui/fixtures/MockAppContextProvider.tsx b/web/packages/teleterm/src/ui/fixtures/MockAppContextProvider.tsx
index c7e978ec4fa62..9bd3e3514624e 100644
--- a/web/packages/teleterm/src/ui/fixtures/MockAppContextProvider.tsx
+++ b/web/packages/teleterm/src/ui/fixtures/MockAppContextProvider.tsx
@@ -17,10 +17,8 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-
-import { HTML5Backend } from 'react-dnd-html5-backend';
-
 import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 
 import AppContextProvider from 'teleterm/ui/appContextProvider';
 import { IAppContext } from 'teleterm/ui/types';
diff --git a/web/packages/teleterm/src/ui/fixtures/MockWorkspaceContextProvider.tsx b/web/packages/teleterm/src/ui/fixtures/MockWorkspaceContextProvider.tsx
index e82107d98e71b..4480119d092c2 100644
--- a/web/packages/teleterm/src/ui/fixtures/MockWorkspaceContextProvider.tsx
+++ b/web/packages/teleterm/src/ui/fixtures/MockWorkspaceContextProvider.tsx
@@ -18,9 +18,9 @@
 
 import React, { PropsWithChildren } from 'react';
 
+import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { WorkspaceContextProvider } from 'teleterm/ui/Documents';
 import { RootClusterUri } from 'teleterm/ui/uri';
-import { useAppContext } from 'teleterm/ui/appContextProvider';
 
 export const MockWorkspaceContextProvider: React.FC<
   PropsWithChildren<{
diff --git a/web/packages/teleterm/src/ui/fixtures/mocks.ts b/web/packages/teleterm/src/ui/fixtures/mocks.ts
index fea17b77e8b26..e2c6d9d0a6985 100644
--- a/web/packages/teleterm/src/ui/fixtures/mocks.ts
+++ b/web/packages/teleterm/src/ui/fixtures/mocks.ts
@@ -17,13 +17,13 @@
  */
 
 import { MockMainProcessClient } from 'teleterm/mainProcess/fixtures/mocks';
+import { MockPtyServiceClient } from 'teleterm/services/pty/fixtures/mocks';
 import {
   MockTshClient,
   MockVnetClient,
 } from 'teleterm/services/tshd/fixtures/mocks';
-import { MockPtyServiceClient } from 'teleterm/services/pty/fixtures/mocks';
-import AppContext from 'teleterm/ui/appContext';
 import { RuntimeSettings } from 'teleterm/types';
+import AppContext from 'teleterm/ui/appContext';
 
 export class MockAppContext extends AppContext {
   constructor(runtimeSettings?: Partial<RuntimeSettings>) {
diff --git a/web/packages/teleterm/src/ui/hooks/useLoggedInUser.ts b/web/packages/teleterm/src/ui/hooks/useLoggedInUser.ts
index 42ee066e6b702..4ceb22ca91975 100644
--- a/web/packages/teleterm/src/ui/hooks/useLoggedInUser.ts
+++ b/web/packages/teleterm/src/ui/hooks/useLoggedInUser.ts
@@ -18,9 +18,9 @@
 
 import { useCallback } from 'react';
 
+import { LoggedInUser } from 'teleterm/services/tshd/types';
 import { useAppContext } from 'teleterm/ui/appContextProvider';
 import { useWorkspaceContext } from 'teleterm/ui/Documents';
-import { LoggedInUser } from 'teleterm/services/tshd/types';
 
 import { useStoreSelector } from './useStoreSelector';
 
diff --git a/web/packages/teleterm/src/ui/hooks/usePersistedState.test.tsx b/web/packages/teleterm/src/ui/hooks/usePersistedState.test.tsx
index 4aab64ddca95a..c901136828a26 100644
--- a/web/packages/teleterm/src/ui/hooks/usePersistedState.test.tsx
+++ b/web/packages/teleterm/src/ui/hooks/usePersistedState.test.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { render, screen, act } from 'design/utils/testing';
+import { act, render, screen } from 'design/utils/testing';
 
 import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
 import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
diff --git a/web/packages/teleterm/src/ui/hooks/useStoreSelector.ts b/web/packages/teleterm/src/ui/hooks/useStoreSelector.ts
index 16c1f133c5520..7ebd4a76cffff 100644
--- a/web/packages/teleterm/src/ui/hooks/useStoreSelector.ts
+++ b/web/packages/teleterm/src/ui/hooks/useStoreSelector.ts
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useSyncExternalStore, useCallback } from 'react';
+import { useCallback, useSyncExternalStore } from 'react';
 
 import { useAppContext } from 'teleterm/ui/appContextProvider';
-import { IAppContext } from 'teleterm/ui/types';
 import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
+import { IAppContext } from 'teleterm/ui/types';
 
 /**
  * useStoreSelector selects a value out of a store and triggers a component update whenever that
diff --git a/web/packages/teleterm/src/ui/services/clusters/clustersService.test.ts b/web/packages/teleterm/src/ui/services/clusters/clustersService.test.ts
index 6658012512c3e..2088207b78781 100644
--- a/web/packages/teleterm/src/ui/services/clusters/clustersService.test.ts
+++ b/web/packages/teleterm/src/ui/services/clusters/clustersService.test.ts
@@ -16,22 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NotificationsService } from 'teleterm/ui/services/notifications';
-import { UsageService } from 'teleterm/ui/services/usage';
 import { MainProcessClient } from 'teleterm/mainProcess/types';
+import type { TshdClient } from 'teleterm/services/tshd';
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import {
   makeDatabaseGateway,
   makeKubeGateway,
-  makeRootCluster,
   makeLeafCluster,
+  makeRootCluster,
 } from 'teleterm/services/tshd/testHelpers';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
+import { UsageService } from 'teleterm/ui/services/usage';
+import type * as uri from 'teleterm/ui/uri';
 
 import { ClustersService } from './clustersService';
 
-import type * as uri from 'teleterm/ui/uri';
-import type { TshdClient } from 'teleterm/services/tshd';
-
 jest.mock('teleterm/ui/services/notifications');
 jest.mock('teleterm/ui/services/usage');
 
diff --git a/web/packages/teleterm/src/ui/services/clusters/clustersService.ts b/web/packages/teleterm/src/ui/services/clusters/clustersService.ts
index 72589e135ac8e..e1cdc73b3ab8b 100644
--- a/web/packages/teleterm/src/ui/services/clusters/clustersService.ts
+++ b/web/packages/teleterm/src/ui/services/clusters/clustersService.ts
@@ -16,33 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useStore } from 'shared/libs/stores';
-import { pipe } from 'shared/utils/pipe';
-
 import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
-import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
 import {
   Cluster,
   ShowResources,
 } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
+import { Gateway } from 'gen-proto-ts/teleport/lib/teleterm/v1/gateway_pb';
 import {
   CreateAccessRequestRequest,
-  ReviewAccessRequestRequest,
-  PromoteAccessRequestRequest,
-  PasswordlessPrompt,
   CreateGatewayRequest,
+  PasswordlessPrompt,
+  PromoteAccessRequestRequest,
+  ReviewAccessRequestRequest,
 } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
+import { useStore } from 'shared/libs/stores';
+import { pipe } from 'shared/utils/pipe';
 
-import * as uri from 'teleterm/ui/uri';
-import { NotificationsService } from 'teleterm/ui/services/notifications';
 import { MainProcessClient } from 'teleterm/mainProcess/types';
-import { UsageService } from 'teleterm/ui/services/usage';
+import type { CloneableAbortSignal, TshdClient } from 'teleterm/services/tshd';
 import { AssumedRequest } from 'teleterm/services/tshd/types';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
+import { UsageService } from 'teleterm/ui/services/usage';
+import * as uri from 'teleterm/ui/uri';
 
 import { ImmutableStore } from '../immutableStore';
-
 import type * as types from './types';
-import type { TshdClient, CloneableAbortSignal } from 'teleterm/services/tshd';
 
 const { routing } = uri;
 
diff --git a/web/packages/teleterm/src/ui/services/connectMyComputer/connectMyComputerService.ts b/web/packages/teleterm/src/ui/services/connectMyComputer/connectMyComputerService.ts
index f938bc8642b39..f77ec2c1d91df 100644
--- a/web/packages/teleterm/src/ui/services/connectMyComputer/connectMyComputerService.ts
+++ b/web/packages/teleterm/src/ui/services/connectMyComputer/connectMyComputerService.ts
@@ -17,13 +17,12 @@
  */
 
 import { MainProcessClient } from 'teleterm/mainProcess/types';
+import { CloneableAbortSignal, TshdClient } from 'teleterm/services/tshd';
 import {
   Cluster,
   CreateConnectMyComputerRoleResponse,
   Server,
 } from 'teleterm/services/tshd/types';
-import { TshdClient, CloneableAbortSignal } from 'teleterm/services/tshd';
-
 import type * as uri from 'teleterm/ui/uri';
 
 export class ConnectMyComputerService {
diff --git a/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.test.ts b/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.test.ts
index b31e607a98293..1b465499c8902 100644
--- a/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.test.ts
+++ b/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.test.ts
@@ -18,6 +18,8 @@
 
 import Logger, { NullService } from 'teleterm/logger';
 
+import { ClustersService } from '../clusters';
+import { StatePersistenceService } from '../statePersistence';
 import {
   Document,
   DocumentGateway,
@@ -26,11 +28,7 @@ import {
   DocumentTshNodeWithServerId,
   WorkspacesService,
 } from '../workspacesService';
-import { ClustersService } from '../clusters';
-import { StatePersistenceService } from '../statePersistence';
-
 import { getEmptyPendingAccessRequest } from '../workspacesService/accessRequestsService';
-
 import { ConnectionTrackerService } from './connectionTrackerService';
 import { TrackedConnection, TrackedGatewayConnection } from './types';
 
diff --git a/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.ts b/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.ts
index fcf918dd22012..8e382f8a6299a 100644
--- a/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.ts
+++ b/web/packages/teleterm/src/ui/services/connectionTracker/connectionTrackerService.ts
@@ -19,29 +19,28 @@
 import { useStore } from 'shared/libs/stores';
 
 import { ClustersService } from 'teleterm/ui/services/clusters';
+import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
 import {
   Document,
   DocumentOrigin,
   isDocumentTshNodeWithLoginHost,
   WorkspacesService,
 } from 'teleterm/ui/services/workspacesService';
-import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
 import * as uri from 'teleterm/ui/uri';
 import { RootClusterUri, routing } from 'teleterm/ui/uri';
 import { assertUnreachable } from 'teleterm/ui/utils';
 
 import { ImmutableStore } from '../immutableStore';
-
 import { TrackedConnectionOperationsFactory } from './trackedConnectionOperationsFactory';
 import {
   createGatewayConnection,
-  createKubeConnection,
   createGatewayKubeConnection,
+  createKubeConnection,
   createServerConnection,
   getGatewayConnectionByDocument,
+  getGatewayKubeConnectionByDocument,
   getKubeConnectionByDocument,
   getServerConnectionByDocument,
-  getGatewayKubeConnectionByDocument,
 } from './trackedConnectionUtils';
 import {
   ExtendedTrackedConnection,
diff --git a/web/packages/teleterm/src/ui/services/connectionTracker/trackedConnectionOperationsFactory.ts b/web/packages/teleterm/src/ui/services/connectionTracker/trackedConnectionOperationsFactory.ts
index eb0ac1c58c50f..39c13173aaa59 100644
--- a/web/packages/teleterm/src/ui/services/connectionTracker/trackedConnectionOperationsFactory.ts
+++ b/web/packages/teleterm/src/ui/services/connectionTracker/trackedConnectionOperationsFactory.ts
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LeafClusterUri, RootClusterUri, routing } from 'teleterm/ui/uri';
 import { ClustersService } from 'teleterm/ui/services/clusters';
 import {
   DocumentOrigin,
   WorkspacesService,
 } from 'teleterm/ui/services/workspacesService';
+import { LeafClusterUri, RootClusterUri, routing } from 'teleterm/ui/uri';
 
 import {
   getGatewayDocumentByConnection,
+  getGatewayKubeDocumentByConnection,
   getKubeDocumentByConnection,
   getServerDocumentByConnection,
-  getGatewayKubeDocumentByConnection,
 } from './trackedConnectionUtils';
 import {
   TrackedConnection,
diff --git a/web/packages/teleterm/src/ui/services/connectionTracker/types.ts b/web/packages/teleterm/src/ui/services/connectionTracker/types.ts
index 0991ebff5de40..8534f67ca72e2 100644
--- a/web/packages/teleterm/src/ui/services/connectionTracker/types.ts
+++ b/web/packages/teleterm/src/ui/services/connectionTracker/types.ts
@@ -17,11 +17,11 @@
  */
 
 import {
+  AppUri,
   DatabaseUri,
   GatewayUri,
   KubeUri,
   ServerUri,
-  AppUri,
 } from 'teleterm/ui/uri';
 
 type TrackedConnectionBase = {
diff --git a/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.test.ts b/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.test.ts
index b2d7092e825ca..695e86c86cac0 100644
--- a/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.test.ts
+++ b/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.test.ts
@@ -17,9 +17,9 @@
  */
 
 import { DeepLinkParseResult } from 'teleterm/deepLinks';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { RuntimeSettings } from 'teleterm/types';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 
 import { DeepLinksService } from './deepLinksService';
 
diff --git a/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.ts b/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.ts
index ea98c9a51ef40..fa412f280fde5 100644
--- a/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.ts
+++ b/web/packages/teleterm/src/ui/services/deepLinks/deepLinksService.ts
@@ -19,13 +19,13 @@
 import { AuthenticateWebDeviceDeepURL, DeepURL } from 'shared/deepLinks';
 
 import { DeepLinkParseResult } from 'teleterm/deepLinks';
-import { RootClusterUri, routing } from 'teleterm/ui/uri';
-import { assertUnreachable } from 'teleterm/ui/utils';
 import { RuntimeSettings } from 'teleterm/types';
 import { ClustersService } from 'teleterm/ui/services/clusters';
-import { WorkspacesService } from 'teleterm/ui/services/workspacesService';
 import { ModalsService } from 'teleterm/ui/services/modals';
 import { NotificationsService } from 'teleterm/ui/services/notifications';
+import { WorkspacesService } from 'teleterm/ui/services/workspacesService';
+import { RootClusterUri, routing } from 'teleterm/ui/uri';
+import { assertUnreachable } from 'teleterm/ui/utils';
 
 export class DeepLinksService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/fileTransferClient/fileTransferService.ts b/web/packages/teleterm/src/ui/services/fileTransferClient/fileTransferService.ts
index 68e0049ddc94f..bed2ee66c0f87 100644
--- a/web/packages/teleterm/src/ui/services/fileTransferClient/fileTransferService.ts
+++ b/web/packages/teleterm/src/ui/services/fileTransferClient/fileTransferService.ts
@@ -16,14 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { FileTransferListeners } from 'shared/components/FileTransfer';
-
 import { FileTransferDirection } from 'gen-proto-ts/teleport/lib/teleterm/v1/service_pb';
+import { FileTransferListeners } from 'shared/components/FileTransfer';
 
-import { FileTransferRequest } from 'teleterm/services/tshd/types';
 import { TshdClient } from 'teleterm/services/tshd';
-import { UsageService } from 'teleterm/ui/services/usage';
 import { cloneAbortSignal } from 'teleterm/services/tshd/cloneableClient';
+import { FileTransferRequest } from 'teleterm/services/tshd/types';
+import { UsageService } from 'teleterm/ui/services/usage';
 
 export class FileTransferService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/headlessAuthn/headlessAuthnService.ts b/web/packages/teleterm/src/ui/services/headlessAuthn/headlessAuthnService.ts
index fa5dc997e08e7..fbc56d0d3e245 100644
--- a/web/packages/teleterm/src/ui/services/headlessAuthn/headlessAuthnService.ts
+++ b/web/packages/teleterm/src/ui/services/headlessAuthn/headlessAuthnService.ts
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ConfigService } from 'teleterm/services/config';
+import type { CloneableAbortSignal, TshdClient } from 'teleterm/services/tshd';
+import type * as types from 'teleterm/services/tshd/types';
 import { SendPendingHeadlessAuthenticationRequest } from 'teleterm/services/tshdEvents';
 import { MainProcessClient } from 'teleterm/types';
 import { ModalsService } from 'teleterm/ui/services/modals';
-import { ConfigService } from 'teleterm/services/config';
-
-import type { TshdClient, CloneableAbortSignal } from 'teleterm/services/tshd';
-import type * as types from 'teleterm/services/tshd/types';
 
 export class HeadlessAuthenticationService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/immutableStore/immutableStore.ts b/web/packages/teleterm/src/ui/services/immutableStore/immutableStore.ts
index 972cbbae6523c..65979a1c04712 100644
--- a/web/packages/teleterm/src/ui/services/immutableStore/immutableStore.ts
+++ b/web/packages/teleterm/src/ui/services/immutableStore/immutableStore.ts
@@ -19,8 +19,9 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment*/
 
 import { enableMapSet, produce } from 'immer';
-import Store from 'shared/libs/stores/store';
+
 import stateLogger from 'shared/libs/stores/logger';
+import Store from 'shared/libs/stores/store';
 
 import Logger from 'teleterm/logger';
 
diff --git a/web/packages/teleterm/src/ui/services/keyboardShortcuts/keyboardShortcutsService.ts b/web/packages/teleterm/src/ui/services/keyboardShortcuts/keyboardShortcutsService.ts
index 78c3220fd4269..53ff5f3fe7e33 100644
--- a/web/packages/teleterm/src/ui/services/keyboardShortcuts/keyboardShortcutsService.ts
+++ b/web/packages/teleterm/src/ui/services/keyboardShortcuts/keyboardShortcutsService.ts
@@ -18,8 +18,8 @@
 
 import { Platform } from 'teleterm/mainProcess/types';
 import {
-  KeyboardShortcutAction,
   ConfigService,
+  KeyboardShortcutAction,
 } from 'teleterm/services/config';
 
 import { getKeyName } from './getKeyName';
diff --git a/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcutFormatters.ts b/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcutFormatters.ts
index 292745d38bb2e..a608d48e3d769 100644
--- a/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcutFormatters.ts
+++ b/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcutFormatters.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { Platform } from '../../../mainProcess/types';
 import { KeyboardShortcutAction } from '../../../services/config';
 import { useAppContext } from '../../appContextProvider';
-import { Platform } from '../../../mainProcess/types';
 
 interface KeyboardShortcutFormatters {
   getLabelWithAccelerator(
diff --git a/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcuts.test.tsx b/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcuts.test.tsx
index 150fd3a50ca7b..ccaa77e7041f0 100644
--- a/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcuts.test.tsx
+++ b/web/packages/teleterm/src/ui/services/keyboardShortcuts/useKeyboardShortcuts.test.tsx
@@ -18,14 +18,12 @@
 
 import renderHook from 'design/utils/renderHook';
 
-import AppContextProvider from 'teleterm/ui/appContextProvider';
-
 import AppContext from 'teleterm/ui/appContext';
-
-import { useKeyboardShortcuts } from './useKeyboardShortcuts';
+import AppContextProvider from 'teleterm/ui/appContextProvider';
 
 import { KeyboardShortcutsService } from './keyboardShortcutsService';
 import { KeyboardShortcutEventSubscriber } from './types';
+import { useKeyboardShortcuts } from './useKeyboardShortcuts';
 
 test('call handler on its event type', () => {
   const { handler, getEventEmitter, wrapper } = getTestSetup();
diff --git a/web/packages/teleterm/src/ui/services/modals/modalsService.ts b/web/packages/teleterm/src/ui/services/modals/modalsService.ts
index 19f52af9e1eb3..64e7bb476be67 100644
--- a/web/packages/teleterm/src/ui/services/modals/modalsService.ts
+++ b/web/packages/teleterm/src/ui/services/modals/modalsService.ts
@@ -16,17 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useStore } from 'shared/libs/stores';
 import * as tshdEventsApi from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
+import { useStore } from 'shared/libs/stores';
 
 import * as types from 'teleterm/services/tshd/types';
-import { RootClusterUri } from 'teleterm/ui/uri';
 import { ResourceSearchError } from 'teleterm/ui/services/resources';
+import { RootClusterUri } from 'teleterm/ui/uri';
+import type * as uri from 'teleterm/ui/uri';
 
 import { ImmutableStore } from '../immutableStore';
 
-import type * as uri from 'teleterm/ui/uri';
-
 type State = {
   // One regular dialog and multiple important dialogs can be rendered at the same time.
   // The rule is that the regular dialogs are opened from user actions in the Electron app, while
diff --git a/web/packages/teleterm/src/ui/services/notifications/notificationsService.ts b/web/packages/teleterm/src/ui/services/notifications/notificationsService.ts
index 2508dbfc5770f..4a3c4dbe8386c 100644
--- a/web/packages/teleterm/src/ui/services/notifications/notificationsService.ts
+++ b/web/packages/teleterm/src/ui/services/notifications/notificationsService.ts
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { useStore } from 'shared/libs/stores';
-
-import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
-import { unique } from 'teleterm/ui/utils/uid';
-
 import type {
   NotificationItem,
   NotificationItemContent,
 } from 'shared/components/Notification';
+import { useStore } from 'shared/libs/stores';
+
+import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
+import { unique } from 'teleterm/ui/utils/uid';
 
 export class NotificationsService extends ImmutableStore<NotificationItem[]> {
   state: NotificationItem[] = [];
diff --git a/web/packages/teleterm/src/ui/services/relogin/reloginService.ts b/web/packages/teleterm/src/ui/services/relogin/reloginService.ts
index 7f9a4f5edc33c..36bbbffdb01ad 100644
--- a/web/packages/teleterm/src/ui/services/relogin/reloginService.ts
+++ b/web/packages/teleterm/src/ui/services/relogin/reloginService.ts
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { MainProcessClient } from 'teleterm/types';
-import { ReloginRequest } from 'teleterm/services/tshdEvents';
-import {
-  ModalsService,
-  ClusterConnectReason,
-} from 'teleterm/ui/services/modals';
-import { ClustersService } from 'teleterm/ui/services/clusters';
 import {
   reloginReasonOneOfIsGatewayCertExpired,
   reloginReasonOneOfIsVnetCertExpired,
 } from 'teleterm/helpers';
+import { ReloginRequest } from 'teleterm/services/tshdEvents';
+import { MainProcessClient } from 'teleterm/types';
+import { ClustersService } from 'teleterm/ui/services/clusters';
+import {
+  ClusterConnectReason,
+  ModalsService,
+} from 'teleterm/ui/services/modals';
 
 export class ReloginService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/resources/resourcesService.test.ts b/web/packages/teleterm/src/ui/services/resources/resourcesService.test.ts
index a4d3a45ebafd8..750ce60d02be7 100644
--- a/web/packages/teleterm/src/ui/services/resources/resourcesService.test.ts
+++ b/web/packages/teleterm/src/ui/services/resources/resourcesService.test.ts
@@ -16,13 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import type { TshdClient } from 'teleterm/services/tshd';
+import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
 import {
+  makeApp,
   makeDatabase,
   makeKube,
   makeServer,
-  makeApp,
 } from 'teleterm/services/tshd/testHelpers';
-import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient';
+import type * as tsh from 'teleterm/services/tshd/types';
 
 import {
   AmbiguousHostnameError,
@@ -30,9 +32,6 @@ import {
   ResourcesService,
 } from './resourcesService';
 
-import type { TshdClient } from 'teleterm/services/tshd';
-import type * as tsh from 'teleterm/services/tshd/types';
-
 describe('getServerByHostname', () => {
   const server: tsh.Server = makeServer();
   const getServerByHostnameTests: Array<
diff --git a/web/packages/teleterm/src/ui/services/resources/resourcesService.ts b/web/packages/teleterm/src/ui/services/resources/resourcesService.ts
index 3bcbaa09f95a9..23839e7ab34c7 100644
--- a/web/packages/teleterm/src/ui/services/resources/resourcesService.ts
+++ b/web/packages/teleterm/src/ui/services/resources/resourcesService.ts
@@ -17,25 +17,21 @@
  */
 
 import {
-  cloneAbortSignal,
-  TshdRpcError,
-} from 'teleterm/services/tshd/cloneableClient';
-
-import {
-  resourceOneOfIsServer,
-  resourceOneOfIsDatabase,
   resourceOneOfIsApp,
+  resourceOneOfIsDatabase,
   resourceOneOfIsKube,
+  resourceOneOfIsServer,
 } from 'teleterm/helpers';
-
 import Logger from 'teleterm/logger';
-
-import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
-
 import type { TshdClient } from 'teleterm/services/tshd';
+import { getAppAddrWithProtocol } from 'teleterm/services/tshd/app';
+import {
+  cloneAbortSignal,
+  TshdRpcError,
+} from 'teleterm/services/tshd/cloneableClient';
 import type * as types from 'teleterm/services/tshd/types';
-import type * as uri from 'teleterm/ui/uri';
 import type { ResourceTypeFilter } from 'teleterm/ui/Search/searchResult';
+import type * as uri from 'teleterm/ui/uri';
 
 export class ResourcesService {
   private logger = new Logger('ResourcesService');
diff --git a/web/packages/teleterm/src/ui/services/tshdNotifications/tshdNotificationService.ts b/web/packages/teleterm/src/ui/services/tshdNotifications/tshdNotificationService.ts
index d6ff8538816af..c9bffb91d3eda 100644
--- a/web/packages/teleterm/src/ui/services/tshdNotifications/tshdNotificationService.ts
+++ b/web/packages/teleterm/src/ui/services/tshdNotifications/tshdNotificationService.ts
@@ -18,11 +18,6 @@
 
 import { NotificationItemContent } from 'shared/components/Notification';
 
-import { getTargetNameFromUri } from 'teleterm/services/tshd/gateway';
-import { SendNotificationRequest } from 'teleterm/services/tshdEvents';
-import { ClustersService } from 'teleterm/ui/services/clusters';
-import { NotificationsService } from 'teleterm/ui/services/notifications';
-import { ResourceUri, routing } from 'teleterm/ui/uri';
 import {
   cannotProxyVnetConnectionReasonIsCertReissueError,
   cannotProxyVnetConnectionReasonIsInvalidLocalPort,
@@ -33,6 +28,11 @@ import {
   formatPortRange,
   publicAddrWithTargetPort,
 } from 'teleterm/services/tshd/app';
+import { getTargetNameFromUri } from 'teleterm/services/tshd/gateway';
+import { SendNotificationRequest } from 'teleterm/services/tshdEvents';
+import { ClustersService } from 'teleterm/ui/services/clusters';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
+import { ResourceUri, routing } from 'teleterm/ui/uri';
 
 export class TshdNotificationsService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/usage/askAboutUserJobRoleIfNeeded.ts b/web/packages/teleterm/src/ui/services/usage/askAboutUserJobRoleIfNeeded.ts
index e5344920b7507..ed00ab70547c0 100644
--- a/web/packages/teleterm/src/ui/services/usage/askAboutUserJobRoleIfNeeded.ts
+++ b/web/packages/teleterm/src/ui/services/usage/askAboutUserJobRoleIfNeeded.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { UsageService } from 'teleterm/ui/services/usage';
+import { ConfigService } from 'teleterm/services/config';
 import { ModalsService } from 'teleterm/ui/services/modals';
 import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
-import { ConfigService } from 'teleterm/services/config';
+import { UsageService } from 'teleterm/ui/services/usage';
 
 export async function askAboutUserJobRoleIfNeeded(
   statePersistenceService: StatePersistenceService,
diff --git a/web/packages/teleterm/src/ui/services/usage/setUpUsageReporting.ts b/web/packages/teleterm/src/ui/services/usage/setUpUsageReporting.ts
index 2ccfa77f24f4e..912680da4e171 100644
--- a/web/packages/teleterm/src/ui/services/usage/setUpUsageReporting.ts
+++ b/web/packages/teleterm/src/ui/services/usage/setUpUsageReporting.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Logger from 'teleterm/logger';
 import { ConfigService } from 'teleterm/services/config';
-import { ModalsService } from 'teleterm/ui/services/modals';
 import { staticConfig } from 'teleterm/staticConfig';
-import Logger from 'teleterm/logger';
+import { ModalsService } from 'teleterm/ui/services/modals';
 
 export async function setUpUsageReporting(
   configService: ConfigService,
diff --git a/web/packages/teleterm/src/ui/services/usage/usageService.ts b/web/packages/teleterm/src/ui/services/usage/usageService.ts
index 58b840a5a323b..68dc0dc8ac017 100644
--- a/web/packages/teleterm/src/ui/services/usage/usageService.ts
+++ b/web/packages/teleterm/src/ui/services/usage/usageService.ts
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { SubmitConnectEventRequest } from 'gen-proto-ts/prehog/v1alpha/connect_pb';
 import { Timestamp } from 'gen-proto-ts/google/protobuf/timestamp_pb';
+import { SubmitConnectEventRequest } from 'gen-proto-ts/prehog/v1alpha/connect_pb';
 import { Cluster } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb';
 
-import { ClusterOrResourceUri, ClusterUri, routing } from 'teleterm/ui/uri';
-import { TshdClient } from 'teleterm/services/tshd';
+import Logger from 'teleterm/logger';
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
 import { ConfigService } from 'teleterm/services/config';
-import Logger from 'teleterm/logger';
+import { TshdClient } from 'teleterm/services/tshd';
 import { staticConfig } from 'teleterm/staticConfig';
 import { NotificationsService } from 'teleterm/ui/services/notifications';
 import { DocumentOrigin } from 'teleterm/ui/services/workspacesService';
+import { ClusterOrResourceUri, ClusterUri, routing } from 'teleterm/ui/uri';
 
 type PrehogEventReq = Omit<
   SubmitConnectEventRequest,
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts
index c0b2f46f99217..4199da71a6188 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
 import {
-  rootClusterUri,
   leafClusterUri,
-  makeServer,
   makeApp,
-  makeKube,
   makeDatabase,
+  makeKube,
+  makeServer,
+  rootClusterUri,
 } from 'teleterm/services/tshd/testHelpers';
+import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
 import { ModalsService } from 'teleterm/ui/services/modals';
 
 import {
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts
index 06329edcd4c7c..b880743f030cf 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts
@@ -16,17 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { ModalsService } from 'teleterm/ui/services/modals';
 import {
-  ResourceUri,
-  routing,
+  AppUri,
   ClusterUri,
-  ServerUri,
   DatabaseUri,
-  KubeUri,
-  AppUri,
   KubeResourceNamespaceUri,
+  KubeUri,
+  ResourceUri,
+  routing,
+  ServerUri,
 } from 'teleterm/ui/uri';
-import { ModalsService } from 'teleterm/ui/services/modals';
 
 export class AccessRequestsService {
   constructor(
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.test.ts
index 9d4fba2663fda..ef432d0b037a8 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.test.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.test.ts
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { makeApp, makeRootCluster } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 import {
   connectToApp,
   setUpAppGateway,
 } from 'teleterm/ui/services/workspacesService';
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { makeApp, makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import { IAppContext } from 'teleterm/ui/types';
 
 describe('connectToApp', () => {
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.ts
index 815912e923a6c..93aee047a7341 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToApp.ts
@@ -18,15 +18,14 @@
 
 import { App } from 'gen-proto-ts/teleport/lib/teleterm/v1/app_pb';
 
-import { routing } from 'teleterm/ui/uri';
-import { IAppContext } from 'teleterm/ui/types';
-
 import {
-  getWebAppLaunchUrl,
-  isWebApp,
   getAwsAppLaunchUrl,
   getSamlAppSsoUrl,
+  getWebAppLaunchUrl,
+  isWebApp,
 } from 'teleterm/services/tshd/app';
+import { IAppContext } from 'teleterm/ui/types';
+import { routing } from 'teleterm/ui/uri';
 
 import { DocumentOrigin } from './types';
 
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToDatabase.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToDatabase.ts
index 4f53ad3c376e3..20238815acc3b 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToDatabase.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToDatabase.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { GatewayProtocol } from 'teleterm/services/tshd/types';
 import { IAppContext } from 'teleterm/ui/types';
 import { DatabaseUri, routing } from 'teleterm/ui/uri';
-import { GatewayProtocol } from 'teleterm/services/tshd/types';
 
 import { DocumentOrigin } from './types';
 
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToKube.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToKube.ts
index 365bdc6251d27..0fd3369653547 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToKube.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToKube.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { KubeUri, routing } from 'teleterm/ui/uri';
 import { IAppContext } from 'teleterm/ui/types';
+import { KubeUri, routing } from 'teleterm/ui/uri';
 
 import { DocumentOrigin } from './types';
 
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToServer.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToServer.ts
index eb6d115f0c983..9f58de0ee3f8c 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToServer.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/connectToServer.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { routing, ServerUri } from 'teleterm/ui/uri';
 import { IAppContext } from 'teleterm/ui/types';
+import { routing, ServerUri } from 'teleterm/ui/uri';
 
 import { DocumentOrigin } from './types';
 
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/documentsService.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/documentsService.ts
index ad91d8081016c..83b3d89ff05d2 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/documentsService.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/documentsService.ts
@@ -16,16 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { unique } from 'teleterm/ui/utils/uid';
+import type { Shell } from 'teleterm/mainProcess/shell';
+import type { RuntimeSettings } from 'teleterm/mainProcess/types';
 import * as uri from 'teleterm/ui/uri';
 import {
   DocumentUri,
-  ServerUri,
+  KubeUri,
   paths,
-  routing,
   RootClusterUri,
-  KubeUri,
+  routing,
+  ServerUri,
 } from 'teleterm/ui/uri';
+import { unique } from 'teleterm/ui/utils/uid';
 
 import {
   CreateAccessRequestDocumentOpts,
@@ -33,24 +35,21 @@ import {
   CreateTshKubeDocumentOptions,
   Document,
   DocumentAccessRequests,
+  DocumentAuthorizeWebSession,
   DocumentCluster,
+  DocumentClusterQueryParams,
   DocumentConnectMyComputer,
   DocumentGateway,
-  DocumentGatewayKube,
   DocumentGatewayCliClient,
+  DocumentGatewayKube,
   DocumentOrigin,
+  DocumentPtySession,
   DocumentTshKube,
   DocumentTshNode,
   DocumentTshNodeWithServerId,
-  DocumentClusterQueryParams,
-  DocumentPtySession,
   WebSessionRequest,
-  DocumentAuthorizeWebSession,
 } from './types';
 
-import type { Shell } from 'teleterm/mainProcess/shell';
-import type { RuntimeSettings } from 'teleterm/mainProcess/types';
-
 export class DocumentsService {
   constructor(
     private getState: () => { documents: Document[]; location: string },
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.test.ts
index 5b92b830c58d1..e6f749653d271 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.test.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.test.ts
@@ -17,10 +17,10 @@
  */
 
 import {
-  isDocumentTshNodeWithServerId,
-  isDocumentTshNodeWithLoginHost,
-  DocumentTshNodeWithServerId,
   DocumentTshNodeWithLoginHost,
+  DocumentTshNodeWithServerId,
+  isDocumentTshNodeWithLoginHost,
+  isDocumentTshNodeWithServerId,
 } from './types';
 
 const docWithServerId: DocumentTshNodeWithServerId = {
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.ts b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.ts
index 00238ae5b35fd..970fb09d22ba7 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/documentsService/types.ts
@@ -18,9 +18,8 @@
 
 import { SharedUnifiedResource } from 'shared/components/UnifiedResources';
 
-import * as uri from 'teleterm/ui/uri';
-
 import type * as tsh from 'teleterm/services/tshd/types';
+import * as uri from 'teleterm/ui/uri';
 
 export type Kind = Document['kind'];
 
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts
index ccb1add834217..628bbedd62190 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts
@@ -17,30 +17,28 @@
  */
 
 import {
+  AvailableResourceMode,
   DefaultTab,
-  ViewMode,
   LabelsViewMode,
-  AvailableResourceMode,
+  ViewMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
 
-import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
 import Logger, { NullService } from 'teleterm/logger';
+import { makeRootCluster } from 'teleterm/services/tshd/testHelpers';
+import type * as tshd from 'teleterm/services/tshd/types';
 import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers';
 
 import { ClustersService } from '../clusters';
-import { StatePersistenceService } from '../statePersistence';
-import { NotificationsService } from '../notifications';
 import { ModalsService } from '../modals';
-
+import { NotificationsService } from '../notifications';
+import { StatePersistenceService } from '../statePersistence';
 import { getEmptyPendingAccessRequest } from './accessRequestsService';
+import { DocumentCluster, DocumentsService } from './documentsService';
 import {
   Workspace,
   WorkspacesService,
   WorkspacesState,
 } from './workspacesService';
-import { DocumentCluster, DocumentsService } from './documentsService';
-
-import type * as tshd from 'teleterm/services/tshd/types';
 
 beforeAll(() => {
   Logger.init(new NullService());
diff --git a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.ts b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.ts
index e3f38745bef83..cc694f6c92e6b 100644
--- a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.ts
+++ b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.ts
@@ -17,24 +17,28 @@
  */
 
 import { z } from 'zod';
-import { arrayObjectIsEqual } from 'shared/utils/highbar';
 
 import {
+  AvailableResourceMode,
   DefaultTab,
   LabelsViewMode,
   UnifiedResourcePreferences,
   ViewMode,
-  AvailableResourceMode,
 } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb';
+import { arrayObjectIsEqual } from 'shared/utils/highbar';
 
-import { ModalsService } from 'teleterm/ui/services/modals';
+import {
+  identitySelector,
+  useStoreSelector,
+} from 'teleterm/ui/hooks/useStoreSelector';
 import { ClustersService } from 'teleterm/ui/services/clusters';
+import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
+import { ModalsService } from 'teleterm/ui/services/modals';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
 import {
   StatePersistenceService,
   WorkspacesPersistedState,
 } from 'teleterm/ui/services/statePersistence';
-import { ImmutableStore } from 'teleterm/ui/services/immutableStore';
-import { NotificationsService } from 'teleterm/ui/services/notifications';
 import {
   ClusterOrResourceUri,
   ClusterUri,
@@ -43,25 +47,19 @@ import {
   routing,
 } from 'teleterm/ui/uri';
 
-import {
-  identitySelector,
-  useStoreSelector,
-} from 'teleterm/ui/hooks/useStoreSelector';
-
 import {
   AccessRequestsService,
   getEmptyPendingAccessRequest,
   PendingAccessRequest,
 } from './accessRequestsService';
-
 import {
   Document,
-  DocumentsService,
-  getDefaultDocumentClusterQueryParams,
   DocumentCluster,
   DocumentGateway,
+  DocumentsService,
   DocumentTshKube,
   DocumentTshNode,
+  getDefaultDocumentClusterQueryParams,
 } from './documentsService';
 
 export interface WorkspacesState {
diff --git a/web/packages/teleterm/src/ui/tshdEvents.ts b/web/packages/teleterm/src/ui/tshdEvents.ts
index fa6f1b9623562..bf910ef206fc7 100644
--- a/web/packages/teleterm/src/ui/tshdEvents.ts
+++ b/web/packages/teleterm/src/ui/tshdEvents.ts
@@ -18,9 +18,9 @@
 
 import { PromptHardwareKeyPINChangeResponse } from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 
+import Logger from 'teleterm/logger';
 import { TshdEventContextBridgeService } from 'teleterm/types';
 import { IAppContext } from 'teleterm/ui/types';
-import Logger from 'teleterm/logger';
 
 export function createTshdEventsContextBridgeService(
   ctx: IAppContext
diff --git a/web/packages/teleterm/src/ui/types.ts b/web/packages/teleterm/src/ui/types.ts
index bef3fdaa6d216..ed00bfb246c14 100644
--- a/web/packages/teleterm/src/ui/types.ts
+++ b/web/packages/teleterm/src/ui/types.ts
@@ -17,28 +17,28 @@
  */
 import * as tshdEventsApi from 'gen-proto-ts/teleport/lib/teleterm/v1/tshd_events_service_pb';
 
+import { ConfigService } from 'teleterm/services/config';
+import { TshdClient, VnetClient } from 'teleterm/services/tshd';
 import {
   MainProcessClient,
   TshdEventContextBridgeService,
 } from 'teleterm/types';
-import { ClustersService } from 'teleterm/ui/services/clusters';
-import { ModalsService } from 'teleterm/ui/services/modals';
-import { TerminalsService } from 'teleterm/ui/services/terminals';
-import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
 import { CommandLauncher } from 'teleterm/ui/commandLauncher';
-import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
-import { WorkspacesService } from 'teleterm/ui/services/workspacesService';
-import { NotificationsService } from 'teleterm/ui/services/notifications';
+import { ClustersService } from 'teleterm/ui/services/clusters';
 import { ConnectionTrackerService } from 'teleterm/ui/services/connectionTracker';
+import { ConnectMyComputerService } from 'teleterm/ui/services/connectMyComputer';
 import { FileTransferService } from 'teleterm/ui/services/fileTransferClient';
-import { ResourcesService } from 'teleterm/ui/services/resources';
+import { HeadlessAuthenticationService } from 'teleterm/ui/services/headlessAuthn/headlessAuthnService';
+import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
+import { ModalsService } from 'teleterm/ui/services/modals';
+import { NotificationsService } from 'teleterm/ui/services/notifications';
 import { ReloginService } from 'teleterm/ui/services/relogin/reloginService';
+import { ResourcesService } from 'teleterm/ui/services/resources';
+import { StatePersistenceService } from 'teleterm/ui/services/statePersistence';
+import { TerminalsService } from 'teleterm/ui/services/terminals';
 import { TshdNotificationsService } from 'teleterm/ui/services/tshdNotifications/tshdNotificationService';
 import { UsageService } from 'teleterm/ui/services/usage';
-import { ConfigService } from 'teleterm/services/config';
-import { ConnectMyComputerService } from 'teleterm/ui/services/connectMyComputer';
-import { HeadlessAuthenticationService } from 'teleterm/ui/services/headlessAuthn/headlessAuthnService';
-import { TshdClient, VnetClient } from 'teleterm/services/tshd';
+import { WorkspacesService } from 'teleterm/ui/services/workspacesService';
 
 export interface IAppContext {
   clustersService: ClustersService;
diff --git a/web/packages/teleterm/src/ui/uri.ts b/web/packages/teleterm/src/ui/uri.ts
index 7ee57263b8761..683d37c8d9fd6 100644
--- a/web/packages/teleterm/src/ui/uri.ts
+++ b/web/packages/teleterm/src/ui/uri.ts
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { matchPath, generatePath } from 'react-router';
-
-import type { RouteProps } from 'react-router';
+import { generatePath, matchPath, type RouteProps } from 'react-router';
 
 /*
  * Resource URIs
diff --git a/web/packages/teleterm/src/ui/utils/retryWithRelogin.test.ts b/web/packages/teleterm/src/ui/utils/retryWithRelogin.test.ts
index 90d3df8a6d1f9..2f38e03b63e20 100644
--- a/web/packages/teleterm/src/ui/utils/retryWithRelogin.test.ts
+++ b/web/packages/teleterm/src/ui/utils/retryWithRelogin.test.ts
@@ -18,9 +18,9 @@
 
 import { waitFor } from '@testing-library/react';
 
-import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
-import { makeRetryableError } from 'teleterm/services/tshd/testHelpers';
 import Logger, { NullService } from 'teleterm/logger';
+import { makeRetryableError } from 'teleterm/services/tshd/testHelpers';
+import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
 
 import { retryWithRelogin } from './retryWithRelogin';
 
diff --git a/web/packages/teleterm/src/ui/utils/retryWithRelogin.ts b/web/packages/teleterm/src/ui/utils/retryWithRelogin.ts
index a3224e87e0a6a..cee18ad793870 100644
--- a/web/packages/teleterm/src/ui/utils/retryWithRelogin.ts
+++ b/web/packages/teleterm/src/ui/utils/retryWithRelogin.ts
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ClusterOrResourceUri, RootClusterUri, routing } from 'teleterm/ui/uri';
-import { IAppContext } from 'teleterm/ui/types';
 import Logger from 'teleterm/logger';
 import { isTshdRpcError } from 'teleterm/services/tshd/cloneableClient';
+import { IAppContext } from 'teleterm/ui/types';
+import { ClusterOrResourceUri, RootClusterUri, routing } from 'teleterm/ui/uri';
 
 const logger = new Logger('retryWithRelogin');