diff --git a/apps/site/components/Common/LinkTabs.tsx b/apps/site/components/Common/LinkTabs.tsx
index 60c9c4d716668..f27904eaed6db 100644
--- a/apps/site/components/Common/LinkTabs.tsx
+++ b/apps/site/components/Common/LinkTabs.tsx
@@ -1,15 +1,11 @@
-'use client';
-
 import BaseLinkTabs from '@node-core/ui-components/Common/BaseLinkTabs';
 import type { LinkTabsProps } from '@node-core/ui-components/Common/BaseLinkTabs';
 import type { FC } from 'react';
 
 import Link from '#site/components/Link';
-import { useRouter } from '#site/navigation.mjs';
 
-const LinkTabs: FC<Omit<LinkTabsProps, 'as' | 'onSelect'>> = props => {
-  const { push } = useRouter();
-  return <BaseLinkTabs onSelect={value => push(value)} as={Link} {...props} />;
+const LinkTabs: FC<Omit<LinkTabsProps, 'as'>> = props => {
+  return <BaseLinkTabs as={Link} {...props} />;
 };
 
 export default LinkTabs;
diff --git a/apps/site/components/Common/Supporters/index.tsx b/apps/site/components/Common/Supporters/index.tsx
index 67f985b91c466..63e01509efe63 100644
--- a/apps/site/components/Common/Supporters/index.tsx
+++ b/apps/site/components/Common/Supporters/index.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import Avatar from '@node-core/ui-components/Common/AvatarGroup/Avatar';
 import type { FC } from 'react';
 
diff --git a/apps/site/components/Downloads/DownloadButton/index.tsx b/apps/site/components/Downloads/DownloadButton/index.tsx
index 54d77889e85bc..c280f2d8f83ac 100644
--- a/apps/site/components/Downloads/DownloadButton/index.tsx
+++ b/apps/site/components/Downloads/DownloadButton/index.tsx
@@ -1,11 +1,9 @@
-'use client';
-
 import { CloudArrowDownIcon } from '@heroicons/react/24/outline';
 import classNames from 'classnames';
 import type { FC, PropsWithChildren } from 'react';
 
+import { getClientContext } from '#site/client-context';
 import Button from '#site/components/Common/Button';
-import { useClientContext } from '#site/hooks';
 import type { NodeRelease } from '#site/types';
 import { getNodeDownloadUrl } from '#site/util/url';
 import { getUserPlatform } from '#site/util/userAgent';
@@ -18,7 +16,7 @@ const DownloadButton: FC<PropsWithChildren<DownloadButtonProps>> = ({
   release: { versionWithPrefix },
   children,
 }) => {
-  const { os, bitness, architecture } = useClientContext();
+  const { os, bitness, architecture } = getClientContext();
 
   const platform = getUserPlatform(architecture, bitness);
   const downloadLink = getNodeDownloadUrl({ versionWithPrefix, os, platform });
diff --git a/apps/site/components/Downloads/DownloadLink.tsx b/apps/site/components/Downloads/DownloadLink.tsx
index 9dced0f04e026..c5887935d0ff4 100644
--- a/apps/site/components/Downloads/DownloadLink.tsx
+++ b/apps/site/components/Downloads/DownloadLink.tsx
@@ -1,9 +1,7 @@
-'use client';
-
 import type { FC, PropsWithChildren } from 'react';
 
+import { getClientContext } from '#site/client-context';
 import LinkWithArrow from '#site/components/Common/LinkWithArrow';
-import { useClientContext } from '#site/hooks';
 import type { DownloadKind, NodeRelease } from '#site/types';
 import { getNodeDownloadUrl } from '#site/util/url';
 import { getUserPlatform } from '#site/util/userAgent';
@@ -15,7 +13,7 @@ const DownloadLink: FC<PropsWithChildren<DownloadLinkProps>> = ({
   kind = 'installer',
   children,
 }) => {
-  const { os, bitness, architecture } = useClientContext();
+  const { os, bitness, architecture } = getClientContext();
 
   const platform = getUserPlatform(architecture, bitness);
 
diff --git a/packages/ui-components/src/Common/BaseLinkTabs/index.module.css b/packages/ui-components/src/Common/BaseLinkTabs/index.module.css
index b8375d692a6c6..1163801c4fd52 100644
--- a/packages/ui-components/src/Common/BaseLinkTabs/index.module.css
+++ b/packages/ui-components/src/Common/BaseLinkTabs/index.module.css
@@ -38,13 +38,5 @@
 }
 
 .tabsSelect {
-  @apply sm:visible
-    md:hidden;
-
-  > span {
-    @apply max-xs:flex
-      my-6
-      hidden
-      w-full;
-  }
+  @apply md:hidden;
 }
diff --git a/packages/ui-components/src/Common/BaseLinkTabs/index.tsx b/packages/ui-components/src/Common/BaseLinkTabs/index.tsx
index 81ec353f178c7..fd39e5fd8a234 100644
--- a/packages/ui-components/src/Common/BaseLinkTabs/index.tsx
+++ b/packages/ui-components/src/Common/BaseLinkTabs/index.tsx
@@ -1,9 +1,9 @@
 import type { FC, PropsWithChildren } from 'react';
 
-import Select from '#ui/Common/Select';
 import type { LinkLike } from '#ui/types';
 
 import styles from './index.module.css';
+import StatelessSelect from '../Select/StatelessSelect';
 
 type LinkTab = { key: string; label: string; link: string };
 
@@ -12,7 +12,6 @@ export type LinkTabsProps = PropsWithChildren<{
   tabs: Array<LinkTab>;
   activeTab: string;
   as?: LinkLike;
-  onSelect: (value: string) => void;
 }>;
 
 const BaseLinkTabs: FC<LinkTabsProps> = ({
@@ -21,7 +20,6 @@ const BaseLinkTabs: FC<LinkTabsProps> = ({
   activeTab,
   children,
   as: Component = 'a',
-  onSelect,
 }) => (
   <>
     <div className={styles.tabsList}>
@@ -37,14 +35,12 @@ const BaseLinkTabs: FC<LinkTabsProps> = ({
       ))}
     </div>
 
-    <div className={styles.tabsSelect}>
-      <Select
-        label={label}
-        defaultValue={tabs.find(tab => tab.key === activeTab)?.link}
-        values={tabs.map(tab => ({ label: tab.label, value: tab.link }))}
-        onChange={onSelect}
-      />
-    </div>
+    <StatelessSelect
+      label={label}
+      className={styles.tabsSelect}
+      defaultValue={tabs.find(tab => tab.key === activeTab)?.link}
+      values={tabs.map(tab => ({ label: tab.label, value: tab.link }))}
+    />
 
     {children}
   </>
diff --git a/packages/ui-components/src/Common/Select/index.module.css b/packages/ui-components/src/Common/Select/index.module.css
index 3701d0356eb79..e3b41509c4752 100644
--- a/packages/ui-components/src/Common/Select/index.module.css
+++ b/packages/ui-components/src/Common/Select/index.module.css
@@ -180,7 +180,8 @@
   }
 
   .dropdown {
-    @apply absolute
+    @apply z-99
+      absolute
       left-0
       mt-4;
   }
diff --git a/packages/ui-components/src/Common/Separator/index.tsx b/packages/ui-components/src/Common/Separator/index.tsx
index 2a51b8bd41adc..1d8c193cccb8d 100644
--- a/packages/ui-components/src/Common/Separator/index.tsx
+++ b/packages/ui-components/src/Common/Separator/index.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as SeparatorPrimitive from '@radix-ui/react-separator';
 import classNames from 'classnames';
 import type { FC, ComponentProps } from 'react';
diff --git a/packages/ui-components/src/Containers/NavBar/index.tsx b/packages/ui-components/src/Containers/NavBar/index.tsx
index 6fcc1fd05b35d..b8d1d041918de 100644
--- a/packages/ui-components/src/Containers/NavBar/index.tsx
+++ b/packages/ui-components/src/Containers/NavBar/index.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import Hamburger from '@heroicons/react/24/solid/Bars3Icon';
 import XMark from '@heroicons/react/24/solid/XMarkIcon';
 import * as Label from '@radix-ui/react-label';