diff --git a/packages/css/src/components/tabs/tabs.scss b/packages/css/src/components/tabs/tabs.scss
index 6dbf38fba9..1ee524804f 100644
--- a/packages/css/src/components/tabs/tabs.scss
+++ b/packages/css/src/components/tabs/tabs.scss
@@ -30,42 +30,44 @@
   }
 }
 
-.amsterdam-tabs__link {
-  color: var(--amsterdam-tabs-link-color);
+.amsterdam-tabs__button {
+  background-color: var(--amsterdam-tabs-button-background-color);
+  border: var(--amsterdam-tabs-button-border);
+  color: var(--amsterdam-tabs-button-color);
   cursor: pointer;
   display: inline-block;
-  font-family: var(--amsterdam-tabs-link-font-family);
-  font-size: var(--amsterdam-tabs-link-spacious-font-size);
-  font-weight: var(--amsterdam-tabs-link-font-weight);
-  line-height: var(--amsterdam-tabs-link-spacious-line-height);
-  outline-offset: var(--amsterdam-tabs-link-outline-offset);
-  padding-block: var(--amsterdam-tabs-link-padding-block);
-  padding-inline: var(--amsterdam-tabs-link-padding-inline);
+  font-family: var(--amsterdam-tabs-button-font-family);
+  font-size: var(--amsterdam-tabs-button-spacious-font-size);
+  font-weight: var(--amsterdam-tabs-button-font-weight);
+  line-height: var(--amsterdam-tabs-button-spacious-line-height);
+  outline-offset: var(--amsterdam-tabs-button-outline-offset);
+  padding-block: var(--amsterdam-tabs-button-padding-block);
+  padding-inline: var(--amsterdam-tabs-button-padding-inline);
   position: relative;
   text-decoration: none;
 
-  &:hover:not(.amsterdam-tabs__link--selected, .amsterdam-tabs__link--disabled)::after {
+  &:hover:not(.amsterdam-tabs__button--selected, .amsterdam-tabs__button--disabled)::after {
     background-color: currentColor;
     @extend .amsterdam-tabs-underline;
   }
 
   .amsterdam-theme--compact & {
-    font-size: var(--amsterdam-tabs-link-compact-font-size);
-    line-height: var(--amsterdam-tabs-link-compact-line-height);
+    font-size: var(--amsterdam-tabs-button-compact-font-size);
+    line-height: var(--amsterdam-tabs-button-compact-line-height);
   }
 
-  &:hover:not(.amsterdam-tabs__link--selected, .amsterdam-tabs__link--disabled) {
-    color: var(--amsterdam-tabs-link-hover-color);
+  &:hover:not(.amsterdam-tabs__button--selected, .amsterdam-tabs__button--disabled) {
+    color: var(--amsterdam-tabs-button-hover-color);
   }
 }
 
-.amsterdam-tabs__link--selected {
-  background-color: var(--amsterdam-tabs-link-selected-background-color);
-  color: var(--amsterdam-tabs-link-selected-color);
+.amsterdam-tabs__button--selected {
+  background-color: var(--amsterdam-tabs-button-selected-background-color);
+  color: var(--amsterdam-tabs-button-selected-color);
 }
 
-.amsterdam-tabs__link--disabled {
-  color: var(--amsterdam-tabs-link-disabled-color);
+.amsterdam-tabs__button--disabled {
+  color: var(--amsterdam-tabs-button-disabled-color);
 
   // TODO: Disabled cursor after button refactor
   // cursor: var(--amsterdam-action-disabled-cursor);
diff --git a/packages/react/src/Tabs/Tabs.test.tsx b/packages/react/src/Tabs/Tabs.test.tsx
index 5ad18551f5..3eadac7e9e 100644
--- a/packages/react/src/Tabs/Tabs.test.tsx
+++ b/packages/react/src/Tabs/Tabs.test.tsx
@@ -30,7 +30,7 @@ describe('Tabs', () => {
   })
 
   it('supports ForwardRef in React', () => {
-    const ref = createRef<HTMLElement>()
+    const ref = createRef<HTMLDivElement>()
 
     const { container } = render(<Tabs ref={ref} />)
 
diff --git a/packages/react/src/Tabs/Tabs.tsx b/packages/react/src/Tabs/Tabs.tsx
index c7944b49b8..3b07b5fcdf 100644
--- a/packages/react/src/Tabs/Tabs.tsx
+++ b/packages/react/src/Tabs/Tabs.tsx
@@ -4,9 +4,10 @@
  */
 
 import clsx from 'clsx'
-import { forwardRef, useState, useTransition } from 'react'
+import { createContext, forwardRef, useState } from 'react'
 import type { ForwardedRef, ForwardRefExoticComponent, HTMLAttributes, PropsWithChildren, RefAttributes } from 'react'
-import { TabsLink } from './TabsLink'
+import { TabsButton } from './TabsButton'
+// import TabsContext from './TabsContext'
 import { TabsList } from './TabsList'
 import { TabsPanel } from './TabsPanel'
 
@@ -14,44 +15,42 @@ export type TabsProps = {} & PropsWithChildren<HTMLAttributes<HTMLDivElement>>
 
 type TabsComponent = {
   List: typeof TabsList
-  Link: typeof TabsLink
+  Button: typeof TabsButton
   Panel: typeof TabsPanel
 } & ForwardRefExoticComponent<TabsProps & RefAttributes<HTMLDivElement>>
 
-type TabsIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
+// eslint-disable-next-line no-unused-vars
+export const TabsContext = createContext({ activeTab: 0, updateTab: (_tab: number) => {} })
 
 export const Tabs = forwardRef(
   ({ children, className, ...restProps }: TabsProps, ref: ForwardedRef<HTMLDivElement>) => {
-    const [selectedTab, setSelectedTab] = useState<TabsIndex>(0)
-    const [isPending, startTransition] = useTransition()
-
-    const onTabClick = (tab: TabsIndex) => {
-      startTransition(() => {
-        setSelectedTab(tab)
-      })
+    // const [activeTab] = useState(null)
+    // const [isPending, startTransition] = useTransition()
+    const [activeTab, setActiveTab] = useState(0)
+    const updateTab = (tab: number) => {
+      setActiveTab(tab)
     }
 
     return (
-      <div
-        {...restProps}
-        ref={ref}
-        className={clsx('amsterdam-tabs', isPending && 'amsterdam-tabs--pending', className)}
-      >
-        <TabsList>
-          <TabsLink label="Gegevens" onClick={() => onTabClick(0)} selected={selectedTab === 0} />
-          <TabsLink label="Aanslagen" onClick={() => onTabClick(1)} selected={selectedTab === 1} />
-          <TabsLink label="Bezwaar" onClick={() => onTabClick(2)} selected={selectedTab === 2} />
+      <TabsContext.Provider value={{ activeTab, updateTab }}>
+        <div {...restProps} ref={ref} className={clsx('amsterdam-tabs', className)}>
+          {/* <TabsList>
+          <TabsButton label="Gegevens" onClick={() => onTabClick(0)} selected={activeTab === 0} />
+          <TabsButton label="Aanslagen" onClick={() => onTabClick(1)} selected={activeTab === 1} />
+          <TabsButton label="Bezwaar" onClick={() => onTabClick(2)} selected={activeTab === 2} />
         </TabsList>
-        {selectedTab === 0 && <TabsPanel>Gegevens</TabsPanel>}
-        {selectedTab === 1 && <TabsPanel>Aanslagen</TabsPanel>}
-        {selectedTab === 2 && <TabsPanel>Bezwaar</TabsPanel>}
-        {children}
-      </div>
+        {activeTab === 0 && <TabsPanel>Gegevens</TabsPanel>}
+        {activeTab === 1 && <TabsPanel>Aanslagen</TabsPanel>}
+        {activeTab === 2 && <TabsPanel>Bezwaar</TabsPanel>} */}
+
+          {children}
+        </div>
+      </TabsContext.Provider>
     )
   },
 ) as TabsComponent
 
 Tabs.List = TabsList
-Tabs.Link = TabsLink
+Tabs.Button = TabsButton
 Tabs.Panel = TabsPanel
 Tabs.displayName = 'Tabs'
diff --git a/packages/react/src/Tabs/TabsButton.tsx b/packages/react/src/Tabs/TabsButton.tsx
new file mode 100644
index 0000000000..e03f5f411a
--- /dev/null
+++ b/packages/react/src/Tabs/TabsButton.tsx
@@ -0,0 +1,44 @@
+/**
+ * @license EUPL-1.2+
+ * Copyright (c) 2023 Gemeente Amsterdam
+ */
+
+import clsx from 'clsx'
+import { forwardRef, startTransition, useContext } from 'react'
+import type { ButtonHTMLAttributes, ForwardedRef, PropsWithChildren } from 'react'
+import { TabsContext } from './Tabs'
+// import TabsContext from './TabsContext'
+
+export type TabsButtonProps = {
+  label: string
+  tab: number
+  isDisabled?: boolean
+} & PropsWithChildren<ButtonHTMLAttributes<HTMLButtonElement>>
+
+export const TabsButton = forwardRef(
+  ({ label, tab = 0, className, isDisabled, ...restProps }: TabsButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
+    const { activeTab, updateTab } = useContext(TabsContext)
+
+    return (
+      <button
+        {...restProps}
+        ref={ref}
+        onClick={() => {
+          startTransition(() => {
+            updateTab(tab)
+          })
+        }}
+        className={clsx(
+          'amsterdam-tabs__button',
+          activeTab === tab && 'amsterdam-tabs__button--selected',
+          isDisabled && 'amsterdam-tabs__button--disabled',
+          className,
+        )}
+      >
+        {label}
+      </button>
+    )
+  },
+)
+
+TabsButton.displayName = 'Tabs.Button'
diff --git a/packages/react/src/Tabs/TabsContext.tsx b/packages/react/src/Tabs/TabsContext.tsx
new file mode 100644
index 0000000000..41da503c33
--- /dev/null
+++ b/packages/react/src/Tabs/TabsContext.tsx
@@ -0,0 +1,13 @@
+import { createContext } from 'react'
+
+export type TabsContextValue = {
+  activeTab: number
+}
+
+const defaultValues: TabsContextValue = {
+  activeTab: 0,
+}
+
+const TabsContext = createContext(defaultValues)
+
+export default TabsContext
diff --git a/packages/react/src/Tabs/TabsLink.tsx b/packages/react/src/Tabs/TabsLink.tsx
deleted file mode 100644
index 3c40a4a3d5..0000000000
--- a/packages/react/src/Tabs/TabsLink.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license EUPL-1.2+
- * Copyright (c) 2023 Gemeente Amsterdam
- */
-
-import clsx from 'clsx'
-import { forwardRef } from 'react'
-import type { AnchorHTMLAttributes, ForwardedRef, PropsWithChildren } from 'react'
-
-export type TabsLinkProps = {
-  label: string
-  selected?: boolean
-  isDisabled?: boolean
-} & PropsWithChildren<AnchorHTMLAttributes<HTMLAnchorElement>>
-
-export const TabsLink = forwardRef(
-  ({ label, className, selected, isDisabled, ...restProps }: TabsLinkProps, ref: ForwardedRef<HTMLAnchorElement>) => {
-    return (
-      <a
-        {...restProps}
-        ref={ref}
-        className={clsx(
-          'amsterdam-tabs__link',
-          selected && 'amsterdam-tabs__link--selected',
-          isDisabled && 'amsterdam-tabs__link--disabled',
-          className,
-        )}
-      >
-        {label}
-      </a>
-    )
-  },
-)
-
-TabsLink.displayName = 'Tabs.Link'
diff --git a/packages/react/src/Tabs/TabsPanel.tsx b/packages/react/src/Tabs/TabsPanel.tsx
index 9577d97666..8261ced2a9 100644
--- a/packages/react/src/Tabs/TabsPanel.tsx
+++ b/packages/react/src/Tabs/TabsPanel.tsx
@@ -4,17 +4,28 @@
  */
 
 import clsx from 'clsx'
-import { forwardRef } from 'react'
+import { forwardRef, useContext } from 'react'
 import type { ForwardedRef, HTMLAttributes, PropsWithChildren } from 'react'
+import { TabsContext } from './Tabs'
 
-export type TabsPanelProps = {} & PropsWithChildren<HTMLAttributes<HTMLDivElement>>
+export type TabsPanelProps = {
+  tab: number
+} & PropsWithChildren<HTMLAttributes<HTMLDivElement>>
 
 export const TabsPanel = forwardRef(
-  ({ children, className, ...restProps }: TabsPanelProps, ref: ForwardedRef<HTMLDivElement>) => (
-    <div {...restProps} ref={ref} className={clsx('amsterdam-tabs__panel', className)}>
-      {children}
-    </div>
-  ),
+  ({ tab, children, className, ...restProps }: TabsPanelProps, ref: ForwardedRef<HTMLDivElement>) => {
+    const { activeTab } = useContext(TabsContext)
+
+    if (tab !== activeTab) {
+      return null
+    }
+
+    return (
+      <div {...restProps} ref={ref} className={clsx('amsterdam-tabs__panel', className)}>
+        {children}
+      </div>
+    )
+  },
 )
 
 TabsPanel.displayName = 'Tabs.Panel'
diff --git a/proprietary/tokens/src/components/amsterdam/tabs.tokens.json b/proprietary/tokens/src/components/amsterdam/tabs.tokens.json
index 432f566337..bc1e0d28a5 100644
--- a/proprietary/tokens/src/components/amsterdam/tabs.tokens.json
+++ b/proprietary/tokens/src/components/amsterdam/tabs.tokens.json
@@ -6,7 +6,9 @@
       "list": {
         "border-color": { "value": "{amsterdam.color.primary-blue}" }
       },
-      "link": {
+      "button": {
+        "background-color": { "value": "transparent" },
+        "border": { "value": "none" },
         "color": { "value": "{amsterdam.link-appearance.color}" },
         "font-family": { "value": "{amsterdam.typography.font-family}" },
         "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" },
diff --git a/storybook/storybook-react/src/Tabs/Tabs.stories.tsx b/storybook/storybook-react/src/Tabs/Tabs.stories.tsx
index 7e89035a9a..193339efa0 100644
--- a/storybook/storybook-react/src/Tabs/Tabs.stories.tsx
+++ b/storybook/storybook-react/src/Tabs/Tabs.stories.tsx
@@ -3,9 +3,9 @@
  * Copyright (c) 2023 Gemeente Amsterdam
  */
 
-import { Tabs } from '@amsterdam/design-system-react'
+import { Heading, Paragraph, Tabs } from '@amsterdam/design-system-react'
 import { Meta, StoryObj } from '@storybook/react'
-// import { exampleParagraph } from '../shared/exampleContent'
+import { exampleParagraph } from '../shared/exampleContent'
 
 const meta = {
   title: 'Navigation/Tabs',
@@ -20,20 +20,16 @@ const meta = {
 export default meta
 
 const tabMeta = {
-  component: Tabs.Link,
+  component: Tabs.Button,
   args: {
     label: 'Gegevens',
-    href: '#',
   },
   argTypes: {
     label: {
       control: { type: 'text' },
     },
-    href: {
-      control: { type: 'text' },
-    },
-    selected: {
-      control: { type: 'boolean' },
+    key: {
+      control: { type: 'number', min: 0, max: 9 },
     },
     isDisabled: {
       control: { type: 'boolean' },
@@ -46,48 +42,49 @@ const tabMeta = {
       </Tabs>
     ),
   ],
-} satisfies Meta<typeof Tabs.Link>
+} satisfies Meta<typeof Tabs.Button>
 
 type Story = StoryObj<typeof meta>
 type TabStory = StoryObj<typeof tabMeta>
 
 const StoryTemplate: Story = {
   args: {
-    // children: [
-    //   <>
-    //     <Tabs.List>
-    //       <Tabs.Link label="Gegevens" href="#" />
-    //       <Tabs.Link label="Aanslagen" href="#" />
-    //       <Tabs.Link label="Documenten" href="#" />
-    //       <Tabs.Link label="Acties" href="#" isDisabled />
-    //     </Tabs.List>
-    //     <Tabs.Panel>
-    //       <Heading level={3}>Gegevens</Heading>
-    //       <Paragraph>{exampleParagraph()}</Paragraph>
-    //     </Tabs.Panel>
-    //     <Tabs.Panel>
-    //       <Heading level={3}>Aanslagen</Heading>
-    //       <Paragraph>{exampleParagraph()}</Paragraph>
-    //     </Tabs.Panel>
-    //     <Tabs.Panel>
-    //       <Heading level={3}>Documenten</Heading>
-    //       <Paragraph>{exampleParagraph()}</Paragraph>
-    //     </Tabs.Panel>
-    //     <Tabs.Panel>
-    //       <Heading level={3}>Acties</Heading>
-    //       <Paragraph>{exampleParagraph()}</Paragraph>
-    //     </Tabs.Panel>
-    //   </>,
-    // ],
+    children: [
+      <>
+        <Tabs.List>
+          <Tabs.Button tab={0} label="Gegevens" />
+          <Tabs.Button tab={1} label="Aanslagen" />
+          <Tabs.Button tab={2} label="Documenten" />
+          <Tabs.Button tab={3} label="Acties" isDisabled />
+        </Tabs.List>
+        <Tabs.Panel tab={0}>
+          <Heading level={3}>Gegevens</Heading>
+          <Paragraph>{exampleParagraph()}</Paragraph>
+        </Tabs.Panel>
+        <Tabs.Panel tab={1}>
+          <Heading level={3}>Aanslagen</Heading>
+          <Paragraph>{exampleParagraph()}</Paragraph>
+        </Tabs.Panel>
+        <Tabs.Panel tab={2}>
+          <Heading level={3}>Documenten</Heading>
+          <Paragraph>{exampleParagraph()}</Paragraph>
+        </Tabs.Panel>
+        <Tabs.Panel tab={3}>
+          <Heading level={3}>Acties</Heading>
+          <Paragraph>{exampleParagraph()}</Paragraph>
+        </Tabs.Panel>
+      </>,
+    ],
   },
 }
 
 const TabStoryTemplate: TabStory = {
   args: {
     label: 'Gegevens',
-    href: '#',
+    tab: 1,
+    isDisabled: false,
   },
-  render: ({ ...args }) => <Tabs.Link {...args} />,
+  render: ({ ...args }) => <Tabs.Button {...args} />,
 }
 
 export const Default: Story = {