diff --git a/site/.storybook/preview.jsx b/site/.storybook/preview.jsx
index 6c8f9dd864130..212abbc82cf39 100644
--- a/site/.storybook/preview.jsx
+++ b/site/.storybook/preview.jsx
@@ -8,7 +8,7 @@ import { withRouter } from "storybook-addon-react-router-v6";
 import { HelmetProvider } from "react-helmet-async";
 import { dark } from "theme";
 import "theme/globalFonts";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "react-query";
 
 export const decorators = [
   (Story) => (
diff --git a/site/package.json b/site/package.json
index f95d9b0a9acf8..6c1a5d4d5b927 100644
--- a/site/package.json
+++ b/site/package.json
@@ -46,7 +46,6 @@
     "@mui/styles": "5.14.0",
     "@mui/system": "5.14.0",
     "@mui/utils": "5.14.11",
-    "@tanstack/react-query": "4.35.3",
     "@vitejs/plugin-react": "4.1.0",
     "@xstate/inspect": "0.8.0",
     "@xstate/react": "3.2.1",
@@ -78,6 +77,7 @@
     "react-dom": "18.2.0",
     "react-helmet-async": "1.3.0",
     "react-markdown": "8.0.7",
+    "react-query": "npm:@tanstack/react-query@4.35.3",
     "react-router-dom": "6.16.0",
     "react-syntax-highlighter": "15.5.0",
     "react-use": "17.4.0",
diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml
index d4b34d74f9ba6..546b9d703d7a5 100644
--- a/site/pnpm-lock.yaml
+++ b/site/pnpm-lock.yaml
@@ -54,9 +54,6 @@ dependencies:
   '@mui/utils':
     specifier: 5.14.11
     version: 5.14.11(@types/react@18.2.6)(react@18.2.0)
-  '@tanstack/react-query':
-    specifier: 4.35.3
-    version: 4.35.3(react-dom@18.2.0)(react@18.2.0)
   '@vitejs/plugin-react':
     specifier: 4.1.0
     version: 4.1.0(vite@4.4.2)
@@ -150,6 +147,9 @@ dependencies:
   react-markdown:
     specifier: 8.0.7
     version: 8.0.7(@types/react@18.2.6)(react@18.2.0)
+  react-query:
+    specifier: npm:@tanstack/react-query@4.35.3
+    version: /@tanstack/react-query@4.35.3(react-dom@18.2.0)(react@18.2.0)
   react-router-dom:
     specifier: 6.16.0
     version: 6.16.0(react-dom@18.2.0)(react@18.2.0)
diff --git a/site/src/App.tsx b/site/src/App.tsx
index f0a8316df6093..5ba7f68c605c5 100644
--- a/site/src/App.tsx
+++ b/site/src/App.tsx
@@ -1,5 +1,5 @@
 import CssBaseline from "@mui/material/CssBaseline";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "react-query";
 import { AuthProvider } from "components/AuthProvider/AuthProvider";
 import { FC, PropsWithChildren } from "react";
 import { HelmetProvider } from "react-helmet-async";
diff --git a/site/src/api/queries/appearance.ts b/site/src/api/queries/appearance.ts
index 469875d6ce8d6..aaab8290e5eba 100644
--- a/site/src/api/queries/appearance.ts
+++ b/site/src/api/queries/appearance.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient } from "react-query";
 import * as API from "api/api";
 import { AppearanceConfig } from "api/typesGenerated";
 import { getMetadataAsJSON } from "utils/metadata";
diff --git a/site/src/api/queries/entitlements.ts b/site/src/api/queries/entitlements.ts
index 7284c957b06bc..271d0bbf821ee 100644
--- a/site/src/api/queries/entitlements.ts
+++ b/site/src/api/queries/entitlements.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient } from "react-query";
 import * as API from "api/api";
 import { Entitlements } from "api/typesGenerated";
 import { getMetadataAsJSON } from "utils/metadata";
