diff --git a/src/components/TabGroup/TabGroup.module.css b/src/components/TabGroup/TabGroup.module.css
index 729c6ed58..376297e3f 100644
--- a/src/components/TabGroup/TabGroup.module.css
+++ b/src/components/TabGroup/TabGroup.module.css
@@ -107,7 +107,8 @@
   flex-shrink: 0;
   position: relative;
   overflow: hidden;
-  /* border-radius: 0.125rem; */
+  border-top-left-radius: calc(var(--eds-theme-border-radius-objects-sm) * 1px);
+  border-top-right-radius: calc(var(--eds-theme-border-radius-objects-sm) * 1px);
 
   &.eds-is-active {
     font-weight: 500;
@@ -199,8 +200,8 @@
   }
 
   .tabs--has-divider & {
-    border-top-left-radius: 0.125rem;
-    border-top-right-radius: 0.125rem;
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
   }
diff --git a/src/components/TabGroup/TabGroup.stories.tsx b/src/components/TabGroup/TabGroup.stories.tsx
index 5f831f00a..41687dd40 100644
--- a/src/components/TabGroup/TabGroup.stories.tsx
+++ b/src/components/TabGroup/TabGroup.stories.tsx
@@ -236,289 +236,6 @@ export const WithTabIllustrations: StoryObj<Args> = {
   },
 };
 
-const IconTab = ({ isActive, title }: { isActive: boolean; title: string }) => (
-  <div className="flex flex-col items-center">
-    <div className="fpo h-16 w-16"></div>
-    <Text className="pt-2" preset="caption-lg">{`${
-      isActive ? '●' : '◦'
-    } ${title}`}</Text>
-  </div>
-);
-
-/**
- * If you require advanced control over the tab content, you can use a render prop and `Tab.Button` to
- * handle the inputs for each tab. This should only be used sparingly.
- */
-export const CustomTabGroup: StoryObj<Args> = {
-  decorators: [(Story) => <div className="p-8">{Story()}</div>],
-  parameters: {
-    docs: {
-      source: {
-        code: `
-<TabGroup>
-  <TabGroup.Tab title="Tab Title 1">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 1
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-
-  <TabGroup.Tab title="Tab Title 2">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 2
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-
-  <TabGroup.Tab title="Tab Title 3">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 3
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-
-  <TabGroup.Tab title="Tab Title 4">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 4
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-
-  <TabGroup.Tab title="Tab Title 5">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 5
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-
-  <TabGroup.Tab title="Tab Title 6">
-    <TabGroup.Tab.Button>
-      {({ isActive, title }) => (
-        <IconTab
-          icon={active ? 'person' : 'people'}
-          isActive={isActive}
-          title={title}
-        />
-      )}
-    </TabGroup.Tab.Button>
-    <div className="max-w-xl">
-      <Heading className="mb-6" size="h3">
-        Tab 6
-      </Heading>
-      <Text>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-        enim ad minim veniam, quis nostrud exercitation ullamco laboris
-        nisi ut aliquip ex{' '}
-      </Text>
-    </div>
-  </TabGroup.Tab>
-</TabGroup>
-        `,
-      },
-    },
-  },
-  args: {
-    children: (
-      <>
-        <TabGroup.Tab title="Tab Title 1">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 1
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-
-        <TabGroup.Tab title="Tab Title 2">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 2
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-
-        <TabGroup.Tab title="Tab Title 3">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 3
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-
-        <TabGroup.Tab title="Tab Title 4">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 4
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-
-        <TabGroup.Tab title="Tab Title 5">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 5
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-
-        <TabGroup.Tab title="Tab Title 6">
-          <TabGroup.Tab.Button>
-            {({ isActive, title }) => (
-              <IconTab isActive={isActive} title={title} />
-            )}
-          </TabGroup.Tab.Button>
-          <div className="max-w-xl">
-            <Heading as="h3" className="mb-6">
-              Tab 6
-            </Heading>
-            <Text>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-              enim ad minim veniam, quis nostrud exercitation ullamco laboris
-              nisi ut aliquip ex{' '}
-            </Text>
-          </div>
-        </TabGroup.Tab>
-      </>
-    ),
-  },
-};
-
 /**
  * For Chromatic visual regression testing of the masks on both sides of the TabGroup. Currently does not work properly on local.
  */
diff --git a/src/components/TabGroup/__snapshots__/TabGroup.test.tsx.snap b/src/components/TabGroup/__snapshots__/TabGroup.test.tsx.snap
index 1c67e71a3..8c69a7498 100644
--- a/src/components/TabGroup/__snapshots__/TabGroup.test.tsx.snap
+++ b/src/components/TabGroup/__snapshots__/TabGroup.test.tsx.snap
@@ -120,236 +120,6 @@ exports[`<TabGroup /> Centered story renders snapshot 1`] = `
 </div>
 `;
 
-exports[`<TabGroup /> CustomTabGroup story renders snapshot 1`] = `
-<div
-  class="p-8"
->
-  <div
-    class="tabs"
-  >
-    <div
-      class="tabs__header"
-    >
-      <ul
-        class="tabs__list tabs--has-divider"
-        role="tablist"
-      >
-        <li
-          class="tabs__item eds-is-active"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="true"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-1"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ● Tab Title 1
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-        <li
-          class="tabs__item"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="false"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-2"
-            role="tab"
-            tabindex="-1"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ◦ Tab Title 2
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-        <li
-          class="tabs__item"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="false"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-3"
-            role="tab"
-            tabindex="-1"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ◦ Tab Title 3
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-        <li
-          class="tabs__item"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="false"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-4"
-            role="tab"
-            tabindex="-1"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ◦ Tab Title 4
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-        <li
-          class="tabs__item"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="false"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-5"
-            role="tab"
-            tabindex="-1"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ◦ Tab Title 5
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-        <li
-          class="tabs__item"
-          role="presentation"
-        >
-          <a
-            aria-controls=":ra:"
-            aria-selected="false"
-            class="tabs__link"
-            href="#:ra:"
-            id=":rb:-Tab-Title-6"
-            role="tab"
-            tabindex="-1"
-          >
-            <div
-              class="flex flex-col items-center"
-            >
-              <div
-                class="fpo h-16 w-16"
-              />
-              <p
-                class="text text--caption-lg pt-2"
-              >
-                ◦ Tab Title 6
-              </p>
-            </div>
-            <div
-              aria-hidden="true"
-              class="tab__highlight"
-            />
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <div
-        aria-hidden="false"
-        aria-labelledby=":rb:-Tab-Title-1"
-        id=":ra:"
-        role="tabpanel"
-      >
-        <div
-          class="max-w-xl"
-        >
-          <h3
-            class="heading heading--headline-sm mb-6"
-          >
-            Tab 1
-          </h3>
-          <p
-            class="text text--body-md"
-          >
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
-             
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`<TabGroup /> Default story renders snapshot 1`] = `
 <div
   class="tabs"
diff --git a/src/index.ts b/src/index.ts
index 256fe205f..5cc12cd8c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -68,7 +68,7 @@ export { default as PageNotificationV2 } from './components/PageNotification';
 export { PopoverListItemV2 } from './components/PopoverListItem';
 export { RadioV2 } from './components/Radio';
 export { SelectV2 } from './components/Select';
-export { default as TabGroup } from './components/TabGroup'; // TODO-AH: rename to V2
+export { default as TabGroupV2 } from './components/TabGroup';
 export { TextareaFieldV2 } from './components/TextareaField';
 export { ToastV2 } from './components/Toast';
 export { TooltipV2 } from './components/Tooltip';