diff --git a/.changeset/spotty-dragons-shave.md b/.changeset/spotty-dragons-shave.md
new file mode 100644
index 0000000000000..2d6da10efd8a7
--- /dev/null
+++ b/.changeset/spotty-dragons-shave.md
@@ -0,0 +1,10 @@
+---
+"@medusajs/medusa": minor
+"@medusajs/product": minor
+"@medusajs/core-flows": minor
+"@medusajs/types": minor
+"@medusajs/utils": minor
+"@medusajs/dashboard": minor
+---
+
+feat(): allow linking a subset of an option's values to the product
diff --git a/packages/admin/dashboard/package.json b/packages/admin/dashboard/package.json
index 349eae20fa48c..bd0c41bf9ab90 100644
--- a/packages/admin/dashboard/package.json
+++ b/packages/admin/dashboard/package.json
@@ -3,7 +3,7 @@
   "version": "2.11.3",
   "scripts": {
     "generate:static": "node ./scripts/generate-currencies.js && prettier --write ./src/lib/currencies.ts",
-    "dev": "vite",
+    "dev": "../../../node_modules/.bin/vite",
     "build": "yarn run -T tsup && node ./scripts/generate-types.js",
     "build:preview": "vite build",
     "preview": "vite preview",
diff --git a/packages/admin/dashboard/src/components/inputs/combobox/combobox.tsx b/packages/admin/dashboard/src/components/inputs/combobox/combobox.tsx
index a8875443289a0..0bda9b9e22f81 100644
--- a/packages/admin/dashboard/src/components/inputs/combobox/combobox.tsx
+++ b/packages/admin/dashboard/src/components/inputs/combobox/combobox.tsx
@@ -15,7 +15,7 @@ import {
   TrianglesMini,
   XMarkMini,
 } from "@medusajs/icons"
-import { clx, Text } from "@medusajs/ui"
+import { Badge, clx, Text } from "@medusajs/ui"
 import { matchSorter } from "match-sorter"
 import {
   ComponentPropsWithoutRef,
@@ -59,6 +59,7 @@ interface ComboboxProps<T extends Value = Value>
   noResultsPlaceholder?: ReactNode
   allowClear?: boolean
   forceHideInput?: boolean // always hide input -> used for singe value select that don't have query/filter
+  displayMode?: "count" | "chips" // how to display multiple selected values
 }
 
 const ComboboxImpl = <T extends Value = string>(
@@ -76,6 +77,7 @@ const ComboboxImpl = <T extends Value = string>(
     noResultsPlaceholder,
     allowClear,
     forceHideInput,
+    displayMode = "count",
     ...inputProps
   }: ComboboxProps<T>,
   ref: ForwardedRef<HTMLInputElement>
@@ -143,6 +145,15 @@ const ComboboxImpl = <T extends Value = string>(
     }
   }
 
+  const handleRemoveValue = (valueToRemove: string) => {
+    if (!isArrayValue || !Array.isArray(selectedValues)) {
+      return
+    }
+
+    const newValues = selectedValues.filter((v) => v !== valueToRemove) as T
+    handleValueChange(newValues)
+  }
+
   /**
    * Filter and sort the options based on the search value,
    * and whether the value is already selected.
@@ -235,109 +246,179 @@ const ComboboxImpl = <T extends Value = string>(
         startTransition(() => handleSearchChange(query))
       }}
     >
-      <div
-        className={clx(
-          "relative flex cursor-pointer items-center gap-x-2 overflow-hidden",
-          "h-8 w-full rounded-md",
-          "bg-ui-bg-field transition-fg shadow-borders-base",
-          "has-[input:focus]:shadow-borders-interactive-with-active",
-          "has-[:invalid]:shadow-borders-error has-[[aria-invalid=true]]:shadow-borders-error",
-          "has-[:disabled]:bg-ui-bg-disabled has-[:disabled]:text-ui-fg-disabled has-[:disabled]:cursor-not-allowed",
-          className
-        )}
-        style={
-          {
-            "--tag-width": `${tagWidth}px`,
-          } as CSSProperties
-        }
-      >
-        {showTag && (
-          <button
-            type="button"
-            onClick={(e) => {
-              e.preventDefault()
-              handleValueChange(isArrayValue ? ([] as unknown as T) : undefined)
-            }}
-            className="bg-ui-bg-base hover:bg-ui-bg-base-hover txt-compact-small-plus text-ui-fg-subtle focus-within:border-ui-fg-interactive transition-fg absolute start-0.5 top-0.5 z-[1] flex h-[28px] items-center rounded-[4px] border py-[3px] pe-1 ps-1.5 outline-none"
-          >
-            <span className="tabular-nums">{selectedValues.length}</span>
-            <XMarkMini className="text-ui-fg-muted" />
-          </button>
-        )}
-        <div className="relative flex size-full items-center">
-          {showSelected && (
-            <div
+      {displayMode === "chips" && isArrayValue ? (
+        <div
+          className={clx(
+            "relative flex cursor-pointer flex-wrap items-center gap-1.5",
+            "min-h-8 w-full rounded-md",
+            "bg-ui-bg-field transition-fg shadow-borders-base",
+            "has-[input:focus]:shadow-borders-interactive-with-active",
+            "has-[:invalid]:shadow-borders-error has-[[aria-invalid=true]]:shadow-borders-error",
+            "has-[:disabled]:bg-ui-bg-disabled has-[:disabled]:text-ui-fg-disabled has-[:disabled]:cursor-not-allowed",
+            "p-1",
+            className
+          )}
+        >
+          {Array.isArray(selectedValues) &&
+            selectedValues.map((value) => {
+              const option = options.find((o) => o.value === value)
+              if (!option) return null
+
+              return (
+                <Badge
+                  key={value}
+                  size="2xsmall"
+                  className="gap-x-0.5 pl-1.5 pr-1 transition-fg"
+                >
+                  {option.label}
+                  <button
+                    tabIndex={-1}
+                    type="button"
+                    onClick={(e) => {
+                      e.preventDefault()
+                      handleRemoveValue(value)
+                    }}
+                    className="text-ui-fg-subtle transition-fg outline-none"
+                  >
+                    <XMarkMini />
+                  </button>
+                </Badge>
+              )
+            })}
+          <div className="relative flex flex-1 items-center min-w-[120px]">
+            <PrimitiveCombobox
+              autoSelect
+              ref={comboboxRef}
+              onFocus={() => setOpen(true)}
               className={clx(
-                "pointer-events-none absolute inset-y-0 flex size-full items-center",
-                {
-                  "start-[calc(var(--tag-width)+8px)]": showTag,
-                  "start-2": !showTag,
-                }
+                "txt-compact-small text-ui-fg-base !placeholder:text-ui-fg-muted transition-fg size-full cursor-pointer bg-transparent pe-8 ps-1 outline-none focus:cursor-text"
               )}
+              placeholder={
+                Array.isArray(selectedValues) && selectedValues.length > 0
+                  ? undefined
+                  : placeholder
+              }
+              {...inputProps}
+            />
+          </div>
+          <PrimitiveComboboxDisclosure
+            render={(props) => {
+              return (
+                <button
+                  {...props}
+                  type="button"
+                  className="text-ui-fg-muted transition-fg hover:bg-ui-bg-field-hover absolute end-0 top-0 flex h-8 w-8 items-center justify-center rounded-r outline-none"
+                >
+                  <TrianglesMini />
+                </button>
+              )
+            }}
+          />
+        </div>
+      ) : (
+        <div
+          className={clx(
+            "relative flex cursor-pointer items-center gap-x-2 overflow-hidden",
+            "h-8 w-full rounded-md",
+            "bg-ui-bg-field transition-fg shadow-borders-base",
+            "has-[input:focus]:shadow-borders-interactive-with-active",
+            "has-[:invalid]:shadow-borders-error has-[[aria-invalid=true]]:shadow-borders-error",
+            "has-[:disabled]:bg-ui-bg-disabled has-[:disabled]:text-ui-fg-disabled has-[:disabled]:cursor-not-allowed",
+            className
+          )}
+          style={
+            {
+              "--tag-width": `${tagWidth}px`,
+            } as CSSProperties
+          }
+        >
+          {showTag && (
+            <button
+              type="button"
+              onClick={(e) => {
+                e.preventDefault()
+                handleValueChange(isArrayValue ? ([] as unknown as T) : undefined)
+              }}
+              className="bg-ui-bg-base hover:bg-ui-bg-base-hover txt-compact-small-plus text-ui-fg-subtle focus-within:border-ui-fg-interactive transition-fg absolute start-0.5 top-0.5 z-[1] flex h-[28px] items-center rounded-[4px] border py-[3px] pe-1 ps-1.5 outline-none"
             >
-              <Text size="small" leading="compact">
-                {t("general.selected")}
-              </Text>
-            </div>
+              <span className="tabular-nums">{selectedValues.length}</span>
+              <XMarkMini className="text-ui-fg-muted" />
+            </button>
           )}
-          {hideInput && (
-            <div
+          <div className="relative flex size-full items-center">
+            {showSelected && (
+              <div
+                className={clx(
+                  "pointer-events-none absolute inset-y-0 flex size-full items-center",
+                  {
+                    "start-[calc(var(--tag-width)+8px)]": showTag,
+                    "start-2": !showTag,
+                  }
+                )}
+              >
+                <Text size="small" leading="compact">
+                  {t("general.selected")}
+                </Text>
+              </div>
+            )}
+            {hideInput && (
+              <div
+                className={clx(
+                  "pointer-events-none absolute inset-y-0 flex size-full items-center overflow-hidden",
+                  {
+                    "start-[calc(var(--tag-width)+8px)]": showTag,
+                    "start-2": !showTag,
+                  }
+                )}
+              >
+                <Text size="small" leading="compact" className="truncate">
+                  {selectedLabel}
+                </Text>
+              </div>
+            )}
+            <PrimitiveCombobox
+              autoSelect
+              ref={comboboxRef}
+              onFocus={() => setOpen(true)}
               className={clx(
-                "pointer-events-none absolute inset-y-0 flex size-full items-center overflow-hidden",
+                "txt-compact-small text-ui-fg-base !placeholder:text-ui-fg-muted transition-fg size-full cursor-pointer bg-transparent pe-8 ps-2 outline-none focus:cursor-text",
                 {
-                  "start-[calc(var(--tag-width)+8px)]": showTag,
-                  "start-2": !showTag,
+                  "opacity-0": hideInput,
+                  "ps-2": !showTag,
+                  "ps-[calc(var(--tag-width)+8px)]": showTag,
                 }
               )}
+              placeholder={hidePlaceholder ? undefined : placeholder}
+              {...inputProps}
+            />
+          </div>
+          {allowClear && controlledValue && (
+            <button
+              type="button"
+              onClick={(e) => {
+                e.preventDefault()
+                handleValueChange(undefined)
+              }}
+              className="bg-ui-bg-base hover:bg-ui-bg-base-hover txt-compact-small-plus text-ui-fg-subtle focus-within:border-ui-fg-interactive transition-fg absolute end-[28px] top-0.5 z-[1] flex h-[28px] items-center rounded-[4px] border px-1.5 py-[2px] outline-none"
             >
-              <Text size="small" leading="compact" className="truncate">
-                {selectedLabel}
-              </Text>
-            </div>
+              <XMarkMini className="text-ui-fg-muted" />
+            </button>
           )}
-          <PrimitiveCombobox
-            autoSelect
-            ref={comboboxRef}
-            onFocus={() => setOpen(true)}
-            className={clx(
-              "txt-compact-small text-ui-fg-base !placeholder:text-ui-fg-muted transition-fg size-full cursor-pointer bg-transparent pe-8 ps-2 outline-none focus:cursor-text",
-              "hover:bg-ui-bg-field-hover",
-              {
-                "opacity-0": hideInput,
-                "ps-2": !showTag,
-                "ps-[calc(var(--tag-width)+8px)]": showTag,
-              }
-            )}
-            placeholder={hidePlaceholder ? undefined : placeholder}
-            {...inputProps}
+          <PrimitiveComboboxDisclosure
+            render={(props) => {
+              return (
+                <button
+                  {...props}
+                  type="button"
+                  className="text-ui-fg-muted transition-fg hover:bg-ui-bg-field-hover absolute end-0 flex size-8 items-center justify-center rounded-r outline-none"
+                >
+                  <TrianglesMini />
+                </button>
+              )
+            }}
           />
         </div>
-        {allowClear && controlledValue && (
-          <button
-            type="button"
-            onClick={(e) => {
-              e.preventDefault()
-              handleValueChange(undefined)
-            }}
-            className="bg-ui-bg-base hover:bg-ui-bg-base-hover txt-compact-small-plus text-ui-fg-subtle focus-within:border-ui-fg-interactive transition-fg absolute end-[28px] top-0.5 z-[1] flex h-[28px] items-center rounded-[4px] border px-1.5 py-[2px] outline-none"
-          >
-            <XMarkMini className="text-ui-fg-muted" />
-          </button>
-        )}
-        <PrimitiveComboboxDisclosure
-          render={(props) => {
-            return (
-              <button
-                {...props}
-                type="button"
-                className="text-ui-fg-muted transition-fg hover:bg-ui-bg-field-hover absolute end-0 flex size-8 items-center justify-center rounded-r outline-none"
-              >
-                <TrianglesMini />
-              </button>
-            )
-          }}
-        />
-      </div>
+      )}
       <PrimitiveComboboxPopover
         gutter={4}
         sameWidth
diff --git a/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx b/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx
index decd59417489b..939759038c8ae 100644
--- a/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx
+++ b/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx
@@ -27,7 +27,10 @@ export const ProductCreateGeneralSection = ({
                 <Form.Item>
                   <Form.Label>{t("products.fields.title.label")}</Form.Label>
                   <Form.Control>
-                    <Input {...field} placeholder={t("products.fields.title.placeholder")} />
+                    <Input
+                      {...field}
+                      placeholder={t("products.fields.title.placeholder")}
+                    />
                   </Form.Control>
                 </Form.Item>
               )
@@ -43,7 +46,10 @@ export const ProductCreateGeneralSection = ({
                     {t("products.fields.subtitle.label")}
                   </Form.Label>
                   <Form.Control>
-                    <Input {...field} placeholder={t("products.fields.subtitle.placeholder")} />
+                    <Input
+                      {...field}
+                      placeholder={t("products.fields.subtitle.placeholder")}
+                    />
                   </Form.Control>
                 </Form.Item>
               )
@@ -62,7 +68,10 @@ export const ProductCreateGeneralSection = ({
                     {t("fields.handle")}
                   </Form.Label>
                   <Form.Control>
-                    <HandleInput {...field} placeholder={t("products.fields.handle.placeholder")} />
+                    <HandleInput
+                      {...field}
+                      placeholder={t("products.fields.handle.placeholder")}
+                    />
                   </Form.Control>
                 </Form.Item>
               )
@@ -80,7 +89,10 @@ export const ProductCreateGeneralSection = ({
                 {t("products.fields.description.label")}
               </Form.Label>
               <Form.Control>
-                <Textarea {...field} placeholder={t("products.fields.description.placeholder")} />
+                <Textarea
+                  {...field}
+                  placeholder={t("products.fields.description.placeholder")}
+                />
               </Form.Control>
             </Form.Item>
           )
diff --git a/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx b/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx
index 6a7c013c74cb9..6e666da33bf53 100644
--- a/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx
+++ b/packages/admin/dashboard/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx
@@ -240,6 +240,7 @@ export const ProductCreateVariantsSection = ({
         id: option.id,
         title: option.title,
         values: selectedValues,
+        value_ids: selectedValueIds,
       }
     })
 
@@ -364,6 +365,9 @@ export const ProductCreateVariantsSection = ({
             } else {
               createDefaultOptionAndVariant()
             }
+            setSelectedOptionIds([])
+            setSelectedOptionValues({})
+            setCustomValues({})
           }}
         />
       </div>
@@ -387,6 +391,7 @@ export const ProductCreateVariantsSection = ({
               options={productOptionChoices}
               placeholder={t("products.fields.options.optionTitlePlaceholder")}
               disabled={isLoading}
+              displayMode="chips"
             />
           </div>
           {selectedOptionIds.length > 0 && (
@@ -430,6 +435,7 @@ export const ProductCreateVariantsSection = ({
                           placeholder={t(
                             "products.fields.options.variantionsPlaceholder"
                           )}
+                          displayMode="chips"
                         />
                       </div>
                     )
diff --git a/packages/admin/dashboard/src/routes/products/product-create/constants.ts b/packages/admin/dashboard/src/routes/products/product-create/constants.ts
index f1a624b1598aa..32b2a6d7eab0d 100644
--- a/packages/admin/dashboard/src/routes/products/product-create/constants.ts
+++ b/packages/admin/dashboard/src/routes/products/product-create/constants.ts
@@ -50,6 +50,7 @@ const ProductCreateOptionSchema = z.object({
   id: z.string().optional(),
   title: z.string(),
   values: z.array(z.string()).min(1),
+  value_ids: z.array(z.string()).optional(),
 })
 
 export type ProductCreateOptionSchema = z.infer<
diff --git a/packages/admin/dashboard/src/routes/products/product-create/utils.ts b/packages/admin/dashboard/src/routes/products/product-create/utils.ts
index e7da9be47dcd7..a9bdd5daf8391 100644
--- a/packages/admin/dashboard/src/routes/products/product-create/utils.ts
+++ b/packages/admin/dashboard/src/routes/products/product-create/utils.ts
@@ -44,8 +44,8 @@ export const normalizeProductFormValues = (
     height: values.height ? parseFloat(values.height) : undefined,
     weight: values.weight ? parseFloat(values.weight) : undefined,
     options: options.map((option) => {
-      const { id, ...rest } = option
-      return id ? { id } : rest
+      const { id, value_ids, ...rest } = option
+      return id ? { id, value_ids } : { ...rest, is_exclusive: true }
     }),
     variants: normalizeVariants(
       values.variants.filter((variant) => variant.should_create),
diff --git a/packages/admin/dashboard/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx b/packages/admin/dashboard/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
index 971220e3825ab..c07129e5b7892 100644
--- a/packages/admin/dashboard/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
+++ b/packages/admin/dashboard/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
@@ -62,17 +62,30 @@ export const ProductOptionSection = ({
           <SectionRow
             title={option.title}
             key={option.id}
-            value={option.values?.map((val) => {
-              return (
-                <Badge
-                  key={val.value}
-                  size="2xsmall"
-                  className="flex min-w-[20px] items-center justify-center"
-                >
-                  {val.value}
-                </Badge>
-              )
-            })}
+            value={option.values
+              ?.sort((a, b) => {
+                if (a.rank == null && b.rank == null) {
+                  return 0
+                }
+                if (a.rank == null) {
+                  return 1
+                }
+                if (b.rank == null) {
+                  return -1
+                }
+                return a.rank - b.rank
+              })
+              .map((val) => {
+                return (
+                  <Badge
+                    key={val.value}
+                    size="2xsmall"
+                    className="flex min-w-[20px] items-center justify-center"
+                  >
+                    {val.value}
+                  </Badge>
+                )
+              })}
             actions={<OptionActions option={option} />}
           />
         )
diff --git a/packages/admin/dashboard/src/routes/products/product-options-manage/components/product-options-manage-form/product-options-manage-form.tsx b/packages/admin/dashboard/src/routes/products/product-options-manage/components/product-options-manage-form/product-options-manage-form.tsx
index 597d65a554b08..facdf1407b4c4 100644
--- a/packages/admin/dashboard/src/routes/products/product-options-manage/components/product-options-manage-form/product-options-manage-form.tsx
+++ b/packages/admin/dashboard/src/routes/products/product-options-manage/components/product-options-manage-form/product-options-manage-form.tsx
@@ -1,5 +1,5 @@
 import { HttpTypes } from "@medusajs/types"
-import { Button, toast } from "@medusajs/ui"
+import { Button, Hint, Label, toast } from "@medusajs/ui"
 import { useMemo, useState } from "react"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
@@ -21,6 +21,7 @@ type ProductOptionsManageFormProps = {
 
 const ProductOptionsManageSchema = zod.object({
   option_ids: zod.array(zod.string()),
+  option_values: zod.record(zod.array(zod.string())).optional(),
 })
 
 export const ProductOptionsManageForm = ({
@@ -46,9 +47,27 @@ export const ProductOptionsManageForm = ({
     product.options?.map((opt) => opt.id) || []
   )
 
+  const [selectedOptionValues, setSelectedOptionValues] = useState<
+    Record<string, string[]>
+  >(() => {
+    // Initialize with existing product option values
+    const initialValues: Record<string, string[]> = {}
+    product.options?.forEach((opt) => {
+      initialValues[opt.id] = opt.values?.map((v) => v.id) || []
+    })
+    return initialValues
+  })
+
   const form = useExtendableForm({
     defaultValues: {
       option_ids: product.options?.map((opt) => opt.id) || [],
+      option_values: (() => {
+        const initialValues: Record<string, string[]> = {}
+        product.options?.forEach((opt) => {
+          initialValues[opt.id] = opt.values?.map((v) => v.id) || []
+        })
+        return initialValues
+      })(),
     },
     schema: ProductOptionsManageSchema,
     configs: configs,
@@ -60,19 +79,92 @@ export const ProductOptionsManageForm = ({
   const handleProductOptionSelect = (optionIds: string[]) => {
     setSelectedOptionIds(optionIds)
     form.setValue("option_ids", optionIds)
+
+    // Initialize selected values for new options (select all by default)
+    const newSelectedValues: Record<string, string[]> = {}
+    const selectedProductOptions = product_options.filter((option) =>
+      optionIds.includes(option.id)
+    )
+
+    selectedProductOptions.forEach((option) => {
+      // If option was already selected, keep its current value selection
+      if (selectedOptionValues[option.id]) {
+        newSelectedValues[option.id] = selectedOptionValues[option.id]
+      } else {
+        // New option - select all values by default
+        newSelectedValues[option.id] = option.values?.map((v) => v.id) || []
+      }
+    })
+
+    setSelectedOptionValues(newSelectedValues)
+    form.setValue("option_values", newSelectedValues)
+  }
+
+  const handleValueChange = (optionId: string, valueIds: string[]) => {
+    // Ensure at least one value is selected
+    if (valueIds.length === 0) {
+      return
+    }
+
+    const updatedSelectedValues = {
+      ...selectedOptionValues,
+      [optionId]: valueIds,
+    }
+
+    setSelectedOptionValues(updatedSelectedValues)
+    form.setValue("option_values", updatedSelectedValues)
   }
 
   const handleSubmit = form.handleSubmit(async (data) => {
     const currentOptionIds = product.options?.map((opt) => opt.id) || []
     const newOptionIds = data.option_ids
 
-    // Determine which options to add and remove
-    const optionsToAdd = newOptionIds.filter(
-      (id) => !currentOptionIds.includes(id)
-    )
-    const optionsToRemove = currentOptionIds.filter(
-      (id) => !newOptionIds.includes(id)
-    )
+    const optionsToAdd: (string | { id: string; value_ids: string[] })[] = []
+    const optionsToRemove: string[] = []
+
+    // Check for completely removed options
+    for (const currentId of currentOptionIds) {
+      if (!newOptionIds.includes(currentId)) {
+        optionsToRemove.push(currentId)
+      }
+    }
+
+    // Check for new options or options with changed values
+    for (const newId of newOptionIds) {
+      const isNewOption = !currentOptionIds.includes(newId)
+
+      if (isNewOption) {
+        optionsToAdd.push(
+          data.option_values
+            ? {
+                id: newId,
+                value_ids: data.option_values[newId],
+              }
+            : newId
+        )
+      } else {
+        const currentOption = product.options?.find((opt) => opt.id === newId)
+        const currentValueIds =
+          currentOption?.values?.map((v) => v.id).sort() || []
+        const newValueIds = [...(data.option_values?.[newId] || [])].sort()
+
+        const valuesChanged =
+          currentValueIds.length !== newValueIds.length ||
+          currentValueIds.some((id, index) => id !== newValueIds[index])
+
+        if (valuesChanged) {
+          optionsToRemove.push(newId)
+          optionsToAdd.push(
+            data.option_values
+              ? {
+                  id: newId,
+                  value_ids: data.option_values[newId],
+                }
+              : newId
+          )
+        }
+      }
+    }
 
     await mutateAsync(
       {
@@ -120,6 +212,7 @@ export const ProductOptionsManageForm = ({
                         options={productOptionChoices}
                         placeholder={t("products.options.manage.placeholder")}
                         disabled={isLoading}
+                        displayMode="chips"
                       />
                     </Form.Control>
                     <Form.ErrorMessage />
@@ -127,6 +220,50 @@ export const ProductOptionsManageForm = ({
                 )
               }}
             />
+            {selectedOptionIds.length > 0 && (
+              <div className="flex flex-col gap-y-4">
+                <div className="flex flex-col">
+                  <Label weight="plus">{t("fields.values")}</Label>
+                  <Hint>{t("products.create.variants.selectValuesHint")}</Hint>
+                </div>
+                <div className="flex flex-col gap-y-3">
+                  {product_options
+                    .filter((option) => selectedOptionIds.includes(option.id))
+                    .map((option) => {
+                      const valueOptions =
+                        option.values
+                          ?.sort((a, b) => {
+                            const rankA = a.rank ?? Number.MAX_VALUE
+                            const rankB = b.rank ?? Number.MAX_VALUE
+                            return rankA - rankB
+                          })
+                          .map((v) => ({
+                            value: v.id,
+                            label: v.value,
+                          })) || []
+
+                      return (
+                        <div key={option.id} className="flex flex-col gap-y-2">
+                          <Label size="small" weight="plus">
+                            {option.title}
+                          </Label>
+                          <Combobox
+                            value={selectedOptionValues[option.id] || []}
+                            onChange={(value) =>
+                              handleValueChange(option.id, value as string[])
+                            }
+                            options={valueOptions}
+                            placeholder={t(
+                              "products.fields.options.variantionsPlaceholder"
+                            )}
+                            displayMode="chips"
+                          />
+                        </div>
+                      )
+                    })}
+                </div>
+              </div>
+            )}
           </div>
         </RouteDrawer.Body>
         <RouteDrawer.Footer>
diff --git a/packages/core/core-flows/src/product/steps/link-product-options-to-product.ts b/packages/core/core-flows/src/product/steps/link-product-options-to-product.ts
index 866ccd03f7690..68b808c48bd1c 100644
--- a/packages/core/core-flows/src/product/steps/link-product-options-to-product.ts
+++ b/packages/core/core-flows/src/product/steps/link-product-options-to-product.ts
@@ -1,4 +1,4 @@
-import { IProductModuleService } from "@medusajs/framework/types"
+import { IProductModuleService, ProductTypes } from "@medusajs/framework/types"
 import { Modules, promiseAll } from "@medusajs/framework/utils"
 import { createStep, StepResponse } from "@medusajs/framework/workflows-sdk"
 
@@ -13,7 +13,7 @@ export type LinkProductOptionsToProductStepInput = {
   /**
    * The product options to add to the product.
    */
-  add?: string[]
+  add?: (string | Omit<ProductTypes.ProductOptionProductPair, "product_id">)[]
   /**
    * The product options to remove from the product.
    */
@@ -36,10 +36,17 @@ export const linkProductOptionsToProductStep = createStep(
   async (input: LinkProductOptionsToProductStepInput, { container }) => {
     const service = container.resolve<IProductModuleService>(Modules.PRODUCT)
 
-    const toAdd = (input.add ?? []).map((optionId) => {
+    const toAdd = (input.add ?? []).map((option) => {
+      if (typeof option === "string") {
+        return {
+          product_option_id: option,
+          product_id: input.product_id,
+        }
+      }
       return {
-        product_option_id: optionId,
+        product_option_id: option.product_option_id,
         product_id: input.product_id,
+        product_option_value_ids: option.product_option_value_ids,
       }
     })
 
diff --git a/packages/core/core-flows/src/product/workflows/create-and-link-product-options-to-product.ts b/packages/core/core-flows/src/product/workflows/create-and-link-product-options-to-product.ts
index f8cb09dc0705e..b8bcebab8378a 100644
--- a/packages/core/core-flows/src/product/workflows/create-and-link-product-options-to-product.ts
+++ b/packages/core/core-flows/src/product/workflows/create-and-link-product-options-to-product.ts
@@ -23,7 +23,11 @@ export type LinkProductOptionsToProductWorkflowInput = {
   /**
    * The product options to add to the product.
    */
-  add?: (string | ProductTypes.CreateProductOptionDTO)[]
+  add?: (
+    | string
+    | { id: string; value_ids: string[] }
+    | ProductTypes.CreateProductOptionDTO
+  )[]
   /**
    * The product options to remove from the product.
    */
@@ -61,15 +65,32 @@ export const createAndLinkProductOptionsToProductWorkflowId =
 export const createAndLinkProductOptionsToProductWorkflow = createWorkflow(
   createAndLinkProductOptionsToProductWorkflowId,
   (input: WorkflowData<LinkProductOptionsToProductWorkflowInput>) => {
-    const { toCreate, toAdd } = transform({ input }, ({ input }) => {
-      const toCreate: ProductTypes.CreateProductOptionDTO[] = []
-      const toAdd: string[] = []
-      for (const option of input.add ?? []) {
-        isString(option) ? toAdd.push(option) : toCreate.push(option)
-      }
+    const { toCreate, toAdd, toAddWithValues } = transform(
+      { input },
+      ({ input }) => {
+        const toCreate: ProductTypes.CreateProductOptionDTO[] = []
+        const toAdd: string[] = []
+        const toAddWithValues: Array<{
+          option_id: string
+          value_ids?: string[]
+        }> = []
 
-      return { toCreate, toAdd }
-    })
+        for (const option of input.add ?? []) {
+          if (isString(option)) {
+            toAdd.push(option)
+          } else if ("id" in option && "value_ids" in option) {
+            toAddWithValues.push({
+              option_id: option.id,
+              value_ids: option.value_ids,
+            })
+          } else {
+            toCreate.push(option as ProductTypes.CreateProductOptionDTO)
+          }
+        }
+
+        return { toCreate, toAdd, toAddWithValues }
+      }
+    )
 
     const createdIds = when(
       "creating-product-options",
@@ -82,14 +103,39 @@ export const createAndLinkProductOptionsToProductWorkflow = createWorkflow(
       )
     })
 
-    const toAddProductOptionIds = transform(
-      { toAdd, createdIds },
-      ({ toAdd, createdIds }) => toAdd.concat(createdIds ?? [])
+    const toAddOptions = transform(
+      { toAdd, toAddWithValues, createdIds },
+      ({ toAdd, toAddWithValues, createdIds }) => {
+        const options: (
+          | string
+          | { product_option_id: string; product_option_value_ids?: string[] }
+        )[] = []
+
+        // Add simple option IDs (no value filtering)
+        for (const optionId of toAdd) {
+          options.push(optionId)
+        }
+
+        // Add options with specific values
+        for (const { option_id, value_ids } of toAddWithValues) {
+          options.push({
+            product_option_id: option_id,
+            product_option_value_ids: value_ids,
+          })
+        }
+
+        // Add created options (no value filtering)
+        for (const optionId of createdIds ?? []) {
+          options.push(optionId)
+        }
+
+        return options
+      }
     )
 
     const productOptions = linkProductOptionsToProductStep({
       product_id: input.product_id,
-      add: toAddProductOptionIds,
+      add: toAddOptions,
       remove: input.remove,
     })
 
diff --git a/packages/core/types/src/http/product/admin/payloads.ts b/packages/core/types/src/http/product/admin/payloads.ts
index 3f55fbefec3b1..22224cd4400f8 100644
--- a/packages/core/types/src/http/product/admin/payloads.ts
+++ b/packages/core/types/src/http/product/admin/payloads.ts
@@ -235,7 +235,19 @@ export interface AdminCreateProduct {
   /**
    * The product's options.
    */
-  options: (AdminCreateProductOption | { id: string })[]
+  options: (
+    | AdminCreateProductOption
+    | {
+        /**
+         * The ID of the product option to link.
+         */
+        id: string
+        /**
+         * The IDs of specific option values to link. If undefined, every value will be linked by default.
+         */
+        value_ids?: string[]
+      }
+  )[]
   /**
    * The product's variants.
    */
@@ -657,11 +669,22 @@ export interface AdminImportProductsRequest {
   mime_type: string
 }
 
+export interface AdminLinkProductOptionWithValues {
+  /**
+   * The ID of the product option to link.
+   */
+  id: string
+  /**
+   * The IDs of specific option values to link.
+   */
+  value_ids: string[]
+}
+
 export interface AdminLinkProductOptions {
   /**
    * The list of options to link to the product.
    */
-  add?: (string | AdminCreateProductOption)[]
+  add?: (string | AdminCreateProductOption | AdminLinkProductOptionWithValues)[]
   /**
    * The list of options to unlink to the product.
    */
diff --git a/packages/core/types/src/product/common.ts b/packages/core/types/src/product/common.ts
index bf733c231e3eb..8e6b069a11249 100644
--- a/packages/core/types/src/product/common.ts
+++ b/packages/core/types/src/product/common.ts
@@ -1556,7 +1556,19 @@ export interface CreateProductDTO {
   /**
    * The product options to be created and/or associated with the product.
    */
-  options?: (CreateProductOptionDTO | { id: string })[]
+  options?: (
+    | CreateProductOptionDTO
+    | {
+        /**
+         * The ID of the product option to link.
+         */
+        id: string
+        /**
+         * The IDs of specific option values to link. If undefined, every value will be linked by default.
+         */
+        value_ids?: string[]
+      }
+  )[]
   /**
    * The product variants to be created and associated with the product.
    */
@@ -1735,4 +1747,9 @@ export type ProductOptionProductPair = {
    * The product's ID.
    */
   product_id: string
+
+  /**
+   * The IDs of specific option values to link. If not provided, all values will be linked.
+   */
+  product_option_value_ids?: string[]
 }
diff --git a/packages/core/utils/src/product/events.ts b/packages/core/utils/src/product/events.ts
index 724ceff75bd81..95407d225901e 100644
--- a/packages/core/utils/src/product/events.ts
+++ b/packages/core/utils/src/product/events.ts
@@ -6,6 +6,7 @@ const eventBaseNames: [
   "productVariant",
   "productOption",
   "productProductOption",
+  "productProductOptionValue",
   "productOptionValue",
   "productType",
   "productTag",
@@ -17,6 +18,7 @@ const eventBaseNames: [
   "productVariant",
   "productOption",
   "productProductOption",
+  "productProductOptionValue",
   "productOptionValue",
   "productType",
   "productTag",
diff --git a/packages/medusa/src/api/admin/products/validators.ts b/packages/medusa/src/api/admin/products/validators.ts
index b72bd6d1909ff..f2fb73b5f4910 100644
--- a/packages/medusa/src/api/admin/products/validators.ts
+++ b/packages/medusa/src/api/admin/products/validators.ts
@@ -101,11 +101,27 @@ export const AdminUpdateProductTag = z.object({
   value: z.string().optional(),
 })
 
+export type AdminLinkProductOptionWithValuesType = z.infer<
+  typeof AdminLinkProductOptionWithValues
+>
+export const AdminLinkProductOptionWithValues = z.object({
+  id: z.string(),
+  value_ids: z.array(z.string()),
+})
+
 export type AdminLinkProductOptionsType = z.infer<
   typeof AdminLinkProductOptions
 >
 export const AdminLinkProductOptions = z.object({
-  add: z.array(z.union([z.string(), AdminCreateProductOption])).optional(),
+  add: z
+    .array(
+      z.union([
+        z.string(),
+        AdminCreateProductOption,
+        AdminLinkProductOptionWithValues,
+      ])
+    )
+    .optional(),
   remove: z.array(z.string()).optional(),
 })
 
@@ -240,7 +256,15 @@ export const CreateProduct = z
     categories: z.array(IdAssociation).optional(),
     tags: z.array(IdAssociation).optional(),
     options: z
-      .array(z.union([AdminCreateProductOption, IdAssociation]))
+      .array(
+        z.union([
+          AdminCreateProductOption,
+          z.object({
+            id: z.string(),
+            value_ids: z.array(z.string()).optional(),
+          }),
+        ])
+      )
       .optional(),
     variants: z.array(CreateProductVariant).optional(),
     sales_channels: z.array(z.object({ id: z.string() })).optional(),
diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/events.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/events.spec.ts
index d7e6093d7fecc..a56437dae6341 100644
--- a/packages/modules/product/integration-tests/__tests__/product-module-service/events.spec.ts
+++ b/packages/modules/product/integration-tests/__tests__/product-module-service/events.spec.ts
@@ -77,8 +77,9 @@ moduleIntegrationTestRunner<IProductModuleService>({
           // 4. Product variants created (2 variants)
           // 5. Product images created (2 images)
           // 6. Product product options created (pivot table) (2 product-productOption links)
+          // 7. Product product option values created (pivot table) (5 product-productOptionValue links)
 
-          const expectedEventsCount = 1 + 2 + 5 + 2 + 2 + 2 // 14 total events
+          const expectedEventsCount = 1 + 2 + 5 + 2 + 2 + 2 + 5 // 19 total events
           expect(emittedEvents).toHaveLength(expectedEventsCount)
 
           // Verify product created event
@@ -244,8 +245,8 @@ moduleIntegrationTestRunner<IProductModuleService>({
           expect(eventBusSpy).toHaveBeenCalledTimes(1)
           const emittedEvents = eventBusSpy.mock.calls[0][0]
 
-          // Total count should include: 1 product update + 1 option linked + 1 option unlinked + 1 variant created + 1 variant updated + 2 images created + 1 image deleted = 8 events
-          expect(emittedEvents).toHaveLength(8)
+          // Total count should include: 1 product update + 1 option linked + 2 option values linked + 1 option unlinked + 1 option value unlinked + 1 variant created + 1 variant updated + 2 images created + 1 image deleted = 11 events
+          expect(emittedEvents).toHaveLength(11)
 
           // Should emit product update event
           expect(emittedEvents).toEqual(
@@ -271,6 +272,22 @@ moduleIntegrationTestRunner<IProductModuleService>({
             ])
           )
 
+          // Should emit option values link event for new option
+          expect(emittedEvents.filter(e => e.name === ProductEvents.PRODUCT_PRODUCT_OPTION_VALUE_CREATED).length).toEqual(2)
+          expect(emittedEvents).toEqual(
+            expect.arrayContaining([
+              composeMessage(
+                ProductEvents.PRODUCT_PRODUCT_OPTION_VALUE_CREATED,
+                {
+                  data: expect.objectContaining({ id: expect.any(String) }),
+                  object: "product_product_option_value",
+                  source: Modules.PRODUCT,
+                  action: CommonEvents.CREATED,
+                }
+              ),
+            ])
+          )
+
           // Should emit option unlink event for new option
           expect(emittedEvents).toEqual(
             expect.arrayContaining([
@@ -283,6 +300,21 @@ moduleIntegrationTestRunner<IProductModuleService>({
             ])
           )
 
+          // Should emit option value unlink event for new option
+          expect(emittedEvents).toEqual(
+            expect.arrayContaining([
+              composeMessage(
+                ProductEvents.PRODUCT_PRODUCT_OPTION_VALUE_DELETED,
+                {
+                  data: expect.objectContaining({ id: expect.any(String) }),
+                  object: "product_product_option_value",
+                  source: Modules.PRODUCT,
+                  action: CommonEvents.DELETED,
+                }
+              ),
+            ])
+          )
+
           // Should emit variant created event for new variant
           expect(emittedEvents).toEqual(
             expect.arrayContaining([
diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts
index 111982fa2ee89..fbabf8d27a3e0 100644
--- a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts
+++ b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts
@@ -231,7 +231,7 @@ moduleIntegrationTestRunner<IProductModuleService>({
           productBefore.length = 201
           productBefore.height = 301
           productBefore.width = 401
-          productBefore.option_ids = [productOne.options.map((o) => o.id)]
+          productBefore.option_ids = productOne.options.map((o) => o.id)
           delete productBefore.options
           const updatedProducts = await service.upsertProducts([productBefore])
           expect(updatedProducts).toHaveLength(1)
diff --git a/packages/modules/product/src/migrations/.snapshot-medusa-product.json b/packages/modules/product/src/migrations/.snapshot-medusa-product.json
index ee09c22c914c5..ddbab8592f864 100644
--- a/packages/modules/product/src/migrations/.snapshot-medusa-product.json
+++ b/packages/modules/product/src/migrations/.snapshot-medusa-product.json
@@ -143,7 +143,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_parent_category_id\" ON \"product_category\" (parent_category_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_parent_category_id\" ON \"product_category\" (\"parent_category_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_category_deleted_at",
@@ -152,7 +152,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_deleted_at\" ON \"product_category\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_deleted_at\" ON \"product_category\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_category_path",
@@ -161,7 +161,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_path\" ON \"product_category\" (mpath) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_category_path\" ON \"product_category\" (\"mpath\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_category_handle_unique",
@@ -170,7 +170,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_category_handle_unique\" ON \"product_category\" (handle) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_category_handle_unique\" ON \"product_category\" (\"handle\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_category_pkey",
@@ -282,7 +282,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_collection_deleted_at\" ON \"product_collection\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_collection_deleted_at\" ON \"product_collection\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_collection_handle_unique",
@@ -291,7 +291,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_collection_handle_unique\" ON \"product_collection\" (handle) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_collection_handle_unique\" ON \"product_collection\" (\"handle\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_collection_pkey",
@@ -390,7 +390,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_deleted_at\" ON \"product_option\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_deleted_at\" ON \"product_option\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_option_pkey",
@@ -497,7 +497,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_value_option_id\" ON \"product_option_value\" (option_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_value_option_id\" ON \"product_option_value\" (\"option_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_option_value_deleted_at",
@@ -506,7 +506,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_value_deleted_at\" ON \"product_option_value\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_option_value_deleted_at\" ON \"product_option_value\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_option_value_option_id_unique",
@@ -515,7 +515,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_option_value_option_id_unique\" ON \"product_option_value\" (option_id, value) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_option_value_option_id_unique\" ON \"product_option_value\" (\"option_id\", \"value\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_option_value_pkey",
@@ -618,7 +618,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_tag_deleted_at\" ON \"product_tag\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_tag_deleted_at\" ON \"product_tag\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_tag_value_unique",
@@ -627,7 +627,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_tag_value_unique\" ON \"product_tag\" (value) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_tag_value_unique\" ON \"product_tag\" (\"value\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_tag_pkey",
@@ -716,7 +716,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_type_deleted_at\" ON \"product_type\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_type_deleted_at\" ON \"product_type\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_type_value_unique",
@@ -725,7 +725,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_type_value_unique\" ON \"product_type\" (value) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_type_value_unique\" ON \"product_type\" (\"value\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_type_pkey",
@@ -985,7 +985,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_type_id\" ON \"product\" (type_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_type_id\" ON \"product\" (\"type_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_collection_id",
@@ -994,7 +994,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_collection_id\" ON \"product\" (collection_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_collection_id\" ON \"product\" (\"collection_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_deleted_at",
@@ -1003,7 +1003,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_deleted_at\" ON \"product\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_deleted_at\" ON \"product\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_handle_unique",
@@ -1012,7 +1012,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_handle_unique\" ON \"product\" (handle) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_handle_unique\" ON \"product\" (\"handle\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_status",
@@ -1021,7 +1021,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_status\" ON \"product\" (status) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_status\" ON \"product\" (\"status\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_pkey",
@@ -1137,7 +1137,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_product_id\" ON \"product_product_option\" (product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_product_id\" ON \"product_product_option\" (\"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_product_option_product_option_id",
@@ -1146,7 +1146,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_product_option_id\" ON \"product_product_option\" (product_option_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_product_option_id\" ON \"product_product_option\" (\"product_option_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_product_option_deleted_at",
@@ -1155,7 +1155,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_deleted_at\" ON \"product_product_option\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_deleted_at\" ON \"product_product_option\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_product_option_pkey",
@@ -1172,6 +1172,138 @@
       "foreignKeys": {},
       "nativeEnums": {}
     },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "product_product_option_id": {
+          "name": "product_product_option_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "product_option_value_id": {
+          "name": "product_option_value_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "default": "now()",
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "default": "now()",
+          "mappedType": "datetime"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "product_product_option_value",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "IDX_product_product_option_value_product_product_option_id",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_value_product_product_option_id\" ON \"product_product_option_value\" (\"product_product_option_id\") WHERE deleted_at IS NULL"
+        },
+        {
+          "keyName": "IDX_product_product_option_value_product_option_value_id",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_value_product_option_value_id\" ON \"product_product_option_value\" (\"product_option_value_id\") WHERE deleted_at IS NULL"
+        },
+        {
+          "keyName": "IDX_product_product_option_value_deleted_at",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_product_option_value_deleted_at\" ON \"product_product_option_value\" (\"deleted_at\") WHERE deleted_at IS NULL"
+        },
+        {
+          "keyName": "product_product_option_value_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {
+        "product_product_option_value_product_product_option_id_foreign": {
+          "constraintName": "product_product_option_value_product_product_option_id_foreign",
+          "columnNames": [
+            "product_product_option_id"
+          ],
+          "localTableName": "public.product_product_option_value",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.product_product_option",
+          "updateRule": "cascade"
+        },
+        "product_product_option_value_product_option_value_id_foreign": {
+          "constraintName": "product_product_option_value_product_option_value_id_foreign",
+          "columnNames": [
+            "product_option_value_id"
+          ],
+          "localTableName": "public.product_product_option_value",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.product_option_value",
+          "updateRule": "cascade"
+        }
+      },
+      "nativeEnums": {}
+    },
     {
       "columns": {
         "id": {
@@ -1263,7 +1395,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_image_product_id\" ON \"image\" (product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_image_product_id\" ON \"image\" (\"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_image_deleted_at",
@@ -1272,7 +1404,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_image_deleted_at\" ON \"image\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_image_deleted_at\" ON \"image\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_image_url",
@@ -1281,7 +1413,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_url\" ON \"image\" (url) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_url\" ON \"image\" (\"url\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_image_rank",
@@ -1290,7 +1422,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_rank\" ON \"image\" (rank) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_rank\" ON \"image\" (\"rank\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_image_url_rank_product_id",
@@ -1299,7 +1431,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_url_rank_product_id\" ON \"image\" (url, rank, product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_url_rank_product_id\" ON \"image\" (\"url\", \"rank\", \"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_image_rank_product_id",
@@ -1308,7 +1440,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_rank_product_id\" ON \"image\" (rank, product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_image_rank_product_id\" ON \"image\" (\"rank\", \"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "image_pkey",
@@ -1701,7 +1833,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_id\" ON \"product_variant\" (product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_id\" ON \"product_variant\" (\"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_deleted_at",
@@ -1710,7 +1842,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_deleted_at\" ON \"product_variant\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_deleted_at\" ON \"product_variant\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_id_product_id",
@@ -1719,7 +1851,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_id_product_id\" ON \"product_variant\" (id, product_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_id_product_id\" ON \"product_variant\" (\"id\", \"product_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_sku_unique",
@@ -1728,7 +1860,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_sku_unique\" ON \"product_variant\" (sku) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_sku_unique\" ON \"product_variant\" (\"sku\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_barcode_unique",
@@ -1737,7 +1869,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_barcode_unique\" ON \"product_variant\" (barcode) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_barcode_unique\" ON \"product_variant\" (\"barcode\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_ean_unique",
@@ -1746,7 +1878,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_ean_unique\" ON \"product_variant\" (ean) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_ean_unique\" ON \"product_variant\" (\"ean\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_upc_unique",
@@ -1755,7 +1887,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_upc_unique\" ON \"product_variant\" (upc) WHERE deleted_at IS NULL"
+          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_product_variant_upc_unique\" ON \"product_variant\" (\"upc\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_variant_pkey",
@@ -1864,24 +1996,6 @@
           "nullable": false,
           "mappedType": "text"
         },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "mappedType": "text"
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "jsonb",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "mappedType": "json"
-        },
         "variant_id": {
           "name": "variant_id",
           "type": "text",
@@ -1943,7 +2057,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_variant_id\" ON \"product_variant_product_image\" (variant_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_variant_id\" ON \"product_variant_product_image\" (\"variant_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_product_image_image_id",
@@ -1952,7 +2066,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_image_id\" ON \"product_variant_product_image\" (image_id) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_image_id\" ON \"product_variant_product_image\" (\"image_id\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "IDX_product_variant_product_image_deleted_at",
@@ -1961,7 +2075,7 @@
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_deleted_at\" ON \"product_variant_product_image\" (deleted_at) WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_product_variant_product_image_deleted_at\" ON \"product_variant_product_image\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
           "keyName": "product_variant_product_image_pkey",
diff --git a/packages/modules/product/src/migrations/Migration20251110180907.ts b/packages/modules/product/src/migrations/Migration20251110180907.ts
new file mode 100644
index 0000000000000..95b9544e7e083
--- /dev/null
+++ b/packages/modules/product/src/migrations/Migration20251110180907.ts
@@ -0,0 +1,23 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20251110180907 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table if not exists "product_product_option_value" ("id" text not null, "product_product_option_id" text not null, "product_option_value_id" text not null, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "product_product_option_value_pkey" primary key ("id"));`);
+    this.addSql(`CREATE INDEX IF NOT EXISTS "IDX_product_product_option_value_product_product_option_id" ON "product_product_option_value" ("product_product_option_id") WHERE deleted_at IS NULL;`);
+    this.addSql(`CREATE INDEX IF NOT EXISTS "IDX_product_product_option_value_product_option_value_id" ON "product_product_option_value" ("product_option_value_id") WHERE deleted_at IS NULL;`);
+    this.addSql(`CREATE INDEX IF NOT EXISTS "IDX_product_product_option_value_deleted_at" ON "product_product_option_value" ("deleted_at") WHERE deleted_at IS NULL;`);
+
+    this.addSql(`alter table if exists "product_product_option_value" add constraint "product_product_option_value_product_product_option_id_foreign" foreign key ("product_product_option_id") references "product_product_option" ("id") on update cascade;`);
+    this.addSql(`alter table if exists "product_product_option_value" add constraint "product_product_option_value_product_option_value_id_foreign" foreign key ("product_option_value_id") references "product_option_value" ("id") on update cascade;`);
+
+    this.addSql(`alter table if exists "product_variant_product_image" drop column if exists "created_by", drop column if exists "metadata";`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop table if exists "product_product_option_value" cascade;`);
+
+    this.addSql(`alter table if exists "product_variant_product_image" add column if not exists "created_by" text null, add column if not exists "metadata" jsonb null;`);
+  }
+
+}
diff --git a/packages/modules/product/src/migrations/Migration20251113183352.ts b/packages/modules/product/src/migrations/Migration20251113183352.ts
new file mode 100644
index 0000000000000..d12c4b508722a
--- /dev/null
+++ b/packages/modules/product/src/migrations/Migration20251113183352.ts
@@ -0,0 +1,29 @@
+import { Migration } from "@mikro-orm/migrations"
+
+export class Migration20251113183352 extends Migration {
+  override async up(): Promise<void> {
+    // Populate product_product_option_value with all existing implicit relationships
+    // For each product-option link, create links to all values of that option
+    this.addSql(`
+      insert into "product_product_option_value" ("id", "product_product_option_id", "product_option_value_id")
+      select
+        gen_random_uuid(),
+        ppo.id,
+        pov.id
+      from "product_product_option" ppo
+      inner join "product_option_value" pov on pov.option_id = ppo.product_option_id
+      where ppo.deleted_at is null and pov.deleted_at is null;
+    `)
+  }
+
+  override async down(): Promise<void> {
+    // Remove all the records that were created by the up migration
+    // This is a destructive operation and will remove the granular relationships
+    this.addSql(`
+      delete from "product_product_option_value"
+      where "product_product_option_id" in (
+        select id from "product_product_option" where deleted_at is null
+      );
+    `)
+  }
+}
diff --git a/packages/modules/product/src/models/index.ts b/packages/modules/product/src/models/index.ts
index 2bdcec17126bf..794e2f691cb37 100644
--- a/packages/modules/product/src/models/index.ts
+++ b/packages/modules/product/src/models/index.ts
@@ -4,6 +4,7 @@ export { default as ProductCollection } from "./product-collection"
 export { default as ProductImage } from "./product-image"
 export { default as ProductOption } from "./product-option"
 export { default as ProductProductOption } from "./product-product-option"
+export { default as ProductProductOptionValue } from "./product-product-option-value"
 export { default as ProductOptionValue } from "./product-option-value"
 export { default as ProductTag } from "./product-tag"
 export { default as ProductType } from "./product-type"
diff --git a/packages/modules/product/src/models/product-option-value.ts b/packages/modules/product/src/models/product-option-value.ts
index 8b618cea4b3f3..61a2efef7d12b 100644
--- a/packages/modules/product/src/models/product-option-value.ts
+++ b/packages/modules/product/src/models/product-option-value.ts
@@ -1,5 +1,8 @@
 import { model } from "@medusajs/framework/utils"
-import { ProductOption, ProductVariant } from "./index"
+import ProductOption from "./product-option"
+import ProductProductOption from "./product-product-option"
+import ProductProductOptionValue from "./product-product-option-value"
+import ProductVariant from "./product-variant"
 
 const ProductOptionValue = model
   .define("ProductOptionValue", {
@@ -15,6 +18,10 @@ const ProductOptionValue = model
     variants: model.manyToMany(() => ProductVariant, {
       mappedBy: "options",
     }),
+    product_options: model.manyToMany(() => ProductProductOption, {
+      pivotEntity: () => ProductProductOptionValue,
+      mappedBy: "values",
+    }),
   })
   .indexes([
     {
diff --git a/packages/modules/product/src/models/product-product-option-value.ts b/packages/modules/product/src/models/product-product-option-value.ts
new file mode 100644
index 0000000000000..3f6c7fbf4caf6
--- /dev/null
+++ b/packages/modules/product/src/models/product-product-option-value.ts
@@ -0,0 +1,15 @@
+import { model } from "@medusajs/framework/utils"
+import ProductOptionValue from "./product-option-value"
+import ProductProductOption from "./product-product-option"
+
+const ProductProductOptionValue = model.define("ProductProductOptionValue", {
+  id: model.id({ prefix: "prodoptval" }).primaryKey(),
+  product_product_option: model.belongsTo(() => ProductProductOption, {
+    mappedBy: "values",
+  }),
+  product_option_value: model.belongsTo(() => ProductOptionValue, {
+    mappedBy: "product_options",
+  }),
+})
+
+export default ProductProductOptionValue
diff --git a/packages/modules/product/src/models/product-product-option.ts b/packages/modules/product/src/models/product-product-option.ts
index 45013b5fbffda..ccd6eda94286e 100644
--- a/packages/modules/product/src/models/product-product-option.ts
+++ b/packages/modules/product/src/models/product-product-option.ts
@@ -1,6 +1,8 @@
 import { model } from "@medusajs/framework/utils"
 import Product from "./product"
 import ProductOption from "./product-option"
+import ProductOptionValue from "./product-option-value"
+import ProductProductOptionValue from "./product-product-option-value"
 
 const ProductProductOption = model.define("ProductProductOption", {
   id: model.id({ prefix: "prodopt" }).primaryKey(),
@@ -10,6 +12,9 @@ const ProductProductOption = model.define("ProductProductOption", {
   product_option: model.belongsTo(() => ProductOption, {
     mappedBy: "products",
   }),
+  values: model.manyToMany(() => ProductOptionValue, {
+    pivotEntity: () => ProductProductOptionValue,
+  }),
 })
 
 export default ProductProductOption
diff --git a/packages/modules/product/src/models/product.ts b/packages/modules/product/src/models/product.ts
index d27754b689b13..4718d632ef657 100644
--- a/packages/modules/product/src/models/product.ts
+++ b/packages/modules/product/src/models/product.ts
@@ -4,10 +4,10 @@ import ProductCategory from "./product-category"
 import ProductCollection from "./product-collection"
 import ProductImage from "./product-image"
 import ProductOption from "./product-option"
+import ProductProductOption from "./product-product-option"
 import ProductTag from "./product-tag"
 import ProductType from "./product-type"
 import ProductVariant from "./product-variant"
-import ProductProductOption from "./product-product-option"
 
 const Product = model
   .define("Product", {
@@ -47,6 +47,9 @@ const Product = model
     options: model.manyToMany(() => ProductOption, {
       pivotEntity: () => ProductProductOption,
     }),
+    product_options: model.hasMany(() => ProductProductOption, {
+      mappedBy: "product",
+    }),
     images: model.hasMany(() => ProductImage, {
       mappedBy: "product",
     }),
diff --git a/packages/modules/product/src/services/product-module-service.ts b/packages/modules/product/src/services/product-module-service.ts
index 0ac78d5c983e0..7b55f42fbae70 100644
--- a/packages/modules/product/src/services/product-module-service.ts
+++ b/packages/modules/product/src/services/product-module-service.ts
@@ -18,6 +18,7 @@ import {
   ProductOption,
   ProductOptionValue,
   ProductProductOption,
+  ProductProductOptionValue,
   ProductTag,
   ProductType,
   ProductVariant,
@@ -76,6 +77,7 @@ type InjectedDependencies = {
   productTypeService: ModulesSdkTypes.IMedusaInternalService<any>
   productOptionService: ModulesSdkTypes.IMedusaInternalService<any>
   productProductOptionService: ModulesSdkTypes.IMedusaInternalService<any>
+  productProductOptionValueService: ModulesSdkTypes.IMedusaInternalService<any>
   productOptionValueService: ModulesSdkTypes.IMedusaInternalService<any>
   productVariantProductImageService: ModulesSdkTypes.IMedusaInternalService<any>
   [Modules.EVENT_BUS]?: IEventBusModuleService
@@ -153,6 +155,9 @@ export default class ProductModuleService
   protected readonly productProductOptionService_: ModulesSdkTypes.IMedusaInternalService<
     InferEntityType<typeof ProductProductOption>
   >
+  protected readonly productProductOptionValueService_: ModulesSdkTypes.IMedusaInternalService<
+    InferEntityType<typeof ProductProductOptionValue>
+  >
   protected readonly productVariantProductImageService_: ModulesSdkTypes.IMedusaInternalService<
     InferEntityType<typeof ProductVariantProductImage>
   >
@@ -171,6 +176,7 @@ export default class ProductModuleService
       productTypeService,
       productOptionService,
       productProductOptionService,
+      productProductOptionValueService,
       productOptionValueService,
       productVariantProductImageService,
       [Modules.EVENT_BUS]: eventBusModuleService,
@@ -192,6 +198,7 @@ export default class ProductModuleService
     this.productTypeService_ = productTypeService
     this.productOptionService_ = productOptionService
     this.productProductOptionService_ = productProductOptionService
+    this.productProductOptionValueService_ = productProductOptionValueService
     this.productOptionValueService_ = productOptionValueService
     this.productVariantProductImageService_ = productVariantProductImageService
     this.eventBusModuleService_ = eventBusModuleService
@@ -210,11 +217,19 @@ export default class ProductModuleService
   ): Promise<ProductTypes.ProductDTO> {
     const relationsSet = new Set(config?.relations ?? [])
     const shouldLoadVariantImages = relationsSet.has("variants.images")
+    const shouldFilterOptionValues = relationsSet.has("options.values")
+
     if (shouldLoadVariantImages) {
       relationsSet.add("variants")
       relationsSet.add("images")
     }
 
+    if (shouldFilterOptionValues) {
+      relationsSet.add("options")
+      relationsSet.add("product_options")
+      relationsSet.add("product_options.values")
+    }
+
     const product = await this.productService_.retrieve(
       productId,
       this.getProductFindConfig_({
@@ -232,6 +247,10 @@ export default class ProductModuleService
       )
     }
 
+    if (shouldFilterOptionValues) {
+      this.filterOptionValuesByProduct(product)
+    }
+
     return this.baseRepository_.serialize<ProductTypes.ProductDTO>(product)
   }
 
@@ -249,6 +268,12 @@ export default class ProductModuleService
       relationsSet.add("images")
     }
 
+    const shouldFilterOptionValues = relationsSet.has("options.values")
+    if (shouldFilterOptionValues) {
+      relationsSet.add("product_options")
+      relationsSet.add("product_options.values")
+    }
+
     const products = await this.productService_.list(
       filters,
       this.getProductFindConfig_({
@@ -270,6 +295,10 @@ export default class ProductModuleService
       }
     }
 
+    if (shouldFilterOptionValues) {
+      this.filterOptionValuesByProducts(products)
+    }
+
     return this.baseRepository_.serialize<ProductTypes.ProductDTO[]>(products)
   }
 
@@ -282,6 +311,8 @@ export default class ProductModuleService
   ): Promise<[ProductTypes.ProductDTO[], number]> {
     const shouldLoadVariantImages =
       config?.relations?.includes("variants.images")
+    const shouldFilterOptionValues =
+      config?.relations?.includes("options.values")
 
     // Ensure we load necessary relations
     const relations = [...(config?.relations || [])]
@@ -294,6 +325,15 @@ export default class ProductModuleService
       }
     }
 
+    if (shouldFilterOptionValues) {
+      if (!relations.includes("product_options")) {
+        relations.push("product_options")
+      }
+      if (!relations.includes("product_options.values")) {
+        relations.push("product_options.values")
+      }
+    }
+
     const [products, count] = await this.productService_.listAndCount(
       filters,
       this.getProductFindConfig_({ ...config, relations }),
@@ -312,6 +352,10 @@ export default class ProductModuleService
       }
     }
 
+    if (shouldFilterOptionValues) {
+      this.filterOptionValuesByProducts(products)
+    }
+
     const serializedProducts = await this.baseRepository_.serialize<
       ProductTypes.ProductDTO[]
     >(products)
@@ -1143,18 +1187,69 @@ export default class ProductModuleService
       | ProductTypes.ProductOptionProductPair[],
     @MedusaContext() sharedContext: Context = {}
   ): Promise<{ id: string } | { id: string }[]> {
-    const productOptionProducts =
+    const pairs = Array.isArray(data) ? data : [data]
+
+    const productProductOptions =
       await this.productProductOptionService_.create(data, sharedContext)
 
+    const createdPPOs = (
+      Array.isArray(productProductOptions)
+        ? productProductOptions
+        : [productProductOptions]
+    ) as InferEntityType<typeof ProductProductOption>[]
+
+    const uniqueOptionIds = [...new Set(pairs.map((p) => p.product_option_id))]
+    const options = await this.productOptionService_.list(
+      { id: uniqueOptionIds },
+      { relations: ["values"] },
+      sharedContext
+    )
+
+    const optionValuesMap = new Map(
+      options.map((opt) => [opt.id, opt.values || []])
+    )
+
+    const valuePairsToCreate: {
+      product_product_option_id: string
+      product_option_value_id: string
+    }[] = []
+
+    for (const ppo of createdPPOs) {
+      const originalPair = pairs.find(
+        (p) => p.product_option_id === (ppo as any).product_option_id
+      )
+      if (originalPair) {
+        const allValues =
+          optionValuesMap.get(originalPair.product_option_id) || []
+
+        // If specific value IDs were provided, use only those; otherwise use all values
+        const valuesToLink = originalPair.product_option_value_ids
+          ? allValues.filter((v) =>
+              originalPair.product_option_value_ids!.includes(v.id)
+            )
+          : allValues
+
+        for (const value of valuesToLink) {
+          valuePairsToCreate.push({
+            product_product_option_id: ppo.id,
+            product_option_value_id: value.id,
+          })
+        }
+      }
+    }
+
+    if (valuePairsToCreate.length > 0) {
+      await this.productProductOptionValueService_.create(
+        valuePairsToCreate,
+        sharedContext
+      )
+    }
+
     if (Array.isArray(data)) {
-      return (
-        productOptionProducts as unknown as InferEntityType<
-          typeof ProductProductOption
-        >[]
-      ).map((ppo) => ({ id: ppo.id }))
+      return createdPPOs.map((ppo) => ({ id: ppo.id }))
     }
 
-    return { id: productOptionProducts.id }
+    return { id: createdPPOs[0].id }
   }
 
   async removeProductOptionFromProduct(
@@ -1191,8 +1286,16 @@ export default class ProductModuleService
         $or: pairs,
       }
     )
+
+    const productOptionsProductIds = productOptionsProducts.map(({ id }) => id)
+
+    await this.productProductOptionValueService_.delete(
+      productOptionsProductIds.map((id) => ({ product_product_option_id: id })),
+      sharedContext
+    )
+
     await this.productProductOptionService_.delete(
-      productOptionsProducts.map(({ id }) => id),
+      productOptionsProductIds,
       sharedContext
     )
   }
@@ -1816,6 +1919,7 @@ export default class ProductModuleService
             id: dbOption.id,
             title: dbOption.title,
             values: dbOption.values?.map((v) => ({ value: v.value })),
+            value_ids: option.value_ids,
           }
         }
         return option
@@ -1951,24 +2055,33 @@ export default class ProductModuleService
       const hydratedProduct = hydratedData.find(
         (p) => p.title === product.title
       )
-      const allOptionIds: string[] = []
+      const existingOptions: { id: string; value_ids?: string[] }[] = []
 
       if (hydratedProduct?.options?.length) {
         for (const option of hydratedProduct.options) {
           if ("id" in option) {
-            allOptionIds.push(option.id)
+            existingOptions.push({
+              id: option.id,
+              value_ids: option.value_ids,
+            })
           }
         }
       }
 
       const newOptionIds = productToOptionIdsMap.get(product.id) ?? []
-      const optionIds = [...new Set([...allOptionIds, ...newOptionIds])]
+      const newOptions = newOptionIds.map((id) => ({ id }))
+      const allOptions = [...existingOptions, ...newOptions]
 
-      for (const optionId of optionIds) {
-        linkPairs.push({
+      for (const option of allOptions) {
+        const pair: ProductTypes.ProductOptionProductPair = {
           product_id: product.id,
-          product_option_id: optionId,
-        })
+          product_option_id: option.id,
+          product_option_value_ids: (option as any).value_ids
+            ? (option as any).value_ids
+            : undefined,
+        }
+
+        linkPairs.push(pair)
       }
     }
 
@@ -1976,8 +2089,9 @@ export default class ProductModuleService
       await this.addProductOptionToProduct_(linkPairs, sharedContext)
     }
 
-    const productIds = createdProducts.map((p) => p.id)
+    await (sharedContext.transactionManager as any).flush()
 
+    const productIds = createdProducts.map((p) => p.id)
     const productsWithOptions = await this.productService_.list(
       { id: productIds },
       {
@@ -1985,6 +2099,8 @@ export default class ProductModuleService
           "options",
           "options.values",
           "options.products",
+          "product_options",
+          "product_options.values",
           "variants",
           "images",
           "tags",
@@ -1993,6 +2109,9 @@ export default class ProductModuleService
       sharedContext
     )
 
+    // Filter option values to only include those associated with each product
+    this.filterOptionValuesByProducts(productsWithOptions)
+
     const productIdOrder = new Map(productIds.map((id, index) => [id, index]))
 
     const orderedProductsWithOptions = [...productsWithOptions].sort(
@@ -2121,6 +2240,9 @@ export default class ProductModuleService
       sharedContext
     )
 
+    // Filter option values to only include those associated with each product
+    this.filterOptionValuesByProducts(updatedProducts)
+
     return updatedProducts
   }
 
@@ -2301,6 +2423,7 @@ export default class ProductModuleService
                 value: value,
               }
             }),
+            is_exclusive: (option as any).is_exclusive ?? true, // Always default to true for options created from product creation
             ...((option as any).id ? { id: (option as any).id } : {}),
           }
         })
@@ -2849,6 +2972,48 @@ export default class ProductModuleService
     return result
   }
 
+  private filterOptionValuesByProducts(products: any[]): void {
+    for (const product of products) {
+      this.filterOptionValuesByProduct(product)
+    }
+  }
+
+  private filterOptionValuesByProduct(product: any): void {
+    if (!product.options || !(product as any).product_options) {
+      return
+    }
+
+    const productOptions = Array.isArray(product.product_options)
+      ? product.product_options
+      : (product.product_options as any)?.toArray?.() ?? []
+
+    // Build a Set of value IDs that are actually associated with this product
+    const allowedValueIds = new Set<string>()
+
+    for (const productOption of productOptions) {
+      const values = Array.isArray(productOption.values)
+        ? productOption.values
+        : (productOption.values as any)?.toArray?.() ?? []
+
+      for (const value of values) {
+        allowedValueIds.add(value.id)
+      }
+    }
+
+    // Filter the values in each option to only include allowed ones
+    if (product.options) {
+      for (const option of product.options) {
+        if (option.values) {
+          option.values = option.values.filter((value: any) =>
+            allowedValueIds.has(value.id)
+          )
+        }
+      }
+    }
+
+    delete product.product_options
+  }
+
   private async buildVariantImagesFromProduct(
     variants: InferEntityType<typeof ProductVariant>[],
     productImages: InferEntityType<typeof ProductImage>[],