diff --git a/web/oss/src/components/DeploymentsDashboard/components/Drawer/assets/DrawerDetails.tsx b/web/oss/src/components/DeploymentsDashboard/components/Drawer/assets/DrawerDetails.tsx
index c4400953b6..74637595e3 100644
--- a/web/oss/src/components/DeploymentsDashboard/components/Drawer/assets/DrawerDetails.tsx
+++ b/web/oss/src/components/DeploymentsDashboard/components/Drawer/assets/DrawerDetails.tsx
@@ -81,14 +81,14 @@ const DrawerDetails = ({revisionId}: DrawerDetailsProps) => {
 
             <div className="flex flex-col">
                 <Typography.Text className={classes.subTitle}>Date modified</Typography.Text>
-                <Tag bordered={false} className="w-fit bg-[#0517290f]">
+                <Tag variant="filled" className="w-fit bg-[#0517290f]">
                     {record?.created_at}
                 </Tag>
             </div>
 
             <div className="flex flex-col">
                 <Typography.Text className={classes.subTitle}>Modified by</Typography.Text>
-                <Tag bordered={false} className="w-fit bg-[#0517290f]">
+                <Tag variant="filled" className="w-fit bg-[#0517290f]">
                     {record?.modified_by}
                 </Tag>
             </div>
@@ -96,7 +96,7 @@ const DrawerDetails = ({revisionId}: DrawerDetailsProps) => {
             {record?.commit_message && (
                 <div className="flex flex-col">
                     <Typography.Text className={classes.subTitle}>Notes</Typography.Text>
-                    <Tag bordered={false} className="w-fit bg-[#0517290f]">
+                    <Tag variant="filled" className="w-fit bg-[#0517290f]">
                         {record?.commit_message}
                     </Tag>
                 </div>
diff --git a/web/oss/src/components/EvalRunDetails/components/FocusDrawerHeader.tsx b/web/oss/src/components/EvalRunDetails/components/FocusDrawerHeader.tsx
index 401bb10827..03116aff9e 100644
--- a/web/oss/src/components/EvalRunDetails/components/FocusDrawerHeader.tsx
+++ b/web/oss/src/components/EvalRunDetails/components/FocusDrawerHeader.tsx
@@ -167,7 +167,7 @@ const FocusDrawerHeader = ({runId, scenarioId, onScenarioChange}: FocusDrawerHea
                 />
             </div>
             {selectedOption?.description ? (
-                <Tag bordered={false} className="bg-[#0517290F] font-normal">
+                <Tag variant="filled" className="bg-[#0517290F] font-normal">
                     <Typography.Text copyable={{text: selectedOption.description}}>
                         {selectedOption.description}
                     </Typography.Text>
diff --git a/web/oss/src/components/EvalRunDetails/components/views/ConfigurationView/components/EvaluatorSection.tsx b/web/oss/src/components/EvalRunDetails/components/views/ConfigurationView/components/EvaluatorSection.tsx
index 65e50101d9..4877751e5c 100644
--- a/web/oss/src/components/EvalRunDetails/components/views/ConfigurationView/components/EvaluatorSection.tsx
+++ b/web/oss/src/components/EvalRunDetails/components/views/ConfigurationView/components/EvaluatorSection.tsx
@@ -184,7 +184,7 @@ const EvaluatorCard = ({
                                         />
                                     ) : null}
                                     {evaluator.version ? (
-                                        <Tag className="!m-0 !bg-[#0517290F]" bordered={false}>
+                                        <Tag className="!m-0 !bg-[#0517290F]" variant="filled">
                                             V{evaluator.version}
                                         </Tag>
                                     ) : null}
diff --git a/web/oss/src/components/EvalRunDetails/components/views/SingleScenarioViewerPOC/ScenarioNavigator.tsx b/web/oss/src/components/EvalRunDetails/components/views/SingleScenarioViewerPOC/ScenarioNavigator.tsx
index 6c4614f5a0..62e2641f52 100644
--- a/web/oss/src/components/EvalRunDetails/components/views/SingleScenarioViewerPOC/ScenarioNavigator.tsx
+++ b/web/oss/src/components/EvalRunDetails/components/views/SingleScenarioViewerPOC/ScenarioNavigator.tsx
@@ -150,7 +150,7 @@ const ScenarioNavigator = ({
                 />
             </div>
             {showScenarioIdTag && selectedOption?.description ? (
-                <Tag bordered={false} className="bg-[#0517290F] font-normal">
+                <Tag variant="filled" className="bg-[#0517290F] font-normal">
                     <Typography.Text copyable={{text: selectedOption.description}}>
                         {selectedOption.description}
                     </Typography.Text>
diff --git a/web/oss/src/components/Evaluators/assets/cells/EvaluatorTagsCell.tsx b/web/oss/src/components/Evaluators/assets/cells/EvaluatorTagsCell.tsx
index b2f0dddcae..27da8bd361 100644
--- a/web/oss/src/components/Evaluators/assets/cells/EvaluatorTagsCell.tsx
+++ b/web/oss/src/components/Evaluators/assets/cells/EvaluatorTagsCell.tsx
@@ -8,7 +8,7 @@ const EvaluatorTagsCell = memo(({tags}: {tags: string[]}) => {
     return (
         <div className="flex flex-nowrap items-center gap-2">
             {tags.map((tag) => (
-                <Tag key={tag} bordered={false} className="bg-[#0517290F]">
+                <Tag key={tag} variant="filled" className="bg-[#0517290F]">
                     {tag}
                 </Tag>
             ))}
diff --git a/web/oss/src/components/Evaluators/components/SelectEvaluatorModal/assets/SelectEvaluatorModalContent/index.tsx b/web/oss/src/components/Evaluators/components/SelectEvaluatorModal/assets/SelectEvaluatorModalContent/index.tsx
index 0315fbc5f3..7193ef17f4 100644
--- a/web/oss/src/components/Evaluators/components/SelectEvaluatorModal/assets/SelectEvaluatorModalContent/index.tsx
+++ b/web/oss/src/components/Evaluators/components/SelectEvaluatorModal/assets/SelectEvaluatorModalContent/index.tsx
@@ -92,7 +92,7 @@ const SelectEvaluatorModalContent = () => {
                             )}
                         >
                             <div className="flex items-center gap-2">
-                                <Tag bordered={false} className={clsx("w-fit", tagClassnames)}>
+                                <Tag variant="filled" className={clsx("w-fit", tagClassnames)}>
                                     {item.name}
                                 </Tag>
                                 <ArrowRight
diff --git a/web/oss/src/components/Filters/Filters.tsx b/web/oss/src/components/Filters/Filters.tsx
index 5343655352..c07fa8787d 100644
--- a/web/oss/src/components/Filters/Filters.tsx
+++ b/web/oss/src/components/Filters/Filters.tsx
@@ -7,6 +7,7 @@ import {
     PlusIcon,
     TrashIcon,
 } from "@phosphor-icons/react"
+import type {TreeSelectProps} from "antd"
 import {
     Button,
     Divider,
@@ -1313,7 +1314,7 @@ const Filters: React.FC<Props> = ({
                                                                 className="w-[260px]"
                                                                 treeData={treeData}
                                                                 treeNodeLabelProp="pathLabel"
-                                                                dropdownMatchSelectWidth={false}
+                                                                popupMatchSelectWidth={false}
                                                                 styles={{
                                                                     popup: {
                                                                         root: {
diff --git a/web/oss/src/components/ModelRegistry/Modals/ConfigureProviderModal/assets/ConfigureProviderModalContent.tsx b/web/oss/src/components/ModelRegistry/Modals/ConfigureProviderModal/assets/ConfigureProviderModalContent.tsx
index e4c8ea70c1..854672fc13 100644
--- a/web/oss/src/components/ModelRegistry/Modals/ConfigureProviderModal/assets/ConfigureProviderModalContent.tsx
+++ b/web/oss/src/components/ModelRegistry/Modals/ConfigureProviderModal/assets/ConfigureProviderModalContent.tsx
@@ -16,7 +16,7 @@ const ConfigureProviderModalContent = ({
         <div className="flex flex-col gap-4">
             <div className="flex flex-col items-start gap-1">
                 <Text>Provider</Text>
-                <Tag bordered={false} color="default" className="bg-[#0517290F] px-2 py-[1px]">
+                <Tag variant="filled" color="default" className="bg-[#0517290F] px-2 py-[1px]">
                     {selectedProvider?.title}
                 </Tag>
             </div>
diff --git a/web/oss/src/components/Playground/Components/PlaygroundGenerations/assets/GenerationResultUtils/index.tsx b/web/oss/src/components/Playground/Components/PlaygroundGenerations/assets/GenerationResultUtils/index.tsx
index a8f961faf2..4fb4371715 100644
--- a/web/oss/src/components/Playground/Components/PlaygroundGenerations/assets/GenerationResultUtils/index.tsx
+++ b/web/oss/src/components/Playground/Components/PlaygroundGenerations/assets/GenerationResultUtils/index.tsx
@@ -45,7 +45,7 @@ const GenerationResultUtils: React.FC<GenerationResultUtilsProps> = ({
             {showStatus && <StatusRenderer status={status} />}
 
             {durations ? (
-                <Tag color="default" bordered={false} className="flex items-center gap-1">
+                <Tag color="default" variant="filled" className="flex items-center gap-1">
                     <Timer size={14} /> {formattedLatency}
                 </Tag>
             ) : null}
@@ -53,7 +53,7 @@ const GenerationResultUtils: React.FC<GenerationResultUtilsProps> = ({
             {tokens || costs ? (
                 <ResultTag
                     color="default"
-                    bordered={false}
+                    variant="filled"
                     value1={
                         <div className="flex items-center gap-1 text-nowrap">
                             <PlusCircle size={14} /> {formattedTokens} / {formattedCosts}
diff --git a/web/oss/src/components/Playground/Components/PlaygroundPromptComparisonView/PromptComparisonVariantNavigation/assets/VariantNavigationCard/index.tsx b/web/oss/src/components/Playground/Components/PlaygroundPromptComparisonView/PromptComparisonVariantNavigation/assets/VariantNavigationCard/index.tsx
index 2e366309d3..ad8b2c46de 100644
--- a/web/oss/src/components/Playground/Components/PlaygroundPromptComparisonView/PromptComparisonVariantNavigation/assets/VariantNavigationCard/index.tsx
+++ b/web/oss/src/components/Playground/Components/PlaygroundPromptComparisonView/PromptComparisonVariantNavigation/assets/VariantNavigationCard/index.tsx
@@ -15,9 +15,9 @@ import {runStatusByRowRevisionAtom} from "@/oss/state/generation/entities"
 
 import Version from "../../../../../assets/Version"
 import {
-    variantByRevisionIdAtomFamily,
-    generationResultAtomFamily,
     appChatModeAtom,
+    generationResultAtomFamily,
+    variantByRevisionIdAtomFamily,
 } from "../../../../../state/atoms"
 
 import {useStyles} from "./styles"
@@ -172,13 +172,13 @@ const VariantNavigationCard = ({
                 </div>
                 <div className="flex items-center justify-between">
                     <Text>Average Latency</Text>
-                    <Tag color="default" bordered={false} className="flex items-center gap-1">
+                    <Tag color="default" variant="filled" className="flex items-center gap-1">
                         <Timer size={14} /> {avgLatency}
                     </Tag>
                 </div>
                 <div className="flex items-center justify-between">
                     <Text>Average Cost</Text>
-                    <Tag color="default" bordered={false} className="flex items-center gap-1">
+                    <Tag color="default" variant="filled" className="flex items-center gap-1">
                         <PlusCircle size={14} /> {avgTokens} / {avgCost}
                     </Tag>
                 </div>
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/LinkedSpansTabItem/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/LinkedSpansTabItem/index.tsx
index 2e5eb3db1e..b712762301 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/LinkedSpansTabItem/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/LinkedSpansTabItem/index.tsx
@@ -91,7 +91,7 @@ const LinkedSpansTabItem = ({isActive: _isActive}: LinkedSpansTabItemProps) => {
                 return (
                     <EnhancedTooltip copyText={spanId} title="Copy span id">
                         <Tag
-                            bordered={false}
+                            variant="filled"
                             className="font-mono bg-[#0517290F]"
                             onClick={() => navigateToLink(record)}
                         >
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/TraceTypeHeader/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/TraceTypeHeader/index.tsx
index f77d06882b..00d7eb657b 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/TraceTypeHeader/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceContent/components/TraceTypeHeader/index.tsx
@@ -64,7 +64,7 @@ const TraceTypeHeader = ({
                     title="Copy span id"
                     tooltipProps={{placement: "bottom", arrow: true}}
                 >
-                    <Tag className="font-mono truncate bg-[#0517290F]" bordered={false}>
+                    <Tag className="font-mono truncate bg-[#0517290F]" variant="filled">
                         # {activeTrace?.span_id || "-"}
                     </Tag>
                 </TooltipWithCopyAction>
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceHeader/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceHeader/index.tsx
index 6655fdbf7a..163aad672c 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceHeader/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceHeader/index.tsx
@@ -478,7 +478,7 @@ const TraceHeader = ({
                         copyText={getTraceIdFromNode(displayTrace) || ""}
                         title="Copy trace id"
                     >
-                        <Tag className="font-mono bg-[#0517290F]" bordered={false}>
+                        <Tag className="font-mono bg-[#0517290F]" variant="filled">
                             # {getTraceIdFromNode(displayTrace) || "-"}
                         </Tag>
                     </TooltipWithCopyAction>
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceAnnotations/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceAnnotations/index.tsx
index e4dd974cd8..c5b93fdf1e 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceAnnotations/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceAnnotations/index.tsx
@@ -190,7 +190,7 @@ const TraceAnnotations = ({annotations = []}: TraceAnnotationsProps) => {
                                             <Typography.Text>Total mean:</Typography.Text>
                                             <CustomAntdTag
                                                 value={`μ ${metric.average}`}
-                                                bordered={false}
+                                                variant="filled"
                                             />
                                         </Space>
                                         <Button
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceDetails/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceDetails/index.tsx
index 95e1d7df62..3d4c3b2541 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceDetails/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceDetails/index.tsx
@@ -41,7 +41,7 @@ const TraceDetails = ({activeTrace}: {activeTrace: TraceSpanNode}) => {
                         color: color,
                     }}
                     className="font-mono"
-                    bordered={false}
+                    variant="filled"
                     value1={
                         <>
                             {icon} {activeTrace?.span_type}
@@ -55,14 +55,14 @@ const TraceDetails = ({activeTrace}: {activeTrace: TraceSpanNode}) => {
                 <StatusRenderer
                     status={activeTrace?.status_code}
                     message={activeTrace?.status_message}
-                    tagProps={{bordered: false}}
+                    tagProps={{variant: "filled"}}
                 />
             </Space>
 
             <Space orientation="vertical" size={4}>
                 <Typography.Text className={classes.title}>Latency</Typography.Text>
                 <ResultTag
-                    bordered={false}
+                    variant="filled"
                     className="bg-[#0517290F]"
                     value1={
                         <div className={classes.resultTag}>
@@ -77,11 +77,11 @@ const TraceDetails = ({activeTrace}: {activeTrace: TraceSpanNode}) => {
 
                 <ResultTag
                     value1={<div className={classes.resultTag}>Start - {traceStartTime}</div>}
-                    bordered={false}
+                    variant="filled"
                     className="bg-[#0517290F]"
                 />
                 <ResultTag
-                    bordered={false}
+                    variant="filled"
                     className="bg-[#0517290F]"
                     value1={
                         <div className={classes.resultTag}>
@@ -94,7 +94,7 @@ const TraceDetails = ({activeTrace}: {activeTrace: TraceSpanNode}) => {
             <Space orientation="vertical" size={4}>
                 <Typography.Text className={classes.title}>Tokens & Cost</Typography.Text>
                 <ResultTag
-                    bordered={false}
+                    variant="filled"
                     className="bg-[#0517290F]"
                     value1={
                         <div className={classes.resultTag}>
diff --git a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceLinkedSpans/index.tsx b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceLinkedSpans/index.tsx
index 907d681bb5..32e147c6cc 100644
--- a/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceLinkedSpans/index.tsx
+++ b/web/oss/src/components/SharedDrawers/TraceDrawer/components/TraceSidePanel/TraceLinkedSpans/index.tsx
@@ -49,7 +49,7 @@ const TraceLinkedSpans = () => {
                         return (
                             <Tag
                                 key={`${link.trace_id}-${link.span_id}-${link.key || ""}`}
-                                bordered={false}
+                                variant="filled"
                                 className="cursor-pointer self-start bg-[#0517290F] flex gap-1 items-center"
                                 onClick={() => handleNavigate(link)}
                             >
diff --git a/web/oss/src/components/SharedGenerationResultUtils/index.tsx b/web/oss/src/components/SharedGenerationResultUtils/index.tsx
index 833117c33f..cba12aa5b7 100644
--- a/web/oss/src/components/SharedGenerationResultUtils/index.tsx
+++ b/web/oss/src/components/SharedGenerationResultUtils/index.tsx
@@ -269,7 +269,7 @@ const SharedGenerationResultUtils = ({
             {showStatus && status ? <StatusRenderer status={status} /> : null}
 
             {durationMs !== undefined ? (
-                <Tag color="default" bordered={false} className="flex items-center gap-1">
+                <Tag color="default" variant="filled" className="flex items-center gap-1">
                     <Timer size={14} /> {formattedLatency}
                 </Tag>
             ) : null}
@@ -277,7 +277,7 @@ const SharedGenerationResultUtils = ({
             {totalTokens !== undefined || totalCost !== undefined ? (
                 <ResultTag
                     color="default"
-                    bordered={false}
+                    variant="filled"
                     value1={
                         <div className="flex items-center gap-1 text-nowrap">
                             <PlusCircle size={14} /> {formattedTokens} / {formattedCosts}
diff --git a/web/oss/src/components/VariantDetailsWithStatus/components/VariantDetails.tsx b/web/oss/src/components/VariantDetailsWithStatus/components/VariantDetails.tsx
index 07944acd6e..99b3a42b85 100644
--- a/web/oss/src/components/VariantDetailsWithStatus/components/VariantDetails.tsx
+++ b/web/oss/src/components/VariantDetailsWithStatus/components/VariantDetails.tsx
@@ -1,8 +1,8 @@
 // no react hooks needed here beyond Jotai
 
 import {PencilSimpleLine} from "@phosphor-icons/react"
-import {Dropdown, Space, Tag, Typography} from "antd"
 import type {MenuProps} from "antd"
+import {Dropdown, Space, Tag, Typography} from "antd"
 import {useAtomValue, useSetAtom} from "jotai"
 
 import {parametersOverrideAtomFamily} from "@/oss/components/Playground/state/atoms"
@@ -84,7 +84,7 @@ const VariantDetails = ({
             {variantName ? <Typography>{variantName}</Typography> : null}
             {revision !== undefined &&
                 (showRevisionAsTag ? (
-                    <Tag className={`bg-[rgba(5,23,41,0.06)]`} bordered={false}>
+                    <Tag className={`bg-[rgba(5,23,41,0.06)]`} variant="filled">
                         v{revision}
                     </Tag>
                 ) : (
@@ -99,7 +99,7 @@ const VariantDetails = ({
                 >
                     <Tag
                         color="#586673"
-                        bordered={false}
+                        variant="filled"
                         className="flex items-center gap-1 font-normal cursor-pointer"
                     >
                         <PencilSimpleLine size={14} /> Draft
@@ -108,7 +108,7 @@ const VariantDetails = ({
             ) : (
                 isAppLatest &&
                 showLatestTag && (
-                    <Tag className={`bg-[#E6F4FF] text-[#1677FF]`} bordered={false}>
+                    <Tag className={`bg-[#E6F4FF] text-[#1677FF]`} variant="filled">
                         Last modified
                     </Tag>
                 )
diff --git a/web/oss/src/components/VariantNameCell/index.tsx b/web/oss/src/components/VariantNameCell/index.tsx
index 0a1c1a4b7e..22bffdabbf 100644
--- a/web/oss/src/components/VariantNameCell/index.tsx
+++ b/web/oss/src/components/VariantNameCell/index.tsx
@@ -8,8 +8,8 @@ import VariantDetailsWithStatus from "@/oss/components/VariantDetailsWithStatus"
 import type {Variant} from "@/oss/lib/Types"
 import {revisionDeploymentAtomFamily} from "@/oss/state/variant/atoms/fetcher"
 import {
-    variantDisplayNameByIdAtomFamily,
     latestAppRevisionIdAtom,
+    variantDisplayNameByIdAtomFamily,
 } from "@/oss/state/variant/selectors/variant"
 
 type Rev = {
@@ -50,7 +50,7 @@ const VariantNameCell = memo(
 
         if (!rev) {
             return (
-                <Tag color="default" bordered={false} className="-ml-1">
+                <Tag color="default" variant="filled" className="-ml-1">
                     No deployment
                 </Tag>
             )
diff --git a/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/DeploymentDrawerTitle/index.tsx b/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/DeploymentDrawerTitle/index.tsx
index e2291fc262..c6fe8fa28a 100644
--- a/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/DeploymentDrawerTitle/index.tsx
+++ b/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/DeploymentDrawerTitle/index.tsx
@@ -59,7 +59,7 @@ const DeploymentDrawerTitle = ({
                 <div className="flex items-center gap-2">
                     {/*TODO: update this with select variant deployment */}
                     <EnvironmentTagLabel environment={envName || ""} />
-                    <Tag bordered={false} className="bg-[#0517290F]">
+                    <Tag variant="filled" className="bg-[#0517290F]">
                         v{selectedVariant?.revision}
                     </Tag>
                 </div>
diff --git a/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/VariantDrawerContent/index.tsx b/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/VariantDrawerContent/index.tsx
index a951095dae..14067378b8 100644
--- a/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/VariantDrawerContent/index.tsx
+++ b/web/oss/src/components/VariantsComponents/Drawers/VariantDrawer/assets/VariantDrawerContent/index.tsx
@@ -327,7 +327,7 @@ const VariantDrawerContent = ({
 
                 <div className="flex flex-col gap-1">
                     <Text className="font-medium">Date modified</Text>
-                    <Tag bordered={false} className="bg-[#0517290F]">
+                    <Tag variant="filled" className="bg-[#0517290F]">
                         {(() => {
                             const ts =
                                 (selectedVariant as any)?.updatedAtTimestamp ??
diff --git a/web/oss/src/components/pages/app-management/components/AppTable.tsx b/web/oss/src/components/pages/app-management/components/AppTable.tsx
index 1322161ddf..ef7c8b0ac7 100644
--- a/web/oss/src/components/pages/app-management/components/AppTable.tsx
+++ b/web/oss/src/components/pages/app-management/components/AppTable.tsx
@@ -50,7 +50,7 @@ const AppTable = ({filteredApps, openDeleteAppModal, openEditAppModal}: AppTable
             dataIndex: "app_type",
             key: "app_type",
             render: (_, record) => {
-                return <Tag bordered={false}>{record.app_type}</Tag>
+                return <Tag variant="filled">{record.app_type}</Tag>
             },
         },
         {
diff --git a/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/EvaluatorTemplateDropdown.tsx b/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/EvaluatorTemplateDropdown.tsx
index 546722ae07..3cd006125b 100644
--- a/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/EvaluatorTemplateDropdown.tsx
+++ b/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/EvaluatorTemplateDropdown.tsx
@@ -106,7 +106,7 @@ const EvaluatorTemplateDropdown = ({
                         >
                             <div className="flex items-center gap-2">
                                 <Tag
-                                    bordered={false}
+                                    variant="filled"
                                     className={clsx("w-fit text-xs", tagClassnames)}
                                 >
                                     {item.name}
diff --git a/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/SelectEvaluatorSection.tsx b/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/SelectEvaluatorSection.tsx
index 3545f0b98a..82ccee6bcf 100644
--- a/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/SelectEvaluatorSection.tsx
+++ b/web/oss/src/components/pages/evaluations/NewEvaluation/Components/SelectEvaluatorSection/SelectEvaluatorSection.tsx
@@ -33,7 +33,7 @@ const EvaluatorMetrics = memo(({evaluator}: {evaluator: EvaluatorDto<"response">
         <div className="flex flex-wrap gap-2">
             {Object.entries(metrics).map(([key, value]) => {
                 return (
-                    <Tag bordered={false} key={key}>
+                    <Tag variant="filled" key={key}>
                         {key}
                     </Tag>
                 )
diff --git a/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorDetailsPreview.tsx b/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorDetailsPreview.tsx
index 306fef4d44..97e8d89e21 100644
--- a/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorDetailsPreview.tsx
+++ b/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorDetailsPreview.tsx
@@ -118,17 +118,17 @@ const EvaluatorDetailsPreview = ({
                         <ReadOnlyBox>
                             <div className="flex flex-wrap items-center gap-2">
                                 <span className="font-semibold text-[#475467]">{metric.name}</span>
-                                <Tag className="!m-0" bordered={false}>
+                                <Tag className="!m-0" variant="filled">
                                     {renderOutputType(metric)}
                                 </Tag>
                                 {metric.required ? (
-                                    <Tag className="!m-0" bordered={false} color="success">
+                                    <Tag className="!m-0" variant="filled" color="success">
                                         Required
                                     </Tag>
                                 ) : (
                                     <Tag
                                         className="!m-0"
-                                        bordered={false}
+                                        variant="filled"
                                         style={{backgroundColor: "#F2F4F7", color: "#475467"}}
                                     >
                                         Optional
diff --git a/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorTypeTag.tsx b/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorTypeTag.tsx
index 5f0632c476..543228951c 100644
--- a/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorTypeTag.tsx
+++ b/web/oss/src/components/pages/evaluations/onlineEvaluation/components/EvaluatorTypeTag.tsx
@@ -18,7 +18,7 @@ const EvaluatorTypeTag = ({label, color, fallback}: EvaluatorTypeTagProps) => {
             : {fontSize: 12}
 
     return (
-        <Tag className="!m-0" bordered={false} color={color} style={style}>
+        <Tag className="!m-0" variant="filled" color={color} style={style}>
             {label}
         </Tag>
     )
diff --git a/web/oss/src/components/pages/observability/assets/getObservabilityColumns.tsx b/web/oss/src/components/pages/observability/assets/getObservabilityColumns.tsx
index ebeb01dd8f..b508c48e94 100644
--- a/web/oss/src/components/pages/observability/assets/getObservabilityColumns.tsx
+++ b/web/oss/src/components/pages/observability/assets/getObservabilityColumns.tsx
@@ -42,7 +42,7 @@ export const getObservabilityColumns = ({evaluatorSlugs}: ObservabilityColumnsPr
                 const shortId = spanId ? spanId.split("-")[0] : "-"
                 return (
                     <TooltipWithCopyAction copyText={spanId || ""} title="Copy span id">
-                        <Tag className="font-mono bg-[#0517290F]" bordered={false}>
+                        <Tag className="font-mono bg-[#0517290F]" variant="filled">
                             # {shortId}
                         </Tag>
                     </TooltipWithCopyAction>
diff --git a/web/oss/src/components/pages/observability/components/SessionsTable/index.tsx b/web/oss/src/components/pages/observability/components/SessionsTable/index.tsx
index 4b42aa8623..79471f62c8 100644
--- a/web/oss/src/components/pages/observability/components/SessionsTable/index.tsx
+++ b/web/oss/src/components/pages/observability/components/SessionsTable/index.tsx
@@ -10,6 +10,7 @@ import {useSessions} from "@/oss/state/newObservability/hooks/useSessions"
 import {openSessionDrawerWithUrlAtom} from "@/oss/state/url/session"
 
 import {AUTO_REFRESH_INTERVAL} from "../../constants"
+
 import EmptySessions from "./assets/EmptySessions"
 import {getSessionColumns, SessionRow} from "./assets/getSessionColumns"
 
diff --git a/web/oss/src/components/pages/prompts/hooks/usePromptsColumns.tsx b/web/oss/src/components/pages/prompts/hooks/usePromptsColumns.tsx
index cdf71bb2af..c9a1942195 100644
--- a/web/oss/src/components/pages/prompts/hooks/usePromptsColumns.tsx
+++ b/web/oss/src/components/pages/prompts/hooks/usePromptsColumns.tsx
@@ -8,7 +8,7 @@ import {
     PencilSimpleIcon,
     TrashIcon,
 } from "@phosphor-icons/react"
-import {Dropdown, Button, MenuProps, Tag} from "antd"
+import {Button, Dropdown, MenuProps, Tag} from "antd"
 import {ColumnsType} from "antd/es/table"
 
 import {formatDay} from "@/oss/lib/helpers/dateTimeHelper"
@@ -74,9 +74,9 @@ export const usePromptsColumns = ({
                 width: 160,
                 render: (_, record) =>
                     record.type === "folder" ? (
-                        <Tag bordered={false}>Folder</Tag>
+                        <Tag variant="filled">Folder</Tag>
                     ) : (
-                        <Tag bordered={false}>{record.app_type || "App"}</Tag>
+                        <Tag variant="filled">{record.app_type || "App"}</Tag>
                     ),
             },
             {