diff --git a/packages/website/src/components/PlaylistGenerator.tsx b/packages/website/src/components/PlaylistGenerator.tsx
index 85b9c5d0a..c533495ca 100644
--- a/packages/website/src/components/PlaylistGenerator.tsx
+++ b/packages/website/src/components/PlaylistGenerator.tsx
@@ -12,7 +12,7 @@ import {
 } from "@radix-ui/themes";
 import { useMemo, useState } from "react";
 import usePromise from "react-promise-suspense";
-import { awaitableTankDefinitions } from "../core/awaitables/tankDefinitions";
+import { api } from "../core/blitzkit/api";
 import { filterTanks } from "../core/blitzkit/filterTanks";
 import { generatePlaylist } from "../core/blitzkit/generatePlaylist";
 import { useLocale } from "../hooks/useLocale";
@@ -22,7 +22,7 @@ import type { MaybeSkeletonComponentProps } from "../types/maybeSkeletonComponen
 import { LinkI18n } from "./LinkI18n";
 import { FilterControl } from "./TankSearch/components/FilterControl";
 
-const tankDefinitions = await awaitableTankDefinitions;
+const tankDefinitions = await api.tankDefinitions();
 
 const POOL_HEIGHT = "16rem";
 
@@ -33,12 +33,12 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) {
   const filters = TankFilters.use();
   const randomTankList = useMemo(
     () => fisherYates(Object.values(tankDefinitions.tanks)),
-    [filters]
+    [filters],
   );
   const tanks = usePromise(
     () => filterTanks(filters, randomTankList, wargaming?.id),
     // react-promise-suspense has awful type annotations
-    [filters] as any
+    [filters] as any,
   );
   const tanksTrimmed = useMemo(() => tanks.slice(0, 65), [filters]);
 
@@ -58,7 +58,7 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) {
               {
                 count: tanks.length,
                 time: Math.round(tanks.length * ((2 * 4) / 60)),
-              }
+              },
             )}
           </AlertDialog.Description>
 
@@ -145,7 +145,7 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) {
                       backgroundRepeat: "no-repeat",
                     }}
                   />
-                )
+                ),
               )}
 
               <Box
diff --git a/packages/website/src/components/PlaylistTankEntry.tsx b/packages/website/src/components/PlaylistTankEntry.tsx
index 5a783d5f9..21e62167a 100644
--- a/packages/website/src/components/PlaylistTankEntry.tsx
+++ b/packages/website/src/components/PlaylistTankEntry.tsx
@@ -5,7 +5,7 @@ import {
 } from "@radix-ui/react-icons";
 import { Checkbox, Flex, IconButton, Table, Text } from "@radix-ui/themes";
 import { memo } from "react";
-import { awaitableTankDefinitions } from "../core/awaitables/tankDefinitions";
+import { api } from "../core/blitzkit/api";
 import { useLocale } from "../hooks/useLocale";
 import { Playlist, type PlaylistEntry } from "../stores/playlist";
 import { TankRowHeaderCell } from "./TankRowHeaderCell";
@@ -14,7 +14,7 @@ interface Props extends PlaylistEntry {
   index: number;
 }
 
-const tankDefinitions = await awaitableTankDefinitions;
+const tankDefinitions = await api.tankDefinitions();
 
 export const PlaylistTankEntry = memo<Props>(
   ({ id, checked, then, now, index }) => {
@@ -93,7 +93,7 @@ export const PlaylistTankEntry = memo<Props>(
           {now && now.last !== 0
             ? rtf.format(
                 Math.ceil((now.last - dateNow / 1000) / (60 * 60 * 24)),
-                "day"
+                "day",
               )
             : strings.website.tools.playlist.table.unrecorded}
         </Table.Cell>
@@ -103,5 +103,5 @@ export const PlaylistTankEntry = memo<Props>(
   (a, b) =>
     a.checked === b.checked &&
     a.then?.battles === b.then?.battles &&
-    a.index === b.index
+    a.index === b.index,
 );
diff --git a/packages/website/src/core/blitzkit/generatePlaylist.ts b/packages/website/src/core/blitzkit/generatePlaylist.ts
index ccd8a13c7..f0fd87bdb 100644
--- a/packages/website/src/core/blitzkit/generatePlaylist.ts
+++ b/packages/website/src/core/blitzkit/generatePlaylist.ts
@@ -7,10 +7,10 @@ import {
 import { App } from "../../stores/app";
 import { Playlist } from "../../stores/playlist";
 import { TankFilters } from "../../stores/tankFilters";
-import { awaitableTankDefinitions } from "../awaitables/tankDefinitions";
+import { api } from "./api";
 import { filterTanks } from "./filterTanks";
 
-const tankDefinitions = await awaitableTankDefinitions;
+const tankDefinitions = await api.tankDefinitions();
 const tanks = Object.values(tankDefinitions.tanks);
 
 export async function generatePlaylist() {
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx
index 0fe0c6f44..04e090b26 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx
@@ -1,11 +1,11 @@
-import { PageWrapper } from "../../../components/PageWrapper";
-import { PlaylistGenerator } from "../../../components/PlaylistGenerator";
-import { PlaylistOrder } from "../../../components/PlaylistOrder";
-import { LocaleProvider } from "../../../hooks/useLocale";
-import { App } from "../../../stores/app";
-import { Playlist } from "../../../stores/playlist";
-import { TankFilters } from "../../../stores/tankFilters";
-import type { MaybeSkeletonComponentProps } from "../../../types/maybeSkeletonComponentProps";
+import { PageWrapper } from "../../../../components/PageWrapper";
+import { PlaylistGenerator } from "../../../../components/PlaylistGenerator";
+import { PlaylistOrder } from "../../../../components/PlaylistOrder";
+import { LocaleProvider } from "../../../../hooks/useLocale";
+import { App } from "../../../../stores/app";
+import { Playlist } from "../../../../stores/playlist";
+import { TankFilters } from "../../../../stores/tankFilters";
+import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps";
 
 interface Props {
   locale: string;
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/index.astro
index 5d5989351..ad840e7cc 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/index.astro
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/index.astro
@@ -1,7 +1,7 @@
 ---
-import ToolOpenGraph from "../../../components/ToolOpenGraph.astro";
-import { tools } from "../../../constants/tools";
-import BaseLayout from "../../../layouts/BaseLayout.astro";
+import ToolOpenGraph from "../../../../components/ToolOpenGraph.astro";
+import { tools } from "../../../../constants/tools";
+import BaseLayout from "../../../../layouts/BaseLayout.astro";
 import { Page } from "./_index.tsx";
 
 export { getStaticPaths } from "../index.astro";