diff --git a/site/src/api/queries/groups.ts b/site/src/api/queries/groups.ts
index 62b59515df0df..d34ad24a6abd0 100644
--- a/site/src/api/queries/groups.ts
+++ b/site/src/api/queries/groups.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient } from "react-query";
 import * as API from "api/api";
 import { checkAuthorization } from "api/api";
 import {
diff --git a/site/src/api/queries/settings.ts b/site/src/api/queries/settings.ts
index 8fe57ee9b675d..c8f9aac16e136 100644
--- a/site/src/api/queries/settings.ts
+++ b/site/src/api/queries/settings.ts
@@ -3,7 +3,7 @@ import {
   type UserQuietHoursScheduleResponse,
   type UpdateUserQuietHoursScheduleRequest,
 } from "api/typesGenerated";
-import { type QueryClient, type QueryOptions } from "@tanstack/react-query";
+import { type QueryClient, type QueryOptions } from "react-query";
 
 export const userQuietHoursScheduleKey = (userId: string) => [
   "settings",
diff --git a/site/src/api/queries/sshKeys.ts b/site/src/api/queries/sshKeys.ts
index ee82200c9cc3c..07f9963b40c8b 100644
--- a/site/src/api/queries/sshKeys.ts
+++ b/site/src/api/queries/sshKeys.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient } from "react-query";
 import * as API from "api/api";
 import { GitSSHKey } from "api/typesGenerated";
 
diff --git a/site/src/api/queries/templates.ts b/site/src/api/queries/templates.ts
index 15fc52db1ec1e..1c5dfb6bef9ca 100644
--- a/site/src/api/queries/templates.ts
+++ b/site/src/api/queries/templates.ts
@@ -6,7 +6,7 @@ import {
   type ProvisionerJobStatus,
   type TemplateVersion,
 } from "api/typesGenerated";
-import { type QueryClient, type QueryOptions } from "@tanstack/react-query";
+import { type QueryClient, type QueryOptions } from "react-query";
 import { delay } from "utils/delay";
 
 export const templateByNameKey = (orgId: string, name: string) => [
diff --git a/site/src/api/queries/users.ts b/site/src/api/queries/users.ts
index bdb753493c272..3c0bd47a8ead4 100644
--- a/site/src/api/queries/users.ts
+++ b/site/src/api/queries/users.ts
@@ -1,4 +1,4 @@
-import { QueryClient, QueryOptions } from "@tanstack/react-query";
+import { QueryClient, QueryOptions } from "react-query";
 import * as API from "api/api";
 import {
   GetUsersResponse,
diff --git a/site/src/api/queries/workspace.ts b/site/src/api/queries/workspace.ts
index cb5440747910b..793c482adb920 100644
--- a/site/src/api/queries/workspace.ts
+++ b/site/src/api/queries/workspace.ts
@@ -1,6 +1,6 @@
 import * as API from "api/api";
 import { type Workspace } from "api/typesGenerated";
-import { type QueryOptions } from "@tanstack/react-query";
+import { type QueryOptions } from "react-query";
 
 export const workspaceByOwnerAndNameKey = (owner: string, name: string) => [
   "workspace",
diff --git a/site/src/api/queries/workspaceBuilds.ts b/site/src/api/queries/workspaceBuilds.ts
index c23f625b40835..fb35a735ab3ef 100644
--- a/site/src/api/queries/workspaceBuilds.ts
+++ b/site/src/api/queries/workspaceBuilds.ts
@@ -1,4 +1,4 @@
-import { UseInfiniteQueryOptions } from "@tanstack/react-query";
+import { UseInfiniteQueryOptions } from "react-query";
 import * as API from "api/api";
 import { WorkspaceBuild, WorkspaceBuildsRequest } from "api/typesGenerated";
 
diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx
index d5caa2397c0f8..9e5a4b0b80f81 100644
--- a/site/src/components/Dashboard/DashboardProvider.tsx
+++ b/site/src/components/Dashboard/DashboardProvider.tsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { buildInfo } from "api/queries/buildInfo";
 import { experiments } from "api/queries/experiments";
 import { entitlements } from "api/queries/entitlements";
diff --git a/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx b/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx
index 2d5cab0fe4637..6fc3acea0d9ef 100644
--- a/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx
+++ b/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx
@@ -1,6 +1,6 @@
 import { usePermissions } from "hooks/usePermissions";
 import { DeploymentBannerView } from "./DeploymentBannerView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { deploymentStats } from "api/queries/deployment";
 
 export const DeploymentBanner: React.FC = () => {
diff --git a/site/src/components/Dashboard/HealthBanner.tsx b/site/src/components/Dashboard/HealthBanner.tsx
index d5deadf58d540..a1bec582fdf9c 100644
--- a/site/src/components/Dashboard/HealthBanner.tsx
+++ b/site/src/components/Dashboard/HealthBanner.tsx
@@ -2,7 +2,7 @@ import { Alert } from "components/Alert/Alert";
 import { Link as RouterLink } from "react-router-dom";
 import Link from "@mui/material/Link";
 import { colors } from "theme/colors";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getHealth } from "api/api";
 import { useDashboard } from "./DashboardProvider";
 
diff --git a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
index cc5124930c423..399915678465d 100644
--- a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
+++ b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
@@ -7,7 +7,7 @@ import { RequirePermission } from "components/RequirePermission/RequirePermissio
 import { usePermissions } from "hooks/usePermissions";
 import { Outlet } from "react-router-dom";
 import { DeploymentConfig } from "api/api";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { deploymentConfig } from "api/queries/deployment";
 
 type DeploySettingsContextValue = {
diff --git a/site/src/components/Filter/menu.ts b/site/src/components/Filter/menu.ts
index fd9b3c9246f1c..fe8c5632d3af9 100644
--- a/site/src/components/Filter/menu.ts
+++ b/site/src/components/Filter/menu.ts
@@ -1,6 +1,6 @@
 import { useMemo, useRef, useState } from "react";
 import { BaseOption } from "./options";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 
 export type UseFilterMenuOptions<TOption extends BaseOption> = {
   id: string;
diff --git a/site/src/components/Resources/PortForwardButton.tsx b/site/src/components/Resources/PortForwardButton.tsx
index 6cd7607ab0b87..57ca6719b6d9b 100644
--- a/site/src/components/Resources/PortForwardButton.tsx
+++ b/site/src/components/Resources/PortForwardButton.tsx
@@ -12,7 +12,7 @@ import {
 import { SecondaryAgentButton } from "components/Resources/AgentButton";
 import { docs } from "utils/docs";
 import Box from "@mui/material/Box";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getAgentListeningPorts } from "api/api";
 import {
   WorkspaceAgent,
diff --git a/site/src/components/UserAutocomplete/UserAutocomplete.tsx b/site/src/components/UserAutocomplete/UserAutocomplete.tsx
index 6d022dac2e449..44aee30bc5c89 100644
--- a/site/src/components/UserAutocomplete/UserAutocomplete.tsx
+++ b/site/src/components/UserAutocomplete/UserAutocomplete.tsx
@@ -8,7 +8,7 @@ import { AvatarData } from "components/AvatarData/AvatarData";
 import { ChangeEvent, ComponentProps, FC, useState } from "react";
 import Box from "@mui/material/Box";
 import { useDebouncedFunction } from "hooks/debounce";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { users } from "api/queries/users";
 import { prepareQuery } from "utils/filters";
 
diff --git a/site/src/components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index f23ed0f04a615..3fb493ea5d518 100644
--- a/site/src/components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -10,7 +10,7 @@ import {
 import InfoIcon from "@mui/icons-material/InfoOutlined";
 import { makeStyles } from "@mui/styles";
 import { colors } from "theme/colors";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { templateVersion } from "api/queries/templates";
 import Box from "@mui/material/Box";
 import Skeleton from "@mui/material/Skeleton";
diff --git a/site/src/contexts/ProxyContext.tsx b/site/src/contexts/ProxyContext.tsx
index 7ca714938af14..7992cb8bafc2e 100644
--- a/site/src/contexts/ProxyContext.tsx
+++ b/site/src/contexts/ProxyContext.tsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getWorkspaceProxies, getWorkspaceProxyRegions } from "api/api";
 import { Region, WorkspaceProxy } from "api/typesGenerated";
 import { useDashboard } from "components/Dashboard/DashboardProvider";
diff --git a/site/src/pages/AuditPage/AuditPage.tsx b/site/src/pages/AuditPage/AuditPage.tsx
index ae95397f27b08..2ed69c608fdfe 100644
--- a/site/src/pages/AuditPage/AuditPage.tsx
+++ b/site/src/pages/AuditPage/AuditPage.tsx
@@ -11,7 +11,7 @@ import { AuditPageView } from "./AuditPageView";
 import { useUserFilterMenu } from "components/Filter/UserFilter";
 import { useFilter } from "components/Filter/filter";
 import { usePagination } from "hooks";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getAuditLogs } from "api/api";
 import { useActionFilterMenu, useResourceTypeFilterMenu } from "./AuditFilter";
 
diff --git a/site/src/pages/CreateTokenPage/CreateTokenPage.tsx b/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
index a81be1d429727..b965be76a6b78 100644
--- a/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
+++ b/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
@@ -6,7 +6,7 @@ import { useNavigate } from "react-router-dom";
 import { useFormik } from "formik";
 import { Loader } from "components/Loader/Loader";
 import { displaySuccess, displayError } from "components/GlobalSnackbar/utils";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "react-query";
 import { createToken, getTokenConfig } from "api/api";
 import { CreateTokenForm } from "./CreateTokenForm";
 import { NANO_HOUR, CreateTokenData } from "./utils";
diff --git a/site/src/pages/CreateUserPage/CreateUserPage.tsx b/site/src/pages/CreateUserPage/CreateUserPage.tsx
index a81c4c6b4ab08..f3ad9f622577a 100644
--- a/site/src/pages/CreateUserPage/CreateUserPage.tsx
+++ b/site/src/pages/CreateUserPage/CreateUserPage.tsx
@@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom";
 import { CreateUserForm } from "./CreateUserForm";
 import { Margins } from "components/Margins/Margins";
 import { pageTitle } from "utils/page";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { authMethods, createUser } from "api/queries/users";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
index 91698fdc20291..a0ad1e3502deb 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
@@ -23,7 +23,7 @@ import {
   colors,
   NumberDictionary,
 } from "unique-names-generator";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { templateVersionExternalAuth } from "api/queries/templates";
 
 export type ExternalAuthPollingState = "idle" | "polling" | "abandoned";
diff --git a/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx b/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
index 61af33aed5a19..439dc69f31763 100644
--- a/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
+++ b/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
@@ -4,7 +4,7 @@ import { FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { AppearanceSettingsPageView } from "./AppearanceSettingsPageView";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "react-query";
 import { updateAppearance } from "api/queries/appearance";
 import { getErrorMessage } from "api/errors";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx
index e7684b15babe0..a0a8f314c06be 100644
--- a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx
+++ b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx
@@ -3,7 +3,7 @@ import { FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { GeneralSettingsPageView } from "./GeneralSettingsPageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { deploymentDAUs } from "api/queries/deployment";
 
 const GeneralSettingsPage: FC = () => {
diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
index 9e6799bc498c7..1abca04845884 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation } from "react-query";
 import { createLicense } from "api/api";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
 import { FC } from "react";
diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
index fdf2c2d42f268..16420749e7164 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { getLicenses, removeLicense } from "api/api";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
 import { FC, useEffect } from "react";
diff --git a/site/src/pages/ExternalAuthPage/ExternalAuthPage.tsx b/site/src/pages/ExternalAuthPage/ExternalAuthPage.tsx
index 8a9afb205a7de..d42004b758914 100644
--- a/site/src/pages/ExternalAuthPage/ExternalAuthPage.tsx
+++ b/site/src/pages/ExternalAuthPage/ExternalAuthPage.tsx
@@ -1,4 +1,4 @@
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "react-query";
 import {
   exchangeExternalAuthDevice,
   getExternalAuthDevice,
diff --git a/site/src/pages/GroupsPage/CreateGroupPage.tsx b/site/src/pages/GroupsPage/CreateGroupPage.tsx
index b09c4f9176991..a41342331e3f6 100644
--- a/site/src/pages/GroupsPage/CreateGroupPage.tsx
+++ b/site/src/pages/GroupsPage/CreateGroupPage.tsx
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet-async";
 import { useNavigate } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import CreateGroupPageView from "./CreateGroupPageView";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "react-query";
 import { createGroup } from "api/queries/groups";
 
 export const CreateGroupPage: FC = () => {
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
index 33f43f613a640..cc759d36b3afc 100644
--- a/site/src/pages/GroupsPage/GroupPage.tsx
+++ b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -34,7 +34,7 @@ import {
 } from "components/TableToolbar/TableToolbar";
 import { UserAvatar } from "components/UserAvatar/UserAvatar";
 import { isEveryoneGroup } from "utils/groups";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import {
   addMember,
   deleteGroup,
diff --git a/site/src/pages/GroupsPage/GroupsPage.tsx b/site/src/pages/GroupsPage/GroupsPage.tsx
index 1af0759b1b0ec..37bb1abfc2d89 100644
--- a/site/src/pages/GroupsPage/GroupsPage.tsx
+++ b/site/src/pages/GroupsPage/GroupsPage.tsx
@@ -5,7 +5,7 @@ import { FC, useEffect } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import GroupsPageView from "./GroupsPageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { groups } from "api/queries/groups";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { getErrorMessage } from "api/errors";
diff --git a/site/src/pages/GroupsPage/SettingsGroupPage.tsx b/site/src/pages/GroupsPage/SettingsGroupPage.tsx
index 28ecb49080b76..c42468062dba5 100644
--- a/site/src/pages/GroupsPage/SettingsGroupPage.tsx
+++ b/site/src/pages/GroupsPage/SettingsGroupPage.tsx
@@ -3,7 +3,7 @@ import { Helmet } from "react-helmet-async";
 import { useNavigate, useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import SettingsGroupPageView from "./SettingsGroupPageView";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { group, patchGroup } from "api/queries/groups";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { getErrorMessage } from "api/errors";
diff --git a/site/src/pages/HealthPage/HealthPage.tsx b/site/src/pages/HealthPage/HealthPage.tsx
index 78fec76580058..1b62186c9160d 100644
--- a/site/src/pages/HealthPage/HealthPage.tsx
+++ b/site/src/pages/HealthPage/HealthPage.tsx
@@ -1,5 +1,5 @@
 import Box from "@mui/material/Box";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getHealth } from "api/api";
 import { Loader } from "components/Loader/Loader";
 import { useTab } from "hooks";
diff --git a/site/src/pages/SetupPage/SetupPage.tsx b/site/src/pages/SetupPage/SetupPage.tsx
index b3f733ddf423c..f83b8bbfda265 100644
--- a/site/src/pages/SetupPage/SetupPage.tsx
+++ b/site/src/pages/SetupPage/SetupPage.tsx
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { SetupPageView } from "./SetupPageView";
 import { Navigate } from "react-router-dom";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation } from "react-query";
 import { createFirstUser } from "api/queries/users";
 
 export const SetupPage: FC = () => {
diff --git a/site/src/pages/StarterTemplatePage/StarterTemplatePage.tsx b/site/src/pages/StarterTemplatePage/StarterTemplatePage.tsx
index 3dddb37b1f432..6ab267692e5e3 100644
--- a/site/src/pages/StarterTemplatePage/StarterTemplatePage.tsx
+++ b/site/src/pages/StarterTemplatePage/StarterTemplatePage.tsx
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet-async";
 import { useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import { StarterTemplatePageView } from "./StarterTemplatePageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { templateExamples } from "api/queries/templates";
 
 const StarterTemplatePage: FC = () => {
diff --git a/site/src/pages/StarterTemplatesPage/StarterTemplatesPage.tsx b/site/src/pages/StarterTemplatesPage/StarterTemplatesPage.tsx
index c83e5f73db404..ab0a024a2845f 100644
--- a/site/src/pages/StarterTemplatesPage/StarterTemplatesPage.tsx
+++ b/site/src/pages/StarterTemplatesPage/StarterTemplatesPage.tsx
@@ -3,7 +3,7 @@ import { FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { StarterTemplatesPageView } from "./StarterTemplatesPageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { templateExamples } from "api/queries/templates";
 import { getTemplatesByTag } from "utils/starterTemplates";
 
diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx
index ad4c920828052..f040033f2abeb 100644
--- a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx
@@ -5,7 +5,7 @@ import Button from "@mui/material/Button";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Radio from "@mui/material/Radio";
 import RadioGroup from "@mui/material/RadioGroup";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getTemplateVersionRichParameters } from "api/api";
 import { Template, TemplateVersionParameter } from "api/typesGenerated";
 import { FormSection, VerticalForm } from "components/Form/Form";
diff --git a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx
index e52e2e5d7c673..d5398d7bc3b03 100644
--- a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getPreviousTemplateVersionByName } from "api/api";
 import { TemplateVersion } from "api/typesGenerated";
 import { Loader } from "components/Loader/Loader";
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
index 5b58c5d25aac7..d3ea3d3c9952a 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -2,7 +2,7 @@ import LinearProgress from "@mui/material/LinearProgress";
 import Box from "@mui/material/Box";
 import { styled, useTheme } from "@mui/material/styles";
 import { BoxProps } from "@mui/system";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import {
   ActiveUsersTitle,
   ActiveUserChart,
diff --git a/site/src/pages/TemplatePage/TemplateLayout.tsx b/site/src/pages/TemplatePage/TemplateLayout.tsx
index 1112c636215e2..291f4d8d89229 100644
--- a/site/src/pages/TemplatePage/TemplateLayout.tsx
+++ b/site/src/pages/TemplatePage/TemplateLayout.tsx
@@ -12,7 +12,7 @@ import {
   getTemplateByName,
   getTemplateVersion,
 } from "api/api";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { AuthorizationRequest } from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 
diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
index 7231443a16cc3..69149d336233f 100644
--- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
@@ -3,7 +3,7 @@ import { FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { getTemplatePageTitle } from "../utils";
 import { TemplateSummaryPageView } from "./TemplateSummaryPageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getTemplateVersionResources } from "api/api";
 
 export const TemplateSummaryPage: FC = () => {
diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
index 458fc305bb24a..c46b03360560b 100644
--- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "react-query";
 import { getTemplateVersions, updateActiveTemplateVersion } from "api/api";
 import { getErrorMessage } from "api/errors";
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx
index ca3a125cf84e3..aaef6bddaf659 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "react-query";
 import { updateTemplateMeta } from "api/api";
 import { UpdateTemplateMeta } from "api/typesGenerated";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
index ce90c980a07f2..4792e8a86a1b1 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "react-query";
 import { updateTemplateMeta } from "api/api";
 import { UpdateTemplateMeta } from "api/typesGenerated";
 import { useDashboard } from "components/Dashboard/DashboardProvider";
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
index f1b0c796e3c5a..7e4e5f26b1d93 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
@@ -2,7 +2,7 @@ import { action } from "@storybook/addon-actions";
 import { Meta, StoryObj } from "@storybook/react";
 import { MockTemplate } from "testHelpers/entities";
 import { TemplateSchedulePageView } from "./TemplateSchedulePageView";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "react-query";
 
 const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx b/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx
index fc348626ba6d5..3a69da3dbe710 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx
@@ -7,7 +7,7 @@ import { pageTitle } from "utils/page";
 import { Loader } from "components/Loader/Loader";
 import { Outlet, useParams } from "react-router-dom";
 import { Margins } from "components/Margins/Margins";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { useOrganizationId } from "hooks/useOrganizationId";
 import { templateByName } from "api/queries/templates";
 import { type AuthorizationResponse, type Template } from "api/typesGenerated";
diff --git a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
index db02b3f10b46e..b6abef5773d95 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
@@ -17,7 +17,7 @@ import {
   templateVersionVariables,
   updateActiveTemplateVersion,
 } from "api/queries/templates";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Loader } from "components/Loader/Loader";
 
diff --git a/site/src/pages/TemplateVersionEditorPage/data.ts b/site/src/pages/TemplateVersionEditorPage/data.ts
index 16bea849ceb05..19039d212c7d9 100644
--- a/site/src/pages/TemplateVersionEditorPage/data.ts
+++ b/site/src/pages/TemplateVersionEditorPage/data.ts
@@ -1,4 +1,4 @@
-import { useQuery, UseQueryOptions } from "@tanstack/react-query";
+import { useQuery, UseQueryOptions } from "react-query";
 import { getFile, getTemplateByName, getTemplateVersionByName } from "api/api";
 import { TarReader } from "utils/tar";
 import { createTemplateVersionFileTree } from "utils/templateVersion";
diff --git a/site/src/pages/TemplatesPage/TemplatesPage.tsx b/site/src/pages/TemplatesPage/TemplatesPage.tsx
index e5f2aea83ddb1..80b39c26449c6 100644
--- a/site/src/pages/TemplatesPage/TemplatesPage.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPage.tsx
@@ -5,7 +5,7 @@ import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { TemplatesPageView } from "./TemplatesPageView";
 import { templateExamples, templates } from "api/queries/templates";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 
 export const TemplatesPage: FC = () => {
   const organizationId = useOrganizationId();
diff --git a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
index eca1c71b7a13f..10512591c28b0 100644
--- a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
+++ b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
@@ -4,7 +4,7 @@ import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
 import { Section } from "components/SettingsLayout/Section";
 import { SSHKeysPageView } from "./SSHKeysPageView";
 import { regenerateUserSSHKey, userSSHKey } from "api/queries/sshKeys";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { getErrorMessage } from "api/errors";
 
 export const Language = {
diff --git a/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.tsx b/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.tsx
index 426fef7bb64a7..66f27465571c4 100644
--- a/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.tsx
+++ b/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.tsx
@@ -4,7 +4,7 @@ import { Section } from "components/SettingsLayout/Section";
 import { ScheduleForm } from "./ScheduleForm";
 import { useMe } from "hooks/useMe";
 import { Loader } from "components/Loader/Loader";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import {
   updateUserQuietHoursSchedule,
   userQuietHoursSchedule,
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx
index 0589f26c041f7..5d06b74f13d43 100644
--- a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx
+++ b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx
@@ -2,7 +2,7 @@ import { useMe } from "hooks/useMe";
 import { ComponentProps, FC } from "react";
 import { Section } from "components/SettingsLayout/Section";
 import { SecurityForm } from "./SettingsSecurityForm";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "react-query";
 import { getUserLoginType } from "api/api";
 import {
   SingleSignOnSection,
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
index e2f191dc59256..2fed4ee0ebe73 100644
--- a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
+++ b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
@@ -14,7 +14,7 @@ import {
   UserLoginType,
 } from "api/typesGenerated";
 import { Stack } from "components/Stack/Stack";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation } from "react-query";
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
 import { getErrorMessage } from "api/errors";
 import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined";
diff --git a/site/src/pages/UserSettingsPage/TokensPage/ConfirmDeleteDialog.stories.tsx b/site/src/pages/UserSettingsPage/TokensPage/ConfirmDeleteDialog.stories.tsx
index 01f4092c16756..878109108ad09 100644
--- a/site/src/pages/UserSettingsPage/TokensPage/ConfirmDeleteDialog.stories.tsx
+++ b/site/src/pages/UserSettingsPage/TokensPage/ConfirmDeleteDialog.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { MockToken } from "testHelpers/entities";
 import { ConfirmDeleteDialog } from "./ConfirmDeleteDialog";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "react-query";
 
 const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/site/src/pages/UserSettingsPage/TokensPage/hooks.ts b/site/src/pages/UserSettingsPage/TokensPage/hooks.ts
index 39d57ec6fb260..923dbda0d8d24 100644
--- a/site/src/pages/UserSettingsPage/TokensPage/hooks.ts
+++ b/site/src/pages/UserSettingsPage/TokensPage/hooks.ts
@@ -1,9 +1,4 @@
-import {
-  useQuery,
-  useMutation,
-  useQueryClient,
-  QueryKey,
-} from "@tanstack/react-query";
+import { useQuery, useMutation, useQueryClient, QueryKey } from "react-query";
 import { getTokens, deleteToken } from "api/api";
 import { TokensFilter } from "api/typesGenerated";
 
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
index e8db8c31f91dc..c6c3e2ba19919 100644
--- a/site/src/pages/UsersPage/UsersPage.tsx
+++ b/site/src/pages/UsersPage/UsersPage.tsx
@@ -13,7 +13,7 @@ import { UsersPageView } from "./UsersPageView";
 import { useStatusFilterMenu } from "./UsersFilter";
 import { useFilter } from "components/Filter/filter";
 import { useDashboard } from "components/Dashboard/DashboardProvider";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { roles } from "api/queries/roles";
 import { deploymentConfig } from "api/queries/deployment";
 import { prepareQuery } from "utils/filters";
diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
index 1d8707026799f..18264239e4d41 100644
--- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
+++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
@@ -3,7 +3,7 @@ import { Helmet } from "react-helmet-async";
 import { useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import { WorkspaceBuildPageView } from "./WorkspaceBuildPageView";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getWorkspaceBuilds } from "api/api";
 import dayjs from "dayjs";
 import { workspaceBuildByNumber } from "api/queries/workspaceBuilds";
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
index 04893665e1a4b..0b106af0890fc 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
@@ -2,7 +2,7 @@ import ExpandMoreOutlined from "@mui/icons-material/ExpandMoreOutlined";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Popover from "@mui/material/Popover";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { getWorkspaceParameters } from "api/api";
 import {
   TemplateVersionParameter,
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
index 53487210ca453..2c8dc3d8b9d7d 100644
--- a/site/src/pages/WorkspacePage/WorkspacePage.tsx
+++ b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -10,7 +10,7 @@ import { useOrganizationId } from "hooks";
 import { isAxiosError } from "axios";
 import { Margins } from "components/Margins/Margins";
 import { workspaceQuota } from "api/queries/workspaceQuota";
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useInfiniteQuery, useQuery } from "react-query";
 import { infiniteWorkspaceBuilds } from "api/queries/workspaceBuilds";
 
 export const WorkspacePage: FC = () => {
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
index 7daeb934c95e0..f332ea78500f2 100644
--- a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -22,7 +22,7 @@ import {
 } from "xServices/workspace/workspaceXService";
 import { UpdateBuildParametersDialog } from "./UpdateBuildParametersDialog";
 import { ChangeVersionDialog } from "./ChangeVersionDialog";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "react-query";
 import { restartWorkspace } from "api/api";
 import {
   ConfirmDialog,
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
index 6cfe3b80f9ba5..e92c220585396 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
@@ -2,7 +2,7 @@ import { getWorkspaceParameters, postWorkspaceBuild } from "api/api";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
 import { useWorkspaceSettings } from "../WorkspaceSettingsLayout";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "react-query";
 import { Loader } from "components/Loader/Loader";
 import {
   WorkspaceParametersFormValues,
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
index db62003b32922..4c2acb973e178 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -23,7 +23,7 @@ import {
   formValuesToTTLRequest,
 } from "./formToRequest";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
-import { useQueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "react-query";
 
 const getAutostart = (workspace: TypesGen.Workspace) =>
   scheduleToAutostart(workspace.autostart_schedule);
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
index 21e7f994e9224..1a391e6ec44b0 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
@@ -8,7 +8,7 @@ import { Loader } from "components/Loader/Loader";
 import { Outlet, useParams } from "react-router-dom";
 import { Margins } from "components/Margins/Margins";
 import { workspaceByOwnerAndName } from "api/queries/workspace";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { type Workspace } from "api/typesGenerated";
 
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
index 2ce2639d9e383..38b65eeacf6ec 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
@@ -3,7 +3,7 @@ import { useNavigate, useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import { useWorkspaceSettings } from "./WorkspaceSettingsLayout";
 import { WorkspaceSettingsPageView } from "./WorkspaceSettingsPageView";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation } from "react-query";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 import { patchWorkspace } from "api/api";
 import { WorkspaceSettingsFormValues } from "./WorkspaceSettingsForm";
diff --git a/site/src/pages/WorkspacesPage/WorkspacesButton.tsx b/site/src/pages/WorkspacesPage/WorkspacesButton.tsx
index ae388a45b1ad1..550d344e82293 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesButton.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesButton.tsx
@@ -3,7 +3,7 @@ import { useTheme } from "@emotion/react";
 import { Language } from "./WorkspacesPageView";
 
 import { type Template } from "api/typesGenerated";
-import { type UseQueryResult } from "@tanstack/react-query";
+import { type UseQueryResult } from "react-query";
 
 import { Link as RouterLink } from "react-router-dom";
 import Box from "@mui/system/Box";
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
index 385cc2e1d8602..af2bc502efbb3 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -19,7 +19,7 @@ import TextField from "@mui/material/TextField";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { getErrorMessage } from "api/errors";
 import { useEffectEvent } from "hooks/hookPolyfills";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery } from "react-query";
 import { templates } from "api/queries/templates";
 
 function useSafeSearchParams() {
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
index 81bdaddc5450c..44d16701d5e03 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -19,7 +19,7 @@ import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import DeleteOutlined from "@mui/icons-material/DeleteOutlined";
 import { WorkspacesButton } from "./WorkspacesButton";
-import { UseQueryResult } from "@tanstack/react-query";
+import { UseQueryResult } from "react-query";
 
 export const Language = {
   pageTitle: "Workspaces",
diff --git a/site/src/pages/WorkspacesPage/data.ts b/site/src/pages/WorkspacesPage/data.ts
index 5a4c10b825e2d..8bbda6c41780b 100644
--- a/site/src/pages/WorkspacesPage/data.ts
+++ b/site/src/pages/WorkspacesPage/data.ts
@@ -1,9 +1,4 @@
-import {
-  QueryKey,
-  useMutation,
-  useQuery,
-  useQueryClient,
-} from "@tanstack/react-query";
+import { QueryKey, useMutation, useQuery, useQueryClient } from "react-query";
 import { getWorkspaces, updateWorkspaceVersion } from "api/api";
 import { getErrorMessage } from "api/errors";
 import {