diff --git a/enhancements/computeinstance-phase-condition-expansion/README.md b/enhancements/OSAC-1027-computeinstance-phase-condition-expansion/README.md
similarity index 99%
rename from enhancements/computeinstance-phase-condition-expansion/README.md
rename to enhancements/OSAC-1027-computeinstance-phase-condition-expansion/README.md
index 52ce718a0..bd0dddb26 100644
--- a/enhancements/computeinstance-phase-condition-expansion/README.md
+++ b/enhancements/OSAC-1027-computeinstance-phase-condition-expansion/README.md
@@ -5,7 +5,7 @@ authors:
 creation-date: 2026-01-29
 last-updated: 2026-04-29
 tracking-link:
-  - TBD
+  - https://redhat.atlassian.net/browse/OSAC-1027
 see-also:
 replaces:
   - "[ComputeInstance-VM_PhasesAndConditions_Proposal (Google Doc)](https://docs.google.com/document/d/1wgqAblnT7OHlT5bvaI4bi842kyeR3u4VfC_TAJXbGcI/edit?usp=sharing)"
diff --git a/enhancements/carbide-integration/README.md b/enhancements/OSAC-1191-carbide-integration/README.md
similarity index 99%
rename from enhancements/carbide-integration/README.md
rename to enhancements/OSAC-1191-carbide-integration/README.md
index 668ae61c8..32c50696d 100644
--- a/enhancements/carbide-integration/README.md
+++ b/enhancements/OSAC-1191-carbide-integration/README.md
@@ -4,8 +4,8 @@ authors:
   - Trey West
 creation-date: 2026-03-09
 last-updated: 2026-03-09
-tracking-link: # link to the tracking ticket (for example: Github issue) that corresponds to this enhancement
-  - None
+tracking-link:
+  - https://redhat.atlassian.net/browse/OSAC-1191
 see-also:
   - enhancements/bare-metal-fulfillment/README.md
 replaces:
diff --git a/enhancements/OSAC-1319-bare-metal-instance-ui/design.md b/enhancements/OSAC-1319-bare-metal-instance-ui/design.md
index 4c6285a70..90d29a2cd 100644
--- a/enhancements/OSAC-1319-bare-metal-instance-ui/design.md
+++ b/enhancements/OSAC-1319-bare-metal-instance-ui/design.md
@@ -83,7 +83,7 @@ Wizard steps:
 3. **Review** — summary of all field values.
 4. Submit → `POST /api/fulfillment/v1/baremetal_instances`. On success → navigate to `/bare-metal/:id`.
 
-The BM adapter follows the same catalog overlay pattern as the VM and cluster adapters (see `/enhancements/cluster-and-vm-provisioning-wizard`): static field paths are hardcoded in `BareMetalConfigurationStep`; catalog `field_definitions` overlay matching paths on the Configuration step only, controlling label (`display_name`), editability (`editable: false` → read-only control), default value, and `validation_schema`. The General step (name, SSH public key) ignores `field_definitions`.
+The BM adapter follows the same catalog overlay pattern as the VM and cluster adapters (see `/enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard`): static field paths are hardcoded in `BareMetalConfigurationStep`; catalog `field_definitions` overlay matching paths on the Configuration step only, controlling label (`display_name`), editability (`editable: false` → read-only control), default value, and `validation_schema`. The General step (name, SSH public key) ignores `field_definitions`.
 
 ```mermaid
 sequenceDiagram
diff --git a/enhancements/cluster-and-vm-provisioning-wizard/design.md b/enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard/design.md
similarity index 100%
rename from enhancements/cluster-and-vm-provisioning-wizard/design.md
rename to enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard/design.md
diff --git a/enhancements/cluster-and-vm-provisioning-wizard/prd.md b/enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard/prd.md
similarity index 100%
rename from enhancements/cluster-and-vm-provisioning-wizard/prd.md
rename to enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard/prd.md
diff --git a/enhancements/storage-control-plane-osac-2872/prd.md b/enhancements/OSAC-2872-storage-control-plane/prd.md
similarity index 100%
rename from enhancements/storage-control-plane-osac-2872/prd.md
rename to enhancements/OSAC-2872-storage-control-plane/prd.md
diff --git a/enhancements/OSAC-55-vm-snapshots/README.md b/enhancements/OSAC-55-vm-snapshots/README.md
index 6d61ab80a..36be71f46 100644
--- a/enhancements/OSAC-55-vm-snapshots/README.md
+++ b/enhancements/OSAC-55-vm-snapshots/README.md
@@ -8,7 +8,7 @@ tracking-link:
   - https://redhat.atlassian.net/browse/OSAC-55
 see-also:
   - "/enhancements/vmaas"
-  - "/enhancements/computeinstance-phase-condition-expansion"
+  - "/enhancements/OSAC-1027-computeinstance-phase-condition-expansion"
   - "/enhancements/OSAC-356-networking"
 replaces:
   - N/A
diff --git a/enhancements/metering-and-usage-tracking/prd.md b/enhancements/OSAC-985-metering-and-usage-tracking/prd.md
similarity index 100%
rename from enhancements/metering-and-usage-tracking/prd.md
rename to enhancements/OSAC-985-metering-and-usage-tracking/prd.md
diff --git a/enhancements/catalog-items/ui-design.md b/enhancements/catalog-items/ui-design.md
index 058156171..de1d339dc 100644
--- a/enhancements/catalog-items/ui-design.md
+++ b/enhancements/catalog-items/ui-design.md
@@ -10,7 +10,7 @@ prd:
   - "README.md"
 see-also:
   - "/enhancements/catalog-items"
-  - "/enhancements/cluster-and-vm-provisioning-wizard"
+  - "/enhancements/OSAC-1421-cluster-and-vm-provisioning-wizard"
 replaces:
 superseded-by:
 ---