diff --git a/.changeset/calm-turtles-enjoy.md b/.changeset/calm-turtles-enjoy.md
new file mode 100644
index 0000000000..34d640da70
--- /dev/null
+++ b/.changeset/calm-turtles-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+Feat(admin-ui): add metadata controls for stock locations
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
index 80a8345b99..e74bfab796 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
@@ -4,19 +4,26 @@ import {
   StockLocationAddressInput,
   StockLocationDTO,
 } from "@medusajs/medusa"
-import { useAdminUpdateStockLocation } from "medusa-react"
-import { useForm } from "react-hook-form"
+import GeneralForm, { GeneralFormType } from "../components/general-form"
+import MetadataForm, {
+  MetadataFormType,
+  getMetadataFormValues,
+  getSubmittableMetadata,
+} from "../../../../components/forms/general/metadata-form"
+
+import AddressForm from "../components/address-form"
 import Button from "../../../../components/fundamentals/button"
 import Modal from "../../../../components/molecules/modal"
-import useNotification from "../../../../hooks/use-notification"
 import { getErrorMessage } from "../../../../utils/error-messages"
 import { nestedForm } from "../../../../utils/nested-form"
-import AddressForm from "../components/address-form"
-import GeneralForm, { GeneralFormType } from "../components/general-form"
+import { useAdminUpdateStockLocation } from "medusa-react"
+import { useForm } from "react-hook-form"
+import useNotification from "../../../../hooks/use-notification"
 
 type EditLocationForm = {
   general: GeneralFormType
   address: StockLocationAddressDTO
+  metadata: MetadataFormType
 }
 
 export type LocationEditModalProps = {
@@ -31,6 +38,7 @@ const LocationEditModal = ({ onClose, location }: LocationEditModalProps) => {
         name: location.name,
       }, // @ts-ignore
       address: location.address,
+      metadata: getMetadataFormValues(location.metadata),
     },
     reValidateMode: "onBlur",
     mode: "onBlur",
@@ -67,6 +75,10 @@ const LocationEditModal = ({ onClose, location }: LocationEditModalProps) => {
             <div className="mt-xlarge gap-y-xlarge flex flex-col">
               <GeneralForm form={nestedForm(form, "general")} />
               <AddressForm form={nestedForm(form, "address")} />
+              <div>
+                <h2 className="inter-base-semibold mb-base">Metadata</h2>
+                <MetadataForm form={nestedForm(form, "metadata")} />
+              </div>
             </div>
           </form>
         </Modal.Content>
@@ -97,7 +109,7 @@ const LocationEditModal = ({ onClose, location }: LocationEditModalProps) => {
 }
 
 const createPayload = (data): AdminPostStockLocationsReq => {
-  const { general, address } = data
+  const { general, address, metadata } = data
 
   let addressInput
   if (address.address_1) {
@@ -113,6 +125,7 @@ const createPayload = (data): AdminPostStockLocationsReq => {
   return {
     name: general.name,
     address: addressInput,
+    metadata: getSubmittableMetadata(metadata),
   }
 }
 
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/new/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/new/index.tsx
index f9fddbd864..67ab0367a3 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/new/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/new/index.tsx
@@ -1,5 +1,9 @@
 import { AdminPostStockLocationsReq, SalesChannel } from "@medusajs/medusa"
 import GeneralForm, { GeneralFormType } from "../components/general-form"
+import MetadataForm, {
+  MetadataFormType,
+  getSubmittableMetadata,
+} from "../../../../components/forms/general/metadata-form"
 import {
   StockLocationAddressDTO,
   StockLocationAddressInput,
@@ -27,6 +31,7 @@ import useToggleState from "../../../../hooks/use-toggle-state"
 type NewLocationForm = {
   general: GeneralFormType
   address: StockLocationAddressDTO
+  metadata: MetadataFormType
   salesChannels: {
     channels: Omit<SalesChannel, "locations">[]
   }
@@ -179,6 +184,10 @@ const NewLocation = ({ onClose }: { onClose: () => void }) => {
                 <div className="mt-xlarge gap-y-xlarge flex flex-col pb-0.5">
                   <GeneralForm form={nestedForm(form, "general")} />
                   <AddressForm form={nestedForm(form, "address")} />
+                  <div>
+                    <h2 className="inter-base-semibold mb-base">Metadata</h2>
+                    <MetadataForm form={nestedForm(form, "metadata")} />
+                  </div>
                 </div>
               </Accordion.Item>
               {isFeatureEnabled("sales_channels") && (
@@ -212,7 +221,7 @@ const createPayload = (
   locationPayload: AdminPostStockLocationsReq
   salesChannelsPayload: SalesChannel[]
 } => {
-  const { general, address } = data
+  const { general, address, metadata } = data
 
   let addressInput
   if (address.address_1) {
@@ -220,7 +229,11 @@ const createPayload = (
     addressInput.country_code = address.country_code.value
   }
   return {
-    locationPayload: { name: general.name, address: addressInput },
+    locationPayload: {
+      name: general.name,
+      address: addressInput,
+      metadata: getSubmittableMetadata(metadata),
+    },
     salesChannelsPayload: data.salesChannels.channels,
   }
 }