diff --git a/docs/api/qiskit/capi.mdx b/docs/api/qiskit/capi.mdx
index 802f463761f9..be3e9aeaab57 100644
--- a/docs/api/qiskit/capi.mdx
+++ b/docs/api/qiskit/capi.mdx
@@ -81,7 +81,9 @@ Additionally, this module contains [`ctypes`](https://docs.python.org/3/library/
 
 ### qiskit.capi.LIB
 
-<Attribute id="qiskit.capi.LIB" attributeTypeHint="ctypes.PyDLL" attributeTypeHintHref="https://docs.python.org/3/library/ctypes.html">
+<Attribute id="qiskit.capi.LIB">
+  Type: [`ctypes.PyDLL`](https://docs.python.org/3/library/ctypes.html#ctypes.PyDLL)
+
   A [`ctypes`](https://docs.python.org/3/library/ctypes.html#module-ctypes) wrapper around the library containing the Qiskit C API.
 
   This is provided for completeness, though you can access all the functions, structs and enumerations directly from the [`qiskit.capi`](#module-qiskit.capi "qiskit.capi") module object.
diff --git a/docs/api/qiskit/circuit.mdx b/docs/api/qiskit/circuit.mdx
index 923fb6108416..e901d5d13928 100644
--- a/docs/api/qiskit/circuit.mdx
+++ b/docs/api/qiskit/circuit.mdx
@@ -656,7 +656,9 @@ The [`SwitchCaseOp`](/docs/api/qiskit/qiskit.circuit.SwitchCaseOp "qiskit.circui
 
 #### qiskit.circuit.CASE\_DEFAULT
 
-<Attribute id="qiskit.circuit.CASE_DEFAULT" attributeValue="<default case>">
+<Attribute id="qiskit.circuit.CASE_DEFAULT">
+  Default value: `<default case>`
+
   A special object that represents the “default” case of a switch statement. If you use this as a case target, it must be the last case, and will match anything that wasn’t already matched. When using the builder interface of [`QuantumCircuit.switch()`](qiskit.circuit.QuantumCircuit#switch "qiskit.circuit.QuantumCircuit.switch"), this can also be accessed as the `DEFAULT` attribute of the bound case-builder object.
 </Attribute>
 
diff --git a/docs/api/qiskit/qasm3.mdx b/docs/api/qiskit/qasm3.mdx
index 48632d8ee8fb..c5c797285eb0 100644
--- a/docs/api/qiskit/qasm3.mdx
+++ b/docs/api/qiskit/qasm3.mdx
@@ -144,7 +144,9 @@ The OpenQASM 3 language is still evolving as hardware capabilities improve, so t
 
   ##### SWITCH\_CASE\_V1
 
-  <Attribute id="qiskit.qasm3.ExperimentalFeatures.SWITCH_CASE_V1" attributeValue="1">
+  <Attribute id="qiskit.qasm3.ExperimentalFeatures.SWITCH_CASE_V1">
+    Default value: `1`
+
     Support exporting switch-case statements as proposed by [https://github.com/openqasm/openqasm/pull/463](https://github.com/openqasm/openqasm/pull/463) at [commit bfa787aa3078](https://github.com/openqasm/openqasm/pull/463/commits/bfa787aa3078).
 
     These have the output format:
diff --git a/docs/api/qiskit/qiskit.circuit.Annotation.mdx b/docs/api/qiskit/qiskit.circuit.Annotation.mdx
index 1fc9949e6bac..98a6e68dc068 100644
--- a/docs/api/qiskit/qiskit.circuit.Annotation.mdx
+++ b/docs/api/qiskit/qiskit.circuit.Annotation.mdx
@@ -29,6 +29,8 @@ python_api_name: qiskit.circuit.Annotation
 
   ### namespace
 
-  <Attribute id="qiskit.circuit.Annotation.namespace" attributeValue="''" />
+  <Attribute id="qiskit.circuit.Annotation.namespace">
+    Default value: `''`
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.circuit.QuantumCircuit.mdx b/docs/api/qiskit/qiskit.circuit.QuantumCircuit.mdx
index 61d6d99d5428..21bfb2c99b9a 100644
--- a/docs/api/qiskit/qiskit.circuit.QuantumCircuit.mdx
+++ b/docs/api/qiskit/qiskit.circuit.QuantumCircuit.mdx
@@ -152,7 +152,9 @@ python_api_name: qiskit.circuit.QuantumCircuit
 
   ### name
 
-  <Attribute id="qiskit.circuit.QuantumCircuit.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.QuantumCircuit.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.AND.mdx b/docs/api/qiskit/qiskit.circuit.library.AND.mdx
index 9e1dfd777438..6e483f4e1fa5 100644
--- a/docs/api/qiskit/qiskit.circuit.library.AND.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.AND.mdx
@@ -37,7 +37,9 @@ python_api_name: qiskit.circuit.library.AND
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.AND.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.AND.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.CDKMRippleCarryAdder.mdx b/docs/api/qiskit/qiskit.circuit.library.CDKMRippleCarryAdder.mdx
index fde8ac1fa0ec..12619e5c2011 100644
--- a/docs/api/qiskit/qiskit.circuit.library.CDKMRippleCarryAdder.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.CDKMRippleCarryAdder.mdx
@@ -97,7 +97,9 @@ python_api_name: qiskit.circuit.library.CDKMRippleCarryAdder
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.CDKMRippleCarryAdder.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.CDKMRippleCarryAdder.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.Diagonal.mdx b/docs/api/qiskit/qiskit.circuit.library.Diagonal.mdx
index a9c00f90e401..b4946ff1a91c 100644
--- a/docs/api/qiskit/qiskit.circuit.library.Diagonal.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.Diagonal.mdx
@@ -29,7 +29,9 @@ python_api_name: qiskit.circuit.library.Diagonal
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.Diagonal.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.Diagonal.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.DraperQFTAdder.mdx b/docs/api/qiskit/qiskit.circuit.library.DraperQFTAdder.mdx
index 7dc7631124ed..a5ebc2681792 100644
--- a/docs/api/qiskit/qiskit.circuit.library.DraperQFTAdder.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.DraperQFTAdder.mdx
@@ -68,7 +68,9 @@ python_api_name: qiskit.circuit.library.DraperQFTAdder
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.DraperQFTAdder.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.DraperQFTAdder.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.EfficientSU2.mdx b/docs/api/qiskit/qiskit.circuit.library.EfficientSU2.mdx
index c667996c6841..22c6dfe9894e 100644
--- a/docs/api/qiskit/qiskit.circuit.library.EfficientSU2.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.EfficientSU2.mdx
@@ -98,7 +98,9 @@ python_api_name: qiskit.circuit.library.EfficientSU2
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.EfficientSU2.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.EfficientSU2.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.EvolvedOperatorAnsatz.mdx b/docs/api/qiskit/qiskit.circuit.library.EvolvedOperatorAnsatz.mdx
index 75e3756bc517..ad7fd69dc8b4 100644
--- a/docs/api/qiskit/qiskit.circuit.library.EvolvedOperatorAnsatz.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.EvolvedOperatorAnsatz.mdx
@@ -72,7 +72,9 @@ python_api_name: qiskit.circuit.library.EvolvedOperatorAnsatz
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.EvolvedOperatorAnsatz.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.EvolvedOperatorAnsatz.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.ExactReciprocal.mdx b/docs/api/qiskit/qiskit.circuit.library.ExactReciprocal.mdx
index bf1aeb17d28f..c24d5c0864b4 100644
--- a/docs/api/qiskit/qiskit.circuit.library.ExactReciprocal.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.ExactReciprocal.mdx
@@ -36,7 +36,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.ExactReciprocal.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.ExactReciprocal.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.ExcitationPreserving.mdx b/docs/api/qiskit/qiskit.circuit.library.ExcitationPreserving.mdx
index 048de35e49ad..41ebf0cc554c 100644
--- a/docs/api/qiskit/qiskit.circuit.library.ExcitationPreserving.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.ExcitationPreserving.mdx
@@ -116,7 +116,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.ExcitationPreserving.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.ExcitationPreserving.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.FourierChecking.mdx b/docs/api/qiskit/qiskit.circuit.library.FourierChecking.mdx
index daf520fabd75..69cfffc0069d 100644
--- a/docs/api/qiskit/qiskit.circuit.library.FourierChecking.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.FourierChecking.mdx
@@ -50,7 +50,9 @@ python_api_name: qiskit.circuit.library.FourierChecking
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.FourierChecking.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.FourierChecking.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.FunctionalPauliRotations.mdx b/docs/api/qiskit/qiskit.circuit.library.FunctionalPauliRotations.mdx
index f1817794d657..6ad9722fc6d9 100644
--- a/docs/api/qiskit/qiskit.circuit.library.FunctionalPauliRotations.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.FunctionalPauliRotations.mdx
@@ -55,7 +55,9 @@ python_api_name: qiskit.circuit.library.FunctionalPauliRotations
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.FunctionalPauliRotations.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.FunctionalPauliRotations.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GMS.mdx b/docs/api/qiskit/qiskit.circuit.library.GMS.mdx
index 00abe8e9fbb1..950ddc7e3d13 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GMS.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GMS.mdx
@@ -57,7 +57,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GMS.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GMS.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GR.mdx b/docs/api/qiskit/qiskit.circuit.library.GR.mdx
index 2c07c6053b23..7e283e71c92d 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GR.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GR.mdx
@@ -47,7 +47,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GR.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GR.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GRX.mdx b/docs/api/qiskit/qiskit.circuit.library.GRX.mdx
index fd8f5fb7b3c9..881f3413d3ca 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GRX.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GRX.mdx
@@ -48,7 +48,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GRX.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GRX.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GRY.mdx b/docs/api/qiskit/qiskit.circuit.library.GRY.mdx
index 6726fbac5c53..eb7689f25d5f 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GRY.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GRY.mdx
@@ -48,7 +48,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GRY.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GRY.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GRZ.mdx b/docs/api/qiskit/qiskit.circuit.library.GRZ.mdx
index 6efea35c8a78..1e5b157eedda 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GRZ.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GRZ.mdx
@@ -48,7 +48,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GRZ.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GRZ.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GraphState.mdx b/docs/api/qiskit/qiskit.circuit.library.GraphState.mdx
index d4f8e8a34ef9..6d01a27902e5 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GraphState.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GraphState.mdx
@@ -57,7 +57,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GraphState.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GraphState.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.GroverOperator.mdx b/docs/api/qiskit/qiskit.circuit.library.GroverOperator.mdx
index cc62595ebc00..ef6917c9263c 100644
--- a/docs/api/qiskit/qiskit.circuit.library.GroverOperator.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.GroverOperator.mdx
@@ -190,7 +190,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.GroverOperator.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.GroverOperator.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.HRSCumulativeMultiplier.mdx b/docs/api/qiskit/qiskit.circuit.library.HRSCumulativeMultiplier.mdx
index 889a6b1857d3..01506a9b2ad2 100644
--- a/docs/api/qiskit/qiskit.circuit.library.HRSCumulativeMultiplier.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.HRSCumulativeMultiplier.mdx
@@ -69,7 +69,9 @@ python_api_name: qiskit.circuit.library.HRSCumulativeMultiplier
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.HRSCumulativeMultiplier.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.HRSCumulativeMultiplier.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.HiddenLinearFunction.mdx b/docs/api/qiskit/qiskit.circuit.library.HiddenLinearFunction.mdx
index b8aa77e363e0..8c45dfce6b9d 100644
--- a/docs/api/qiskit/qiskit.circuit.library.HiddenLinearFunction.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.HiddenLinearFunction.mdx
@@ -59,7 +59,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.HiddenLinearFunction.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.HiddenLinearFunction.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.IQP.mdx b/docs/api/qiskit/qiskit.circuit.library.IQP.mdx
index 9330c35efda3..e6b287ebdae2 100644
--- a/docs/api/qiskit/qiskit.circuit.library.IQP.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.IQP.mdx
@@ -47,7 +47,9 @@ python_api_name: qiskit.circuit.library.IQP
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.IQP.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.IQP.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.InnerProduct.mdx b/docs/api/qiskit/qiskit.circuit.library.InnerProduct.mdx
index be1090c826c0..6a76e1bc3062 100644
--- a/docs/api/qiskit/qiskit.circuit.library.InnerProduct.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.InnerProduct.mdx
@@ -56,7 +56,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.InnerProduct.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.InnerProduct.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.IntegerComparator.mdx b/docs/api/qiskit/qiskit.circuit.library.IntegerComparator.mdx
index b5d48b438e33..fbbfc9a55afd 100644
--- a/docs/api/qiskit/qiskit.circuit.library.IntegerComparator.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.IntegerComparator.mdx
@@ -62,7 +62,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.IntegerComparator.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.IntegerComparator.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.LinearAmplitudeFunction.mdx b/docs/api/qiskit/qiskit.circuit.library.LinearAmplitudeFunction.mdx
index 4be904adf7bf..0fa29e2dfd20 100644
--- a/docs/api/qiskit/qiskit.circuit.library.LinearAmplitudeFunction.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.LinearAmplitudeFunction.mdx
@@ -69,7 +69,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.LinearAmplitudeFunction.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.LinearAmplitudeFunction.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.LinearPauliRotations.mdx b/docs/api/qiskit/qiskit.circuit.library.LinearPauliRotations.mdx
index 82b5eb4a94d8..dfa0f02a5909 100644
--- a/docs/api/qiskit/qiskit.circuit.library.LinearPauliRotations.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.LinearPauliRotations.mdx
@@ -70,7 +70,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.LinearPauliRotations.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.LinearPauliRotations.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.MCMT.mdx b/docs/api/qiskit/qiskit.circuit.library.MCMT.mdx
index cbc49d77da5c..9f183352cdca 100644
--- a/docs/api/qiskit/qiskit.circuit.library.MCMT.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.MCMT.mdx
@@ -57,7 +57,9 @@ python_api_name: qiskit.circuit.library.MCMT
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.MCMT.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.MCMT.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.MCMTVChain.mdx b/docs/api/qiskit/qiskit.circuit.library.MCMTVChain.mdx
index 97ce88e9dd81..6e3763de2363 100644
--- a/docs/api/qiskit/qiskit.circuit.library.MCMTVChain.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.MCMTVChain.mdx
@@ -74,7 +74,9 @@ python_api_name: qiskit.circuit.library.MCMTVChain
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.MCMTVChain.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.MCMTVChain.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.NLocal.mdx b/docs/api/qiskit/qiskit.circuit.library.NLocal.mdx
index 412088a3fa8f..eecf2de19543 100644
--- a/docs/api/qiskit/qiskit.circuit.library.NLocal.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.NLocal.mdx
@@ -220,7 +220,9 @@ python_api_name: qiskit.circuit.library.NLocal
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.NLocal.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.NLocal.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.OR.mdx b/docs/api/qiskit/qiskit.circuit.library.OR.mdx
index fe6555bc5b41..d7da40f9089a 100644
--- a/docs/api/qiskit/qiskit.circuit.library.OR.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.OR.mdx
@@ -37,7 +37,9 @@ python_api_name: qiskit.circuit.library.OR
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.OR.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.OR.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PauliFeatureMap.mdx b/docs/api/qiskit/qiskit.circuit.library.PauliFeatureMap.mdx
index ee7f884967cb..d328a70e8136 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PauliFeatureMap.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PauliFeatureMap.mdx
@@ -162,7 +162,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PauliFeatureMap.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PauliFeatureMap.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PauliTwoDesign.mdx b/docs/api/qiskit/qiskit.circuit.library.PauliTwoDesign.mdx
index 92b7bbb0fcb8..65742cee58e5 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PauliTwoDesign.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PauliTwoDesign.mdx
@@ -81,7 +81,9 @@ python_api_name: qiskit.circuit.library.PauliTwoDesign
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PauliTwoDesign.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PauliTwoDesign.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.Permutation.mdx b/docs/api/qiskit/qiskit.circuit.library.Permutation.mdx
index 0a0804c8213c..d1b5df94fb4a 100644
--- a/docs/api/qiskit/qiskit.circuit.library.Permutation.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.Permutation.mdx
@@ -39,7 +39,9 @@ python_api_name: qiskit.circuit.library.Permutation
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.Permutation.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.Permutation.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PhaseEstimation.mdx b/docs/api/qiskit/qiskit.circuit.library.PhaseEstimation.mdx
index 43257676eed1..1b276158d2e1 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PhaseEstimation.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PhaseEstimation.mdx
@@ -52,7 +52,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PhaseEstimation.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PhaseEstimation.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PhaseOracle.mdx b/docs/api/qiskit/qiskit.circuit.library.PhaseOracle.mdx
index b249f1a6e701..a982ce555bdc 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PhaseOracle.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PhaseOracle.mdx
@@ -38,7 +38,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PhaseOracle.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PhaseOracle.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PiecewiseChebyshev.mdx b/docs/api/qiskit/qiskit.circuit.library.PiecewiseChebyshev.mdx
index 3485816c47c4..43cc18724ebe 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PiecewiseChebyshev.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PiecewiseChebyshev.mdx
@@ -106,7 +106,9 @@ python_api_name: qiskit.circuit.library.PiecewiseChebyshev
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PiecewiseChebyshev.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PiecewiseChebyshev.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PiecewiseLinearPauliRotations.mdx b/docs/api/qiskit/qiskit.circuit.library.PiecewiseLinearPauliRotations.mdx
index cbd9093d14ad..84886396befa 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PiecewiseLinearPauliRotations.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PiecewiseLinearPauliRotations.mdx
@@ -91,7 +91,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PiecewiseLinearPauliRotations.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PiecewiseLinearPauliRotations.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PiecewisePolynomialPauliRotations.mdx b/docs/api/qiskit/qiskit.circuit.library.PiecewisePolynomialPauliRotations.mdx
index 727950e62c17..5bee41543f9b 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PiecewisePolynomialPauliRotations.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PiecewisePolynomialPauliRotations.mdx
@@ -123,7 +123,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PiecewisePolynomialPauliRotations.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PiecewisePolynomialPauliRotations.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.PolynomialPauliRotations.mdx b/docs/api/qiskit/qiskit.circuit.library.PolynomialPauliRotations.mdx
index 331986c86a69..99cd8d2dcfd0 100644
--- a/docs/api/qiskit/qiskit.circuit.library.PolynomialPauliRotations.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.PolynomialPauliRotations.mdx
@@ -88,7 +88,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.PolynomialPauliRotations.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.PolynomialPauliRotations.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.QAOAAnsatz.mdx b/docs/api/qiskit/qiskit.circuit.library.QAOAAnsatz.mdx
index 0058fa043566..9512f12b366f 100644
--- a/docs/api/qiskit/qiskit.circuit.library.QAOAAnsatz.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.QAOAAnsatz.mdx
@@ -100,7 +100,9 @@ python_api_name: qiskit.circuit.library.QAOAAnsatz
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.QAOAAnsatz.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.QAOAAnsatz.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.QFT.mdx b/docs/api/qiskit/qiskit.circuit.library.QFT.mdx
index ca21e2e5be0e..08c4a0697c48 100644
--- a/docs/api/qiskit/qiskit.circuit.library.QFT.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.QFT.mdx
@@ -92,7 +92,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.QFT.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.QFT.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.QuadraticForm.mdx b/docs/api/qiskit/qiskit.circuit.library.QuadraticForm.mdx
index 614c5a298257..fe7736a4fee2 100644
--- a/docs/api/qiskit/qiskit.circuit.library.QuadraticForm.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.QuadraticForm.mdx
@@ -58,7 +58,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.QuadraticForm.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.QuadraticForm.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.QuantumVolume.mdx b/docs/api/qiskit/qiskit.circuit.library.QuantumVolume.mdx
index 7d5ce2bc2b6a..f3a1f7d9fd01 100644
--- a/docs/api/qiskit/qiskit.circuit.library.QuantumVolume.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.QuantumVolume.mdx
@@ -45,7 +45,9 @@ python_api_name: qiskit.circuit.library.QuantumVolume
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.QuantumVolume.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.QuantumVolume.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.RGQFTMultiplier.mdx b/docs/api/qiskit/qiskit.circuit.library.RGQFTMultiplier.mdx
index 58bf23348745..3939053733bb 100644
--- a/docs/api/qiskit/qiskit.circuit.library.RGQFTMultiplier.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.RGQFTMultiplier.mdx
@@ -50,7 +50,9 @@ python_api_name: qiskit.circuit.library.RGQFTMultiplier
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.RGQFTMultiplier.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.RGQFTMultiplier.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.RealAmplitudes.mdx b/docs/api/qiskit/qiskit.circuit.library.RealAmplitudes.mdx
index 93344d621f5c..b458dd59fdc9 100644
--- a/docs/api/qiskit/qiskit.circuit.library.RealAmplitudes.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.RealAmplitudes.mdx
@@ -137,7 +137,9 @@ python_api_name: qiskit.circuit.library.RealAmplitudes
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.RealAmplitudes.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.RealAmplitudes.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.TwoLocal.mdx b/docs/api/qiskit/qiskit.circuit.library.TwoLocal.mdx
index 02006af1d471..f64ffa6f544f 100644
--- a/docs/api/qiskit/qiskit.circuit.library.TwoLocal.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.TwoLocal.mdx
@@ -134,7 +134,9 @@ python_api_name: qiskit.circuit.library.TwoLocal
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.TwoLocal.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.TwoLocal.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.UnitaryOverlap.mdx b/docs/api/qiskit/qiskit.circuit.library.UnitaryOverlap.mdx
index cf9926069fcf..10633a3012da 100644
--- a/docs/api/qiskit/qiskit.circuit.library.UnitaryOverlap.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.UnitaryOverlap.mdx
@@ -67,7 +67,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.UnitaryOverlap.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.UnitaryOverlap.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.VBERippleCarryAdder.mdx b/docs/api/qiskit/qiskit.circuit.library.VBERippleCarryAdder.mdx
index b568b9887344..501046f60af3 100644
--- a/docs/api/qiskit/qiskit.circuit.library.VBERippleCarryAdder.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.VBERippleCarryAdder.mdx
@@ -69,7 +69,9 @@ python_api_name: qiskit.circuit.library.VBERippleCarryAdder
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.VBERippleCarryAdder.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.VBERippleCarryAdder.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.WeightedAdder.mdx b/docs/api/qiskit/qiskit.circuit.library.WeightedAdder.mdx
index 835f3a7e6cd1..3854f56e95cb 100644
--- a/docs/api/qiskit/qiskit.circuit.library.WeightedAdder.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.WeightedAdder.mdx
@@ -118,7 +118,9 @@ $$
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.WeightedAdder.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.WeightedAdder.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.XOR.mdx b/docs/api/qiskit/qiskit.circuit.library.XOR.mdx
index 9a63c2fdf2fc..a5e9d7aa249d 100644
--- a/docs/api/qiskit/qiskit.circuit.library.XOR.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.XOR.mdx
@@ -39,7 +39,9 @@ python_api_name: qiskit.circuit.library.XOR
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.XOR.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.XOR.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.ZFeatureMap.mdx b/docs/api/qiskit/qiskit.circuit.library.ZFeatureMap.mdx
index 6c2a5a735b73..c44f39fccbf4 100644
--- a/docs/api/qiskit/qiskit.circuit.library.ZFeatureMap.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.ZFeatureMap.mdx
@@ -85,7 +85,9 @@ python_api_name: qiskit.circuit.library.ZFeatureMap
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.ZFeatureMap.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.ZFeatureMap.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.circuit.library.ZZFeatureMap.mdx b/docs/api/qiskit/qiskit.circuit.library.ZZFeatureMap.mdx
index 7fa44ad0793b..499704233ad8 100644
--- a/docs/api/qiskit/qiskit.circuit.library.ZZFeatureMap.mdx
+++ b/docs/api/qiskit/qiskit.circuit.library.ZZFeatureMap.mdx
@@ -106,7 +106,9 @@ python_api_name: qiskit.circuit.library.ZZFeatureMap
 
   ### name
 
-  <Attribute id="qiskit.circuit.library.ZZFeatureMap.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.circuit.library.ZZFeatureMap.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.dagcircuit.DAGDepNode.mdx b/docs/api/qiskit/qiskit.dagcircuit.DAGDepNode.mdx
index 4bb4ea90ac87..97742d514bac 100644
--- a/docs/api/qiskit/qiskit.dagcircuit.DAGDepNode.mdx
+++ b/docs/api/qiskit/qiskit.dagcircuit.DAGDepNode.mdx
@@ -30,23 +30,33 @@ python_api_name: qiskit.dagcircuit.DAGDepNode
 
   ### cargs
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.cargs" attributeTypeHint="tuple[Clbit, ...]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.cargs">
+    Type: [`tuple`](https://docs.python.org/3/library/stdtypes.html#tuple)\[[`Clbit`](/docs/api/qiskit/circuit#qiskit.circuit.Clbit "qiskit.circuit.Clbit"), ...]
+  </Attribute>
 
   ### cindices
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.cindices" attributeTypeHint="tuple[int, ...]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.cindices">
+    Type: [`tuple`](https://docs.python.org/3/library/stdtypes.html#tuple)\[[`int`](https://docs.python.org/3/library/functions.html#int), ...]
+  </Attribute>
 
   ### isblocked
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.isblocked" attributeTypeHint="bool" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.isblocked">
+    Type: [`bool`](https://docs.python.org/3/library/functions.html#bool)
+  </Attribute>
 
   ### matchedwith
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.matchedwith" attributeTypeHint="list[int] | None" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.matchedwith">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`int`](https://docs.python.org/3/library/functions.html#int)] | [`None`](https://docs.python.org/3/library/constants.html#None)
+  </Attribute>
 
   ### name
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.name" attributeTypeHint="str | None" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str) | [`None`](https://docs.python.org/3/library/constants.html#None)
+  </Attribute>
 
   ### node\_id
 
@@ -54,31 +64,45 @@ python_api_name: qiskit.dagcircuit.DAGDepNode
 
   ### predecessors
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.predecessors" attributeTypeHint="list[int]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.predecessors">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`int`](https://docs.python.org/3/library/functions.html#int)]
+  </Attribute>
 
   ### qindices
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.qindices" attributeTypeHint="tuple[int, ...]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.qindices">
+    Type: [`tuple`](https://docs.python.org/3/library/stdtypes.html#tuple)\[[`int`](https://docs.python.org/3/library/functions.html#int), ...]
+  </Attribute>
 
   ### reachable
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.reachable" attributeTypeHint="bool | None" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.reachable">
+    Type: [`bool`](https://docs.python.org/3/library/functions.html#bool) | [`None`](https://docs.python.org/3/library/constants.html#None)
+  </Attribute>
 
   ### sort\_key
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.sort_key" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.sort_key">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+  </Attribute>
 
   ### successors
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.successors" attributeTypeHint="list[int]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.successors">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`int`](https://docs.python.org/3/library/functions.html#int)]
+  </Attribute>
 
   ### successorstovisit
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.successorstovisit" attributeTypeHint="list[int] | None" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.successorstovisit">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`int`](https://docs.python.org/3/library/functions.html#int)] | [`None`](https://docs.python.org/3/library/constants.html#None)
+  </Attribute>
 
   ### type
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.type" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.type">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+  </Attribute>
 
   ### op
 
@@ -88,7 +112,9 @@ python_api_name: qiskit.dagcircuit.DAGDepNode
 
   ### qargs
 
-  <Attribute id="qiskit.dagcircuit.DAGDepNode.qargs" attributeTypeHint="tuple[Qubit, ...]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.dagcircuit.DAGDepNode.qargs">
+    Type: [`tuple`](https://docs.python.org/3/library/stdtypes.html#tuple)\[[`Qubit`](/docs/api/qiskit/circuit#qiskit.circuit.Qubit "qiskit.circuit.Qubit"), ...]
+
     Returns list of Qubit, else an empty list.
   </Attribute>
 
diff --git a/docs/api/qiskit/qiskit.passmanager.PassManagerState.mdx b/docs/api/qiskit/qiskit.passmanager.PassManagerState.mdx
index 9a64ecf31245..3a5b17ba25ca 100644
--- a/docs/api/qiskit/qiskit.passmanager.PassManagerState.mdx
+++ b/docs/api/qiskit/qiskit.passmanager.PassManagerState.mdx
@@ -26,13 +26,17 @@ python_api_name: qiskit.passmanager.PassManagerState
 
   ### workflow\_status
 
-  <Attribute id="qiskit.passmanager.PassManagerState.workflow_status" attributeTypeHint="WorkflowStatus" attributeTypeHintHref="qiskit.passmanager.WorkflowStatus">
+  <Attribute id="qiskit.passmanager.PassManagerState.workflow_status">
+    Type: [`WorkflowStatus`](qiskit.passmanager.WorkflowStatus "qiskit.passmanager.compilation_status.WorkflowStatus")
+
     Status of the current compilation workflow.
   </Attribute>
 
   ### property\_set
 
-  <Attribute id="qiskit.passmanager.PassManagerState.property_set" attributeTypeHint="PropertySet" attributeTypeHintHref="qiskit.passmanager.PropertySet">
+  <Attribute id="qiskit.passmanager.PassManagerState.property_set">
+    Type: [`PropertySet`](qiskit.passmanager.PropertySet "qiskit.passmanager.compilation_status.PropertySet")
+
     Information about IR being optimized.
   </Attribute>
 </Class>
diff --git a/docs/api/qiskit/qiskit.passmanager.WorkflowStatus.mdx b/docs/api/qiskit/qiskit.passmanager.WorkflowStatus.mdx
index bb5535e465a0..00be3d757527 100644
--- a/docs/api/qiskit/qiskit.passmanager.WorkflowStatus.mdx
+++ b/docs/api/qiskit/qiskit.passmanager.WorkflowStatus.mdx
@@ -25,19 +25,29 @@ python_api_name: qiskit.passmanager.WorkflowStatus
 
   ### count
 
-  <Attribute id="qiskit.passmanager.WorkflowStatus.count" attributeTypeHint="int" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" attributeValue="0">
+  <Attribute id="qiskit.passmanager.WorkflowStatus.count">
+    Type: [`int`](https://docs.python.org/3/library/functions.html#int)
+
+    Default value: `0`
+
     Current number of pass execution.
   </Attribute>
 
   ### previous\_run
 
-  <Attribute id="qiskit.passmanager.WorkflowStatus.previous_run" attributeTypeHint="RunState" attributeValue="1">
+  <Attribute id="qiskit.passmanager.WorkflowStatus.previous_run">
+    Type: `RunState`
+
+    Default value: `1`
+
     Status of the latest pass run.
   </Attribute>
 
   ### completed\_passes
 
-  <Attribute id="qiskit.passmanager.WorkflowStatus.completed_passes" attributeTypeHint="set" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.passmanager.WorkflowStatus.completed_passes">
+    Type: [`set`](https://docs.python.org/3/library/stdtypes.html#set)
+
     Passes already run that have not been invalidated.
   </Attribute>
 </Class>
diff --git a/docs/api/qiskit/qiskit.primitives.EstimatorResult.mdx b/docs/api/qiskit/qiskit.primitives.EstimatorResult.mdx
index 64705527bde8..9d0aa613257c 100644
--- a/docs/api/qiskit/qiskit.primitives.EstimatorResult.mdx
+++ b/docs/api/qiskit/qiskit.primitives.EstimatorResult.mdx
@@ -28,10 +28,14 @@ python_api_name: qiskit.primitives.EstimatorResult
 
   ### values
 
-  <Attribute id="qiskit.primitives.EstimatorResult.values" attributeTypeHint="np.ndarray[Any, np.dtype[np.float64]]" />
+  <Attribute id="qiskit.primitives.EstimatorResult.values">
+    Type: `np.ndarray`\[`Any`, `np.dtype`\[`np.float64`]]
+  </Attribute>
 
   ### metadata
 
-  <Attribute id="qiskit.primitives.EstimatorResult.metadata" attributeTypeHint="list[dict[str, Any]]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.primitives.EstimatorResult.metadata">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`dict`](https://docs.python.org/3/library/stdtypes.html#dict)\[[`str`](https://docs.python.org/3/library/stdtypes.html#str), `Any`]]
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.primitives.ObservableLike.mdx b/docs/api/qiskit/qiskit.primitives.ObservableLike.mdx
index 3ddfb9a25213..2b676140af1f 100644
--- a/docs/api/qiskit/qiskit.primitives.ObservableLike.mdx
+++ b/docs/api/qiskit/qiskit.primitives.ObservableLike.mdx
@@ -10,7 +10,9 @@ python_api_name: qiskit.primitives.ObservableLike
 
 # ObservableLike
 
-<Attribute id="qiskit.primitives.ObservableLike" attributeValue="str | qiskit.quantum_info.operators.symplectic.pauli.Pauli | qiskit.quantum_info.operators.symplectic.sparse_pauli_op.SparsePauliOp | qiskit.quantum_info.SparseObservable | collections.abc.Mapping[str | qiskit.quantum_info.operators.symplectic.pauli.Pauli, float]" isDedicatedPage={true}>
+<Attribute id="qiskit.primitives.ObservableLike" isDedicatedPage={true}>
+  Default value: `str | qiskit.quantum_info.operators.symplectic.pauli.Pauli | qiskit.quantum_info.operators.symplectic.sparse_pauli_op.SparsePauliOp | qiskit.quantum_info.SparseObservable | collections.abc.Mapping[str | qiskit.quantum_info.operators.symplectic.pauli.Pauli, float]`
+
   Represent a union type
 
   E.g. for int | str
diff --git a/docs/api/qiskit/qiskit.primitives.ParameterLike.mdx b/docs/api/qiskit/qiskit.primitives.ParameterLike.mdx
index 84def18efc4e..22cdf80e3a5b 100644
--- a/docs/api/qiskit/qiskit.primitives.ParameterLike.mdx
+++ b/docs/api/qiskit/qiskit.primitives.ParameterLike.mdx
@@ -10,7 +10,9 @@ python_api_name: qiskit.primitives.ParameterLike
 
 # ParameterLike
 
-<Attribute id="qiskit.primitives.ParameterLike" attributeValue="qiskit._accelerate.circuit.Parameter | str" isDedicatedPage={true}>
+<Attribute id="qiskit.primitives.ParameterLike" isDedicatedPage={true}>
+  Default value: `qiskit._accelerate.circuit.Parameter | str`
+
   Represent a union type
 
   E.g. for int | str
diff --git a/docs/api/qiskit/qiskit.primitives.SamplerResult.mdx b/docs/api/qiskit/qiskit.primitives.SamplerResult.mdx
index 3255cb6b7132..d344a6cf9e85 100644
--- a/docs/api/qiskit/qiskit.primitives.SamplerResult.mdx
+++ b/docs/api/qiskit/qiskit.primitives.SamplerResult.mdx
@@ -28,10 +28,14 @@ python_api_name: qiskit.primitives.SamplerResult
 
   ### quasi\_dists
 
-  <Attribute id="qiskit.primitives.SamplerResult.quasi_dists" attributeTypeHint="list[QuasiDistribution]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.primitives.SamplerResult.quasi_dists">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`QuasiDistribution`](qiskit.result.QuasiDistribution "qiskit.result.distributions.quasi.QuasiDistribution")]
+  </Attribute>
 
   ### metadata
 
-  <Attribute id="qiskit.primitives.SamplerResult.metadata" attributeTypeHint="list[dict[str, Any]]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.primitives.SamplerResult.metadata">
+    Type: [`list`](https://docs.python.org/3/library/stdtypes.html#list)\[[`dict`](https://docs.python.org/3/library/stdtypes.html#dict)\[[`str`](https://docs.python.org/3/library/stdtypes.html#str), [`Any`](https://docs.python.org/3/library/typing.html#typing.Any)]]
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.providers.Backend.mdx b/docs/api/qiskit/qiskit.providers.Backend.mdx
index 953f419af188..f10c70d20c42 100644
--- a/docs/api/qiskit/qiskit.providers.Backend.mdx
+++ b/docs/api/qiskit/qiskit.providers.Backend.mdx
@@ -19,6 +19,8 @@ python_api_name: qiskit.providers.Backend
 
   ### version
 
-  <Attribute id="qiskit.providers.Backend.version" attributeValue="0" />
+  <Attribute id="qiskit.providers.Backend.version">
+    Default value: `0`
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.providers.BackendV2.mdx b/docs/api/qiskit/qiskit.providers.BackendV2.mdx
index 69c95880100c..78b13ba55de9 100644
--- a/docs/api/qiskit/qiskit.providers.BackendV2.mdx
+++ b/docs/api/qiskit/qiskit.providers.BackendV2.mdx
@@ -176,7 +176,9 @@ python_api_name: qiskit.providers.BackendV2
 
   ### version
 
-  <Attribute id="qiskit.providers.BackendV2.version" attributeValue="2" />
+  <Attribute id="qiskit.providers.BackendV2.version">
+    Default value: `2`
+  </Attribute>
 
   ### name
 
diff --git a/docs/api/qiskit/qiskit.providers.Job.mdx b/docs/api/qiskit/qiskit.providers.Job.mdx
index e781bc1c0873..6b6da66d88bc 100644
--- a/docs/api/qiskit/qiskit.providers.Job.mdx
+++ b/docs/api/qiskit/qiskit.providers.Job.mdx
@@ -19,6 +19,8 @@ python_api_name: qiskit.providers.Job
 
   ### version
 
-  <Attribute id="qiskit.providers.Job.version" attributeValue="0" />
+  <Attribute id="qiskit.providers.Job.version">
+    Default value: `0`
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.providers.JobStatus.mdx b/docs/api/qiskit/qiskit.providers.JobStatus.mdx
index 6ef62ce04f23..48ede219408f 100644
--- a/docs/api/qiskit/qiskit.providers.JobStatus.mdx
+++ b/docs/api/qiskit/qiskit.providers.JobStatus.mdx
@@ -17,30 +17,44 @@ python_api_name: qiskit.providers.JobStatus
 
   ### INITIALIZING
 
-  <Attribute id="qiskit.providers.JobStatus.INITIALIZING" attributeValue="'job is being initialized'" />
+  <Attribute id="qiskit.providers.JobStatus.INITIALIZING">
+    Default value: `'job is being initialized'`
+  </Attribute>
 
   ### QUEUED
 
-  <Attribute id="qiskit.providers.JobStatus.QUEUED" attributeValue="'job is queued'" />
+  <Attribute id="qiskit.providers.JobStatus.QUEUED">
+    Default value: `'job is queued'`
+  </Attribute>
 
   ### VALIDATING
 
-  <Attribute id="qiskit.providers.JobStatus.VALIDATING" attributeValue="'job is being validated'" />
+  <Attribute id="qiskit.providers.JobStatus.VALIDATING">
+    Default value: `'job is being validated'`
+  </Attribute>
 
   ### RUNNING
 
-  <Attribute id="qiskit.providers.JobStatus.RUNNING" attributeValue="'job is actively running'" />
+  <Attribute id="qiskit.providers.JobStatus.RUNNING">
+    Default value: `'job is actively running'`
+  </Attribute>
 
   ### CANCELLED
 
-  <Attribute id="qiskit.providers.JobStatus.CANCELLED" attributeValue="'job has been cancelled'" />
+  <Attribute id="qiskit.providers.JobStatus.CANCELLED">
+    Default value: `'job has been cancelled'`
+  </Attribute>
 
   ### DONE
 
-  <Attribute id="qiskit.providers.JobStatus.DONE" attributeValue="'job has successfully run'" />
+  <Attribute id="qiskit.providers.JobStatus.DONE">
+    Default value: `'job has successfully run'`
+  </Attribute>
 
   ### ERROR
 
-  <Attribute id="qiskit.providers.JobStatus.ERROR" attributeValue="'job incurred error'" />
+  <Attribute id="qiskit.providers.JobStatus.ERROR">
+    Default value: `'job incurred error'`
+  </Attribute>
 </Class>
 
diff --git a/docs/api/qiskit/qiskit.providers.JobV1.mdx b/docs/api/qiskit/qiskit.providers.JobV1.mdx
index fb8d9cdf3598..5e2fbeef5f12 100644
--- a/docs/api/qiskit/qiskit.providers.JobV1.mdx
+++ b/docs/api/qiskit/qiskit.providers.JobV1.mdx
@@ -27,7 +27,9 @@ python_api_name: qiskit.providers.JobV1
 
   ### version
 
-  <Attribute id="qiskit.providers.JobV1.version" attributeValue="1" />
+  <Attribute id="qiskit.providers.JobV1.version">
+    Default value: `1`
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.providers.basic_provider.BasicProviderJob.mdx b/docs/api/qiskit/qiskit.providers.basic_provider.BasicProviderJob.mdx
index 371081308316..2b09145071b9 100644
--- a/docs/api/qiskit/qiskit.providers.basic_provider.BasicProviderJob.mdx
+++ b/docs/api/qiskit/qiskit.providers.basic_provider.BasicProviderJob.mdx
@@ -25,7 +25,9 @@ python_api_name: qiskit.providers.basic_provider.BasicProviderJob
 
   ### version
 
-  <Attribute id="qiskit.providers.basic_provider.BasicProviderJob.version" attributeValue="1" />
+  <Attribute id="qiskit.providers.basic_provider.BasicProviderJob.version">
+    Default value: `1`
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.providers.basic_provider.BasicSimulator.mdx b/docs/api/qiskit/qiskit.providers.basic_provider.BasicSimulator.mdx
index b518faca82a1..57d803af6553 100644
--- a/docs/api/qiskit/qiskit.providers.basic_provider.BasicSimulator.mdx
+++ b/docs/api/qiskit/qiskit.providers.basic_provider.BasicSimulator.mdx
@@ -29,11 +29,15 @@ python_api_name: qiskit.providers.basic_provider.BasicSimulator
 
   ### MAX\_QUBITS\_CLIFFORD
 
-  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.MAX_QUBITS_CLIFFORD" attributeValue="2048" />
+  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.MAX_QUBITS_CLIFFORD">
+    Default value: `2048`
+  </Attribute>
 
   ### MAX\_QUBITS\_STATEVECTOR
 
-  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.MAX_QUBITS_STATEVECTOR" attributeValue="24" />
+  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.MAX_QUBITS_STATEVECTOR">
+    Default value: `24`
+  </Attribute>
 
   ### coupling\_map
 
@@ -145,7 +149,9 @@ python_api_name: qiskit.providers.basic_provider.BasicSimulator
 
   ### version
 
-  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.version" attributeValue="2" />
+  <Attribute id="qiskit.providers.basic_provider.BasicSimulator.version">
+    Default value: `2`
+  </Attribute>
 
   ### name
 
diff --git a/docs/api/qiskit/qiskit.providers.fake_provider.GenericBackendV2.mdx b/docs/api/qiskit/qiskit.providers.fake_provider.GenericBackendV2.mdx
index 1f2bd55e4260..cca9eef0ca3f 100644
--- a/docs/api/qiskit/qiskit.providers.fake_provider.GenericBackendV2.mdx
+++ b/docs/api/qiskit/qiskit.providers.fake_provider.GenericBackendV2.mdx
@@ -130,7 +130,9 @@ python_api_name: qiskit.providers.fake_provider.GenericBackendV2
 
   ### version
 
-  <Attribute id="qiskit.providers.fake_provider.GenericBackendV2.version" attributeValue="2" />
+  <Attribute id="qiskit.providers.fake_provider.GenericBackendV2.version">
+    Default value: `2`
+  </Attribute>
 
   ### name
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Chi.mdx b/docs/api/qiskit/qiskit.quantum_info.Chi.mdx
index 51b4f6fbec36..38313d082bac 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Chi.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Chi.mdx
@@ -47,7 +47,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Chi.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Chi.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -75,7 +77,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Chi.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Chi.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Choi.mdx b/docs/api/qiskit/qiskit.quantum_info.Choi.mdx
index 49f15479762f..43d39fb36bea 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Choi.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Choi.mdx
@@ -55,7 +55,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Choi.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Choi.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -83,7 +85,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Choi.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Choi.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.DensityMatrix.mdx b/docs/api/qiskit/qiskit.quantum_info.DensityMatrix.mdx
index dc27249d039f..1fd19fca773c 100644
--- a/docs/api/qiskit/qiskit.quantum_info.DensityMatrix.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.DensityMatrix.mdx
@@ -35,7 +35,9 @@ python_api_name: qiskit.quantum_info.DensityMatrix
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.DensityMatrix.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.DensityMatrix.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -57,7 +59,9 @@ python_api_name: qiskit.quantum_info.DensityMatrix
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.DensityMatrix.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.DensityMatrix.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Kraus.mdx b/docs/api/qiskit/qiskit.quantum_info.Kraus.mdx
index 3476883faa51..a8710e79941b 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Kraus.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Kraus.mdx
@@ -51,7 +51,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Kraus.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Kraus.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -79,7 +81,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Kraus.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Kraus.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Operator.mdx b/docs/api/qiskit/qiskit.quantum_info.Operator.mdx
index 1d8ad6ebc251..f1b1be265807 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Operator.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Operator.mdx
@@ -70,7 +70,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Operator.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Operator.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -98,7 +100,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Operator.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Operator.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.PTM.mdx b/docs/api/qiskit/qiskit.quantum_info.PTM.mdx
index dc14cd3223b4..494d54ec5b1c 100644
--- a/docs/api/qiskit/qiskit.quantum_info.PTM.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.PTM.mdx
@@ -55,7 +55,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.PTM.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.PTM.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -83,7 +85,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.PTM.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.PTM.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.QubitSparsePauli.mdx b/docs/api/qiskit/qiskit.quantum_info.QubitSparsePauli.mdx
index a6da5ee03306..4d1245b447cb 100644
--- a/docs/api/qiskit/qiskit.quantum_info.QubitSparsePauli.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.QubitSparsePauli.mdx
@@ -63,19 +63,25 @@ python_api_name: qiskit.quantum_info.QubitSparsePauli
 
     ##### X
 
-    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.X" attributeValue="2">
+    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.X">
+      Default value: `2`
+
       The Pauli $X$ operator. Uses the single-letter label `"X"`.
     </Attribute>
 
     ##### Y
 
-    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.Y" attributeValue="3">
+    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.Y">
+      Default value: `3`
+
       The Pauli $Y$ operator. Uses the single-letter label `"Y"`.
     </Attribute>
 
     ##### Z
 
-    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.Z" attributeValue="1">
+    <Attribute id="qiskit.quantum_info.QubitSparsePauli.Pauli.Z">
+      Default value: `1`
+
       The Pauli $Z$ operator. Uses the single-letter label `"Z"`.
     </Attribute>
   </Class>
diff --git a/docs/api/qiskit/qiskit.quantum_info.ScalarOp.mdx b/docs/api/qiskit/qiskit.quantum_info.ScalarOp.mdx
index 41bd1d6d58d1..b62353145494 100644
--- a/docs/api/qiskit/qiskit.quantum_info.ScalarOp.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.ScalarOp.mdx
@@ -30,7 +30,9 @@ python_api_name: qiskit.quantum_info.ScalarOp
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.ScalarOp.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.ScalarOp.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### coeff
 
@@ -58,7 +60,9 @@ python_api_name: qiskit.quantum_info.ScalarOp
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.ScalarOp.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.ScalarOp.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.SparseObservable.mdx b/docs/api/qiskit/qiskit.quantum_info.SparseObservable.mdx
index a9f499f6247f..4cd3a46ffc0c 100644
--- a/docs/api/qiskit/qiskit.quantum_info.SparseObservable.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.SparseObservable.mdx
@@ -97,55 +97,73 @@ $$
 
     ##### X
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.X" attributeValue="2">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.X">
+      Default value: `2`
+
       The Pauli $X$ operator. Uses the single-letter label `"X"`.
     </Attribute>
 
     ##### PLUS
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.PLUS" attributeValue="10">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.PLUS">
+      Default value: `10`
+
       The projector to the positive eigenstate of the $X$ operator: $\lvert+\rangle\langle+\rvert$. Uses the single-letter label `"+"`.
     </Attribute>
 
     ##### MINUS
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.MINUS" attributeValue="6">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.MINUS">
+      Default value: `6`
+
       The projector to the negative eigenstate of the $X$ operator: $\lvert-\rangle\langle-\rvert$. Uses the single-letter label `"-"`.
     </Attribute>
 
     ##### Y
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.Y" attributeValue="3">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.Y">
+      Default value: `3`
+
       The Pauli $Y$ operator. Uses the single-letter label `"Y"`.
     </Attribute>
 
     ##### RIGHT
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.RIGHT" attributeValue="11">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.RIGHT">
+      Default value: `11`
+
       The projector to the positive eigenstate of the $Y$ operator: $\lvert r\rangle\langle r\rvert$. Uses the single-letter label `"r"`.
     </Attribute>
 
     ##### LEFT
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.LEFT" attributeValue="7">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.LEFT">
+      Default value: `7`
+
       The projector to the negative eigenstate of the $Y$ operator: $\lvert l\rangle\langle l\rvert$. Uses the single-letter label `"l"`.
     </Attribute>
 
     ##### Z
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.Z" attributeValue="1">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.Z">
+      Default value: `1`
+
       The Pauli $Z$ operator. Uses the single-letter label `"Z"`.
     </Attribute>
 
     ##### ZERO
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.ZERO" attributeValue="9">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.ZERO">
+      Default value: `9`
+
       The projector to the positive eigenstate of the $Z$ operator: $\lvert0\rangle\langle0\rvert$. Uses the single-letter label `"0"`.
     </Attribute>
 
     ##### ONE
 
-    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.ONE" attributeValue="5">
+    <Attribute id="qiskit.quantum_info.SparseObservable.BitTerm.ONE">
+      Default value: `5`
+
       The projector to the negative eigenstate of the $Z$ operator: $\lvert1\rangle\langle1\rvert$. Uses the single-letter label `"1"`.
     </Attribute>
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.SparsePauliOp.mdx b/docs/api/qiskit/qiskit.quantum_info.SparsePauliOp.mdx
index cb4afec0c968..e316fb573b0f 100644
--- a/docs/api/qiskit/qiskit.quantum_info.SparsePauliOp.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.SparsePauliOp.mdx
@@ -71,7 +71,9 @@ python_api_name: qiskit.quantum_info.SparsePauliOp
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.SparsePauliOp.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.SparsePauliOp.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### coeffs
 
@@ -111,7 +113,9 @@ python_api_name: qiskit.quantum_info.SparsePauliOp
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.SparsePauliOp.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.SparsePauliOp.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Statevector.mdx b/docs/api/qiskit/qiskit.quantum_info.Statevector.mdx
index 6896e0096364..781e784062e7 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Statevector.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Statevector.mdx
@@ -35,7 +35,9 @@ python_api_name: qiskit.quantum_info.Statevector
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Statevector.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Statevector.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -57,7 +59,9 @@ python_api_name: qiskit.quantum_info.Statevector
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Statevector.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Statevector.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.Stinespring.mdx b/docs/api/qiskit/qiskit.quantum_info.Stinespring.mdx
index f5e8195907d5..5f298987bdc9 100644
--- a/docs/api/qiskit/qiskit.quantum_info.Stinespring.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.Stinespring.mdx
@@ -53,7 +53,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.Stinespring.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.Stinespring.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -79,7 +81,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.Stinespring.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.Stinespring.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.quantum_info.SuperOp.mdx b/docs/api/qiskit/qiskit.quantum_info.SuperOp.mdx
index f76f6e48375b..b2f5a2c4e8d2 100644
--- a/docs/api/qiskit/qiskit.quantum_info.SuperOp.mdx
+++ b/docs/api/qiskit/qiskit.quantum_info.SuperOp.mdx
@@ -47,7 +47,9 @@ $$
 
   ### atol
 
-  <Attribute id="qiskit.quantum_info.SuperOp.atol" attributeValue="1e-08" />
+  <Attribute id="qiskit.quantum_info.SuperOp.atol">
+    Default value: `1e-08`
+  </Attribute>
 
   ### data
 
@@ -75,7 +77,9 @@ $$
 
   ### rtol
 
-  <Attribute id="qiskit.quantum_info.SuperOp.rtol" attributeValue="1e-05" />
+  <Attribute id="qiskit.quantum_info.SuperOp.rtol">
+    Default value: `1e-05`
+  </Attribute>
 
   ### settings
 
diff --git a/docs/api/qiskit/qiskit.result.Counts.mdx b/docs/api/qiskit/qiskit.result.Counts.mdx
index 34392da6c58f..bcda973cde88 100644
--- a/docs/api/qiskit/qiskit.result.Counts.mdx
+++ b/docs/api/qiskit/qiskit.result.Counts.mdx
@@ -42,7 +42,9 @@ python_api_name: qiskit.result.Counts
 
   ### bitstring\_regex
 
-  <Attribute id="qiskit.result.Counts.bitstring_regex" attributeValue="re.compile('^[01\\s]+$')" />
+  <Attribute id="qiskit.result.Counts.bitstring_regex">
+    Default value: `re.compile('^[01\\s]+$')`
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.synthesis.TwoQubitWeylDecomposition.mdx b/docs/api/qiskit/qiskit.synthesis.TwoQubitWeylDecomposition.mdx
index 02a684b68429..be61af41b4d2 100644
--- a/docs/api/qiskit/qiskit.synthesis.TwoQubitWeylDecomposition.mdx
+++ b/docs/api/qiskit/qiskit.synthesis.TwoQubitWeylDecomposition.mdx
@@ -50,47 +50,69 @@ $$
 
   ### a
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.a" attributeTypeHint="float" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.a">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float)
+  </Attribute>
 
   ### b
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.b" attributeTypeHint="float" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.b">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float)
+  </Attribute>
 
   ### c
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.c" attributeTypeHint="float" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.c">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float)
+  </Attribute>
 
   ### global\_phase
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.global_phase" attributeTypeHint="float" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.global_phase">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float)
+  </Attribute>
 
   ### K1l
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K1l" attributeTypeHint="ndarray" attributeTypeHintHref="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K1l">
+    Type: [`ndarray`](https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray)
+  </Attribute>
 
   ### K2l
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K2l" attributeTypeHint="ndarray" attributeTypeHintHref="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K2l">
+    Type: [`ndarray`](https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray)
+  </Attribute>
 
   ### K1r
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K1r" attributeTypeHint="ndarray" attributeTypeHintHref="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K1r">
+    Type: [`ndarray`](https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray)
+  </Attribute>
 
   ### K2r
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K2r" attributeTypeHint="ndarray" attributeTypeHintHref="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.K2r">
+    Type: [`ndarray`](https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray)
+  </Attribute>
 
   ### unitary\_matrix
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.unitary_matrix" attributeTypeHint="ndarray" attributeTypeHintHref="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.unitary_matrix">
+    Type: [`ndarray`](https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray)
+  </Attribute>
 
   ### requested\_fidelity
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.requested_fidelity" attributeTypeHint="float | None" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.requested_fidelity">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float) | [`None`](https://docs.python.org/3/library/constants.html#None)
+  </Attribute>
 
   ### calculated\_fidelity
 
-  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.calculated_fidelity" attributeTypeHint="float" attributeTypeHintHref="https://docs.python.org/3/library/functions.html" />
+  <Attribute id="qiskit.synthesis.TwoQubitWeylDecomposition.calculated_fidelity">
+    Type: [`float`](https://docs.python.org/3/library/functions.html#float)
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.synthesis.unitary.aqc.ApproximateCircuit.mdx b/docs/api/qiskit/qiskit.synthesis.unitary.aqc.ApproximateCircuit.mdx
index 8907ff7aef13..a3fc1b5483bb 100644
--- a/docs/api/qiskit/qiskit.synthesis.unitary.aqc.ApproximateCircuit.mdx
+++ b/docs/api/qiskit/qiskit.synthesis.unitary.aqc.ApproximateCircuit.mdx
@@ -32,7 +32,9 @@ python_api_name: qiskit.synthesis.unitary.aqc.ApproximateCircuit
 
   ### name
 
-  <Attribute id="qiskit.synthesis.unitary.aqc.ApproximateCircuit.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.synthesis.unitary.aqc.ApproximateCircuit.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.mdx b/docs/api/qiskit/qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.mdx
index 7e0af29b4e2c..28017517fbb3 100644
--- a/docs/api/qiskit/qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.mdx
+++ b/docs/api/qiskit/qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.mdx
@@ -38,7 +38,9 @@ python_api_name: qiskit.synthesis.unitary.aqc.CNOTUnitCircuit
 
   ### name
 
-  <Attribute id="qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.name" attributeTypeHint="str" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html">
+  <Attribute id="qiskit.synthesis.unitary.aqc.CNOTUnitCircuit.name">
+    Type: [`str`](https://docs.python.org/3/library/stdtypes.html#str)
+
     A human-readable name for the circuit.
 
     **Example**
diff --git a/docs/api/qiskit/qiskit.transpiler.OptimizationMetric.mdx b/docs/api/qiskit/qiskit.transpiler.OptimizationMetric.mdx
index 488e6b0d4aaf..cbd491d75b19 100644
--- a/docs/api/qiskit/qiskit.transpiler.OptimizationMetric.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.OptimizationMetric.mdx
@@ -21,13 +21,17 @@ python_api_name: qiskit.transpiler.OptimizationMetric
 
   ### COUNT\_2Q
 
-  <Attribute id="qiskit.transpiler.OptimizationMetric.COUNT_2Q" attributeValue="1">
+  <Attribute id="qiskit.transpiler.OptimizationMetric.COUNT_2Q">
+    Default value: `1`
+
     The transpilation is optimized towards minimizing the 2q-count.
   </Attribute>
 
   ### COUNT\_T
 
-  <Attribute id="qiskit.transpiler.OptimizationMetric.COUNT_T" attributeValue="2">
+  <Attribute id="qiskit.transpiler.OptimizationMetric.COUNT_T">
+    Default value: `2`
+
     The transpilation is optimized towards the T-count.
   </Attribute>
 </Class>
diff --git a/docs/api/qiskit/qiskit.transpiler.StagedPassManager.mdx b/docs/api/qiskit/qiskit.transpiler.StagedPassManager.mdx
index be56b30ce4ac..e4cbde20dde4 100644
--- a/docs/api/qiskit/qiskit.transpiler.StagedPassManager.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.StagedPassManager.mdx
@@ -52,7 +52,9 @@ python_api_name: qiskit.transpiler.StagedPassManager
 
   ### invalid\_stage\_regex
 
-  <Attribute id="qiskit.transpiler.StagedPassManager.invalid_stage_regex" attributeValue="re.compile('\\s|\\+|\\-|\\*|\\/|\\\\|\\%|\\<|\\>|\\@|\\!|\\~|\\^|\\&|\\:|\\[|\\]|\\{|\\}|\\(|\\)')" />
+  <Attribute id="qiskit.transpiler.StagedPassManager.invalid_stage_regex">
+    Default value: `re.compile('\\s|\\+|\\-|\\*|\\/|\\\\|\\%|\\<|\\>|\\@|\\!|\\~|\\^|\\&|\\:|\\[|\\]|\\{|\\}|\\(|\\)')`
+  </Attribute>
 
   ### stages
 
diff --git a/docs/api/qiskit/qiskit.transpiler.TranspileLayout.mdx b/docs/api/qiskit/qiskit.transpiler.TranspileLayout.mdx
index c0475e0e9a84..3fe203b61a2f 100644
--- a/docs/api/qiskit/qiskit.transpiler.TranspileLayout.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.TranspileLayout.mdx
@@ -97,15 +97,23 @@ python_api_name: qiskit.transpiler.TranspileLayout
 
   ### final\_layout
 
-  <Attribute id="qiskit.transpiler.TranspileLayout.final_layout" attributeTypeHint="Layout | None" attributeTypeHintHref="qiskit.transpiler.Layout" attributeValue="None" />
+  <Attribute id="qiskit.transpiler.TranspileLayout.final_layout">
+    Type: [`Layout`](qiskit.transpiler.Layout "qiskit.transpiler.layout.Layout") | [`None`](https://docs.python.org/3/library/constants.html#None)
+
+    Default value: `None`
+  </Attribute>
 
   ### initial\_layout
 
-  <Attribute id="qiskit.transpiler.TranspileLayout.initial_layout" attributeTypeHint="Layout" attributeTypeHintHref="qiskit.transpiler.Layout" />
+  <Attribute id="qiskit.transpiler.TranspileLayout.initial_layout">
+    Type: [`Layout`](qiskit.transpiler.Layout "qiskit.transpiler.layout.Layout")
+  </Attribute>
 
   ### input\_qubit\_mapping
 
-  <Attribute id="qiskit.transpiler.TranspileLayout.input_qubit_mapping" attributeTypeHint="dict[Qubit, int]" attributeTypeHintHref="https://docs.python.org/3/library/stdtypes.html" />
+  <Attribute id="qiskit.transpiler.TranspileLayout.input_qubit_mapping">
+    Type: [`dict`](https://docs.python.org/3/library/stdtypes.html#dict)\[[`Qubit`](/docs/api/qiskit/circuit#qiskit.circuit.Qubit "qiskit.circuit.Qubit"), [`int`](https://docs.python.org/3/library/functions.html#int)]
+  </Attribute>
 
   ## Methods
 
diff --git a/docs/api/qiskit/qiskit.transpiler.passes.ALAPScheduleAnalysis.mdx b/docs/api/qiskit/qiskit.transpiler.passes.ALAPScheduleAnalysis.mdx
index 5e229496e43d..79cf4b43ee92 100644
--- a/docs/api/qiskit/qiskit.transpiler.passes.ALAPScheduleAnalysis.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.passes.ALAPScheduleAnalysis.mdx
@@ -26,7 +26,9 @@ python_api_name: qiskit.transpiler.passes.ALAPScheduleAnalysis
 
   ### CONDITIONAL\_SUPPORTED
 
-  <Attribute id="qiskit.transpiler.passes.ALAPScheduleAnalysis.CONDITIONAL_SUPPORTED" attributeValue="(<class 'qiskit.circuit.gate.Gate'>, <class 'qiskit.circuit.delay.Delay'>)" />
+  <Attribute id="qiskit.transpiler.passes.ALAPScheduleAnalysis.CONDITIONAL_SUPPORTED">
+    Default value: `(<class 'qiskit.circuit.gate.Gate'>, <class 'qiskit.circuit.delay.Delay'>)`
+  </Attribute>
 
   ### is\_analysis\_pass
 
diff --git a/docs/api/qiskit/qiskit.transpiler.passes.ASAPScheduleAnalysis.mdx b/docs/api/qiskit/qiskit.transpiler.passes.ASAPScheduleAnalysis.mdx
index 5fda98dadf17..b447f3629ccd 100644
--- a/docs/api/qiskit/qiskit.transpiler.passes.ASAPScheduleAnalysis.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.passes.ASAPScheduleAnalysis.mdx
@@ -26,7 +26,9 @@ python_api_name: qiskit.transpiler.passes.ASAPScheduleAnalysis
 
   ### CONDITIONAL\_SUPPORTED
 
-  <Attribute id="qiskit.transpiler.passes.ASAPScheduleAnalysis.CONDITIONAL_SUPPORTED" attributeValue="(<class 'qiskit.circuit.gate.Gate'>, <class 'qiskit.circuit.delay.Delay'>)" />
+  <Attribute id="qiskit.transpiler.passes.ASAPScheduleAnalysis.CONDITIONAL_SUPPORTED">
+    Default value: `(<class 'qiskit.circuit.gate.Gate'>, <class 'qiskit.circuit.delay.Delay'>)`
+  </Attribute>
 
   ### is\_analysis\_pass
 
diff --git a/docs/api/qiskit/qiskit.transpiler.passes.WrapAngles.mdx b/docs/api/qiskit/qiskit.transpiler.passes.WrapAngles.mdx
index 123cb01ece40..d06b84aad23a 100644
--- a/docs/api/qiskit/qiskit.transpiler.passes.WrapAngles.mdx
+++ b/docs/api/qiskit/qiskit.transpiler.passes.WrapAngles.mdx
@@ -63,7 +63,9 @@ python_api_name: qiskit.transpiler.passes.WrapAngles
 
   ### DEFAULT\_REGISTRY
 
-  <Attribute id="qiskit.transpiler.passes.WrapAngles.DEFAULT_REGISTRY" attributeValue="<qiskit._accelerate.angle_bound_registry.WrapAngleRegistry object>">
+  <Attribute id="qiskit.transpiler.passes.WrapAngles.DEFAULT_REGISTRY">
+    Default value: `<qiskit._accelerate.angle_bound_registry.WrapAngleRegistry object>`
+
     A global instance of [`WrapAngleRegistry`](qiskit.transpiler.WrapAngleRegistry "qiskit.transpiler.WrapAngleRegistry") that is used by default by this pass when no explicit registry is specified.
 
     <Admonition title="Note" type="note">
diff --git a/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/api-example.Electron b/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/api-example.Electron
index f8b120438631..c1852f6617d3 100644
--- a/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/api-example.Electron
+++ b/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/api-example.Electron
@@ -52,7 +52,9 @@ python_api_name: api_example.Electron
 
   ### CLASS\_ATTRIBUTE
 
-  <Attribute id="api_example.Electron.CLASS_ATTRIBUTE" attributeValue="re.compile('abc')" />
+  <Attribute id="api_example.Electron.CLASS_ATTRIBUTE">
+    Default value: `re.compile('abc')`
+  </Attribute>
 
   ### charge
 
diff --git a/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/inline-classes b/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/inline-classes
index d05ecd048cb4..44ddf44c0057 100644
--- a/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/inline-classes
+++ b/scripts/js/lib/api/apiDocsPipeline.test.ts-snapshots/inline-classes
@@ -55,7 +55,11 @@ Sometimes, you even need to use a really complex class!
 
   #### CLASS\_ATTRIBUTE
 
-  <Attribute id="api_example.inline_classes.InlineClassWithMethods.CLASS_ATTRIBUTE" attributeTypeHint="str" attributeValue="'An important part of any API.'" />
+  <Attribute id="api_example.inline_classes.InlineClassWithMethods.CLASS_ATTRIBUTE">
+    Type: `str`
+
+    Default value: `'An important part of any API.'`
+  </Attribute>
 
   #### interest\_rate
 
diff --git a/scripts/js/lib/api/generateApiComponents.test.ts b/scripts/js/lib/api/generateApiComponents.test.ts
index 7d07891507ba..b52d7f6f5404 100644
--- a/scripts/js/lib/api/generateApiComponents.test.ts
+++ b/scripts/js/lib/api/generateApiComponents.test.ts
@@ -23,7 +23,6 @@ import {
 } from "./generateApiComponents.js";
 import { CheerioDoc } from "../testUtils.js";
 import { load } from "cheerio";
-import { kebabCaseAndShortenPage } from "./normalizeResultUrls.js";
 
 const RAW_SIGNATURE_EXAMPLE = `<span class='sig-prename descclassname'><span class='pre'>Estimator.</span></span><span class='sig-name descname'><span class='pre'>run</span></span><span class='sig-paren'>(</span><em class='sig-param'><span class='n'><span class='pre'>circuits</span></span></em>, <em class='sig-param'><span class='n'><span class='pre'>observables</span></span></em>, <em class='sig-param'><span class='n'><span class='pre'>parameter_values</span></span><span class='o'><span class='pre'>=</span></span><span class='default_value'><span class='pre'>None</span></span></em>, <em class='sig-param'><span class='o'><span class='pre'>**</span></span><span class='n'><span class='pre'>kwargs</span></span></em><span class='sig-paren'>)</span></dt>`;
 
@@ -78,9 +77,6 @@ test.describe("createOpeningTag()", () => {
     const tag = await createOpeningTag("Function", componentProps);
     expect(tag).toEqual(`<Function
     id='qiskit_ibm_runtime.Estimator.run'
-    attributeTypeHint='undefined'
-    attributeTypeHintHref='undefined'
-    attributeValue='undefined'
     isDedicatedPage='undefined'
     github='undefined'
     signature='Estimator.run(circuits, observables, parameter_values=None, **kwargs)'
@@ -100,9 +96,6 @@ test.describe("createOpeningTag()", () => {
     const tag = await createOpeningTag("Function", componentProps);
     expect(tag).toEqual(`<Function
     id='qiskit_ibm_runtime.Estimator.run'
-    attributeTypeHint='undefined'
-    attributeTypeHintHref='undefined'
-    attributeValue='undefined'
     isDedicatedPage='undefined'
     github='undefined'
     signature='Estimator.run(circuits, observables, parameter_values=None, **kwargs)'
@@ -112,19 +105,14 @@ test.describe("createOpeningTag()", () => {
   `);
   });
 
-  test("Create Attribute tag with default value and type hint", async () => {
+  test("Create Attribute tag without type hint or value props", async () => {
     const componentProps = {
       id: "qiskit.circuit.QuantumCircuit.instance",
-      attributeTypeHint: "str | None",
-      attributeValue: "None",
     };
 
     const tag = await createOpeningTag("Attribute", componentProps);
     expect(tag).toEqual(`<Attribute
     id='qiskit.circuit.QuantumCircuit.instance'
-    attributeTypeHint='str | None'
-    attributeTypeHintHref='undefined'
-    attributeValue='None'
     isDedicatedPage='undefined'
     github='undefined'
     signature=''
@@ -142,9 +130,6 @@ test.describe("createOpeningTag()", () => {
     const tag = await createOpeningTag("Class", componentProps);
     expect(tag).toEqual(`<Class
     id='qiskit.circuit.Sampler'
-    attributeTypeHint='undefined'
-    attributeTypeHintHref='undefined'
-    attributeValue='undefined'
     isDedicatedPage='undefined'
     github='undefined'
     signature=''
@@ -155,15 +140,13 @@ test.describe("createOpeningTag()", () => {
   });
 });
 
-test.describe("attributeTypeHintHref", () => {
-  async function parseAttribute(
-    dt: string,
-    normalizeUrl?: (url: string) => string,
-  ): Promise<string> {
-    const $ = load(`<dl class="py attribute">${dt}<dd></dd></dl>`);
+test.describe("type and default in Attribute body", () => {
+  // Returns the MDX component string produced by createMdxComponent.
+  async function parseAttributeHtml(dt: string): Promise<string> {
+    const $ = load(`<div><dl class="py attribute">${dt}<dd></dd></dl></div>`);
     const $dl = $("dl").first();
     const $dt = $dl.find("dt").first();
-    return createMdxComponent(
+    const mdx = await createMdxComponent(
       $,
       [$dt],
       $dl,
@@ -171,14 +154,12 @@ test.describe("attributeTypeHintHref", () => {
       undefined,
       "attribute",
       $dt.attr("id") ?? "",
-      {
-        isCApi: false,
-        normalizeUrl,
-      },
+      { isCApi: false },
     );
+    return mdx;
   }
 
-  test("relative href is transformed by normalizeUrl", async () => {
+  test("type hint with link appears in Attribute body", async () => {
     const dt = `<dt id="qiskit_ibm_runtime.Executor.options">
       <em class="property"><span class="pre">options</span><span class="p">:</span>
       <a href="qiskit_ibm_runtime.options_models.ExecutorOptions#qiskit_ibm_runtime.options_models.ExecutorOptions">
@@ -186,54 +167,69 @@ test.describe("attributeTypeHintHref", () => {
       </a>
       </em>
       </dt>`;
-    const result = await parseAttribute(dt, (url) =>
-      kebabCaseAndShortenPage(url, "qiskit-ibm-runtime"),
-    );
-    expect(result).toContain(
-      `attributeTypeHintHref='options-models-executor-options'`,
+    const html = await parseAttributeHtml(dt);
+    expect(html).toContain(
+      `href="qiskit_ibm_runtime.options_models.ExecutorOptions`,
     );
+    expect(html).toContain(`Type:`);
   });
 
-  test("relative href is preserved when no normalizeUrl is provided", async () => {
-    const dt = `<dt id="qiskit_ibm_runtime.Executor.options">
-      <em class="property"><span class="pre">options</span><span class="p">:</span>
-      <a href="qiskit_ibm_runtime.options_models.ExecutorOptions#qiskit_ibm_runtime.options_models.ExecutorOptions">
-        <span class="pre">ExecutorOptions</span>
+  test("type and default value appear in Attribute body", async () => {
+    const dt = `<dt id="qiskit.transpiler.TranspileLayout.final_layout">
+      <em class="property"><span class="pre">final_layout</span><span class="p">:</span>
+      <a href="qiskit.transpiler.Layout#qiskit.transpiler.Layout">
+        <span class="pre">Layout</span>
       </a>
+      <span class="pre">|</span>
+      <span class="pre">None</span>
+      </em>
+      <em class="property">
+      <span class="p">=</span>
+      <span class="pre">None</span>
       </em>
       </dt>`;
-    const result = await parseAttribute(dt);
-    expect(result).toContain(
-      `attributeTypeHintHref='qiskit_ibm_runtime.options_models.ExecutorOptions'`,
-    );
+    const html = await parseAttributeHtml(dt);
+    expect(html).toContain(`href="qiskit.transpiler.Layout`);
+    expect(html).toContain(`Type:`);
+    expect(html).toContain(`Default value:`);
   });
 
-  test("absolute href is passed through by normalizeUrl", async () => {
-    const dt = `<dt id="qiskit_ibm_runtime.options.SimulatorOptions.coupling_map">
-      <em class="property"><span class="pre">coupling_map</span><span class="p">:</span>
-      <a href="https://quantum.cloud.ibm.com/docs/api/qiskit/qiskit.transpiler.CouplingMap">
-        <span class="pre">CouplingMap</span>
-      </a>
+  test("attribute with no link still renders type in body", async () => {
+    const dt = `<dt id="qiskit_ibm_runtime.Executor.count">
+      <em class="property"><span class="pre">count</span><span class="p">:</span>
+      <span class="pre">int</span>
       </em>
       </dt>`;
-    const result = await parseAttribute(dt, (url) =>
-      kebabCaseAndShortenPage(url, "qiskit-ibm-runtime"),
-    );
-    expect(result).toContain(
-      `attributeTypeHintHref='https://quantum.cloud.ibm.com/docs/api/qiskit/qiskit.transpiler.CouplingMap'`,
-    );
+    const html = await parseAttributeHtml(dt);
+    expect(html).toContain(`int`);
+    expect(html).toContain(`Type:`);
   });
 
-  test("no link produces undefined href", async () => {
-    const dt = `<dt id="qiskit_ibm_runtime.Executor.options">
-      <em class="property"><span class="pre">options</span><span class="p">:</span>
-      <span class="pre">str</span>
-      </em>
+  test("heading is inserted before the Attribute tag", async () => {
+    const dt = `<dt id="qiskit.transpiler.TranspileLayout.final_layout">
+      <span class="sig-name descname"><span class="pre">final_layout</span></span>
+      <span class="property"><span class="p">:</span>
+        <a href="qiskit.transpiler.Layout.html#qiskit.transpiler.Layout"><span class="pre">Layout</span></a>
+      </span>
       </dt>`;
-    const result = await parseAttribute(dt, (url) =>
-      kebabCaseAndShortenPage(url, "qiskit-ibm-runtime"),
+    const $ = load(`<div><dl class="py attribute">${dt}<dd></dd></dl></div>`);
+    const $dl = $("dl").first();
+    const $dt = $dl.find("dt").first();
+    await createMdxComponent(
+      $,
+      [$dt],
+      $dl,
+      [],
+      undefined,
+      "attribute",
+      $dt.attr("id") ?? "",
+      { isCApi: false },
     );
-    expect(result).toContain(`attributeTypeHintHref='undefined'`);
+    const html = $("div").html() ?? "";
+    const headingPos = html.indexOf(`data-header-type="attribute-header"`);
+    const dlPos = html.indexOf(`<dl `);
+    expect(headingPos).toBeGreaterThanOrEqual(0);
+    expect(dlPos).toBeGreaterThan(headingPos);
   });
 });
 
diff --git a/scripts/js/lib/api/generateApiComponents.ts b/scripts/js/lib/api/generateApiComponents.ts
index 8c62a54870bb..6c1b65ea2e1f 100644
--- a/scripts/js/lib/api/generateApiComponents.ts
+++ b/scripts/js/lib/api/generateApiComponents.ts
@@ -10,7 +10,7 @@
 // copyright notice, and modified files need to carry a notice indicating
 // that they have been altered from the originals.
 
-import { CheerioAPI, Cheerio, Element } from "cheerio";
+import { CheerioAPI, Cheerio, Element, load as cheerioLoad } from "cheerio";
 import { unified } from "unified";
 import rehypeParse from "rehype-parse";
 import rehypeRemark from "rehype-remark";
@@ -25,9 +25,8 @@ import {
 
 export type ComponentProps = {
   id?: string;
-  attributeTypeHint?: string;
-  attributeTypeHintHref?: string;
-  attributeValue?: string;
+  rawTypeHtml?: string;
+  rawDefaultHtml?: string;
   githubSourceLink?: string;
   rawSignature?: string;
   modifiers?: string;
@@ -43,7 +42,7 @@ export async function createMdxComponent(
   priorApiType: ApiTypeName | undefined,
   apiType: ApiObjectName,
   id: string,
-  options: { isCApi: boolean; normalizeUrl?: (url: string) => string },
+  options: { isCApi: boolean },
 ): Promise<string> {
   const tagName = API_OBJECTS[apiType].tagName;
 
@@ -76,7 +75,15 @@ export async function createMdxComponent(
   addExtraSignatures(componentProps, extraProps);
 
   const minHeadingLevel = componentProps.isDedicatedPage ? 2 : headerLevel + 1;
-  const $componentBody = $(`<div>${bodyElements.join("\n")}</div>`);
+  const typePrefix = componentProps.rawTypeHtml
+    ? `<p>Type: ${componentProps.rawTypeHtml}</p>`
+    : "";
+  const defaultPrefix = componentProps.rawDefaultHtml
+    ? `<p>Default value: ${componentProps.rawDefaultHtml}</p>`
+    : "";
+  const $componentBody = $(
+    `<div>${typePrefix}${defaultPrefix}${bodyElements.join("\n")}</div>`,
+  );
   setMinimumHeadingLevel($, $componentBody, minHeadingLevel);
 
   return [
@@ -98,7 +105,7 @@ function prepareProps(
   apiType: ApiObjectName,
   id: string,
   headerLevel: number,
-  options: { isCApi: boolean; normalizeUrl?: (url: string) => string },
+  options: { isCApi: boolean },
 ): ComponentProps {
   const prepClassOrException = () =>
     prepareClassOrExceptionProps(
@@ -130,7 +137,6 @@ function prepareProps(
       githubSourceLink,
       id,
       headerLevel,
-      options.normalizeUrl,
     );
 
   const preparePropsPerApiType: Record<ApiObjectName, () => ComponentProps> = {
@@ -252,7 +258,6 @@ function prepareAttributeOrPropertyProps(
   githubSourceLink: string | undefined,
   id: string,
   headerLevel: number,
-  normalizeUrl?: (url: string) => string,
 ): ComponentProps {
   // Properties/attributes have multiple `span.property` values to set:
   //
@@ -295,30 +300,37 @@ function prepareAttributeOrPropertyProps(
   }
 
   // The attributes have the following shape: name [: type] [= value]
-  // We skip the first character to leave off the `:` and the `=` in
-  // both type hint and default value
   const name = text.slice(0, Math.min(colonIndex, equalIndex)).trim();
-  const attributeTypeHint = text
-    .slice(Math.min(colonIndex + 1, equalIndex), equalIndex)
-    .trim();
-  const attributeValue = text.slice(equalIndex + 1, text.length).trim();
-
-  // If the type hint element contains a link, capture its href so the
-  // rendered component can make the type hint clickable.
-  const rawHref =
-    $child.find("em.property a, span.property a").first().attr("href") ??
-    undefined;
-  const hrefPath = rawHref?.split("#")[0];
-  const attributeTypeHintHref =
-    hrefPath && normalizeUrl && !hrefPath.startsWith("http")
-      ? normalizeUrl(hrefPath)
-      : hrefPath;
 
-  const props = {
+  let rawTypeHtml: string | undefined;
+  let rawDefaultHtml: string | undefined;
+
+  $child.find("em.property, span.property").each((_, el) => {
+    const $clone = $(el).clone();
+    const $firstP = $clone.find("span.p").first();
+    const delimiter = $firstP.text().trim();
+
+    if (delimiter === ":" && !rawTypeHtml) {
+      // Sphinx 8: em.property may start with the attribute name before the colon
+      $clone
+        .find("span.pre")
+        .filter((_, el) => $(el).text().trim() === name)
+        .first()
+        .remove();
+      $firstP.remove();
+      const inner = $clone.html()?.trim();
+      if (inner) rawTypeHtml = inlineCodeifyTypeHtml(inner);
+    } else if (delimiter === "=" && !rawDefaultHtml) {
+      $firstP.remove();
+      const inner = $clone.html()?.trim();
+      if (inner) rawDefaultHtml = `<code>${inner}</code>`;
+    }
+  });
+
+  const props: ComponentProps = {
     id,
-    attributeTypeHint,
-    attributeTypeHintHref,
-    attributeValue,
+    rawTypeHtml,
+    rawDefaultHtml,
     githubSourceLink,
     modifiers: filteredModifiers,
   };
@@ -332,7 +344,6 @@ function prepareAttributeOrPropertyProps(
     };
   }
 
-  // Else, the attribute is embedded on the class
   const htag = `h${headerLevel}`;
   $(
     `<${htag} data-header-type="attribute-header">${name}</${htag}>`,
@@ -393,14 +404,6 @@ export async function createOpeningTag(
   tagName: string,
   props: ComponentProps,
 ): Promise<string> {
-  const attributeTypeHint = props.attributeTypeHint?.replaceAll(
-    "'",
-    APOSTROPHE_HEX_CODE,
-  );
-  const attributeValue = props.attributeValue?.replaceAll(
-    "'",
-    APOSTROPHE_HEX_CODE,
-  );
   const signature = await htmlSignatureToMd(props.rawSignature!);
   const extraSignatures: string[] = [];
   for (const sig of props.extraRawSignatures ?? []) {
@@ -409,9 +412,6 @@ export async function createOpeningTag(
 
   return `<${tagName}
     id='${props.id}'
-    attributeTypeHint='${attributeTypeHint}'
-    attributeTypeHintHref='${props.attributeTypeHintHref}'
-    attributeValue='${attributeValue}'
     isDedicatedPage='${props.isDedicatedPage}'
     github='${props.githubSourceLink}'
     signature='${signature}'
@@ -590,3 +590,15 @@ export function setMinimumHeadingLevel(
       .replaceWith((_, el) => `<${newTag}>${$(el).html()}</${newTag}>`);
   }
 }
+
+function inlineCodeifyTypeHtml(html: string): string {
+  const $f = cheerioLoad(`<div>${html}</div>`, { xmlMode: false });
+  $f("span.pre").each((_, el) => {
+    const $el = $f(el);
+    $el.replaceWith(`<code>${$el.text()}</code>`);
+  });
+  $f("span.p, span.w").each((_, el) => {
+    $f(el).replaceWith($f(el).text());
+  });
+  return $f("div").html() ?? html;
+}
diff --git a/scripts/js/lib/api/htmlToMd.test.ts b/scripts/js/lib/api/htmlToMd.test.ts
index c998aac935e0..3ce4eb6bb867 100644
--- a/scripts/js/lib/api/htmlToMd.test.ts
+++ b/scripts/js/lib/api/htmlToMd.test.ts
@@ -761,7 +761,9 @@ test("convert class property headings", async () => {
     isReleaseNotes: false,
     markdown: `# circuits
 
-<Attribute id="qiskit_ibm_runtime.Estimator.circuits" attributeTypeHint="tuple[qiskit.circuit.quantumcircuit.QuantumCircuit, ...]" isDedicatedPage={true}>
+<Attribute id="qiskit_ibm_runtime.Estimator.circuits" isDedicatedPage={true}>
+  Type: \`tuple\`\\[\`qiskit.circuit.quantumcircuit.QuantumCircuit\`, ...]
+
   Quantum circuits that represents quantum states.
 </Attribute>\n`,
     meta: {
@@ -810,7 +812,9 @@ test("convert abstract class property headings", async () => {
     isReleaseNotes: false,
     markdown: `# circuits
 
-<Attribute id="qiskit_ibm_runtime.Estimator.circuits" attributeTypeHint="tuple[qiskit.circuit.quantumcircuit.QuantumCircuit, ...]" isDedicatedPage={true} modifiers="abstract property">
+<Attribute id="qiskit_ibm_runtime.Estimator.circuits" isDedicatedPage={true} modifiers="abstract property">
+  Type: \`tuple\`\\[\`qiskit.circuit.quantumcircuit.QuantumCircuit\`, ...]
+
   Quantum circuits that represents quantum states.
 </Attribute>\n`,
     meta: {
@@ -866,7 +870,11 @@ test("convert class attributes headings", async () => {
     isReleaseNotes: false,
     markdown: `# callback
 
-<Attribute id="qiskit_ibm_runtime.options.EnvironmentOptions.callback" attributeTypeHint="Optional[Callable]" attributeValue="None" isDedicatedPage={true} />\n`,
+<Attribute id="qiskit_ibm_runtime.options.EnvironmentOptions.callback" isDedicatedPage={true}>
+  Type: \`Optional\`\\[\`Callable\`]
+
+  Default value: \`None\`
+</Attribute>\n`,
     meta: {
       apiName: "qiskit_ibm_runtime.options.EnvironmentOptions.callback",
       apiType: "attribute",
@@ -874,6 +882,24 @@ test("convert class attributes headings", async () => {
   });
 });
 
+test("attribute with < and & in default value produces valid MDX", async () => {
+  // StagedPassManager.invalid_stage_regex has &lt; / &gt; / &amp; in the value.
+  // The default value is emitted as a plain "Default value: ..." paragraph; special
+  // chars are escaped by remark-stringify (e.g. < → \<).
+  const result = await toMd(
+    `<div role='main'>
+<h1>invalid_stage_regex<a class='headerlink' href='#invalid-stage-regex' title='Permalink to this heading'>¶</a></h1>
+<dl class="py attribute">
+<dt class="sig sig-object py" id="qiskit.transpiler.StagedPassManager.invalid_stage_regex">
+<span class="sig-name descname"><span class="pre">invalid_stage_regex</span></span><span class="property"><span class="w"> </span><span class="p"><span class="pre">=</span></span><span class="w"> </span><span class="pre">re.compile('\\s|\\+|\\-|\\*|\\/|\\\\|\\%|\\&lt;|\\&gt;|\\&#64;|\\!|\\~|\\^|\\&amp;|\\:|\\[|\\]|\\{|\\}|\\(|\\)')</span></span><a class="headerlink" href="#qiskit.transpiler.StagedPassManager.invalid_stage_regex" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+</div>
+`,
+  );
+  expect(result).toContain("Default value:");
+  expect(result).toContain("re.compile(");
+});
+
 test("convert functions headings", async () => {
   expect(
     await toMd(
@@ -1150,7 +1176,7 @@ test("generate correct heading level", async () => {
 
 ### attribute1
 
-<Attribute id="qiskit.test.attribute1" attributeTypeHint="None" attributeValue="None">
+<Attribute id="qiskit.test.attribute1">
   Attribute 1
 </Attribute>
 
diff --git a/scripts/js/lib/api/htmlToMd.ts b/scripts/js/lib/api/htmlToMd.ts
index cefbc9e760c1..df6f15289d03 100644
--- a/scripts/js/lib/api/htmlToMd.ts
+++ b/scripts/js/lib/api/htmlToMd.ts
@@ -362,17 +362,7 @@ function buildApiComponent(h: H, node: any): any {
   };
 
   maybeAddAttribute(hastTree, "id", node.properties.id);
-  maybeAddAttribute(
-    hastTree,
-    "attributeTypeHint",
-    node.properties.attributetypehint,
-  );
-  maybeAddAttribute(
-    hastTree,
-    "attributeTypeHintHref",
-    node.properties.attributetypehinthref,
-  );
-  maybeAddAttribute(hastTree, "attributeValue", node.properties.attributevalue);
+  maybeAddAttribute(hastTree, "name", node.properties.name);
   maybeAddExpressionAttribute(
     hastTree,
     "isDedicatedPage",
diff --git a/scripts/js/lib/api/processHtml.test.ts b/scripts/js/lib/api/processHtml.test.ts
index 16951080ea71..f00873a57e4e 100644
--- a/scripts/js/lib/api/processHtml.test.ts
+++ b/scripts/js/lib/api/processHtml.test.ts
@@ -552,7 +552,7 @@ test.describe("processMembersAndSetMeta()", () => {
       isIbmQuantumSchemasPage: false,
     });
     doc.expectHtml(`      <h1>Circuit Converters</h1>
-<h3 data-header-type="method-header">circuit_to_dag</h3><div><function id="qiskit.converters.circuit_to_dag" attributetypehint="undefined" attributetypehinthref="undefined" attributevalue="undefined" isdedicatedpage="undefined" github="../_modules/qiskit/converters/circuit_to_dag.html#circuit_to_dag" signature="qiskit.converters.circuit_to_dag(circuit, copy_operations=True, *, qubit_order=None, clbit_order=None)¶" modifiers="" extrasignatures="[]">
+<h3 data-header-type="method-header">circuit_to_dag</h3><div><function id="qiskit.converters.circuit_to_dag" isdedicatedpage="undefined" github="../_modules/qiskit/converters/circuit_to_dag.html#circuit_to_dag" signature="qiskit.converters.circuit_to_dag(circuit, copy_operations=True, *, qubit_order=None, clbit_order=None)¶" modifiers="" extrasignatures="[]">
   
 <div><p>Build a <a class="reference internal" href="../stubs/qiskit.dagcircuit.DAGCircuit.html#qiskit.dagcircuit.DAGCircuit" title="qiskit.dagcircuit.DAGCircuit"><code class="xref py py-class docutils literal notranslate"><span class="pre">DAGCircuit</span></code></a> object from a <a class="reference internal" href="../stubs/qiskit.circuit.QuantumCircuit.html#qiskit.circuit.QuantumCircuit" title="qiskit.circuit.QuantumCircuit"><code class="xref py py-class docutils literal notranslate"><span class="pre">QuantumCircuit</span></code></a>.</p>
 <dl class="field-list simple">
@@ -604,7 +604,7 @@ backends may not have this attribute.</p>
       isIbmQuantumSchemasPage: false,
     });
     doc.expectHtml(`<h1>least_busy</h1>
-<div><function id="qiskit_ibm_provider.least_busy" attributetypehint="undefined" attributetypehinthref="undefined" attributevalue="undefined" isdedicatedpage="true" github="../_modules/qiskit_ibm_provider.html#least_busy" signature="least_busy(backends)¶" modifiers="" extrasignatures="[]">
+<div><function id="qiskit_ibm_provider.least_busy" isdedicatedpage="true" github="../_modules/qiskit_ibm_provider.html#least_busy" signature="least_busy(backends)¶" modifiers="" extrasignatures="[]">
   
 <div><p>Return the least busy backend from a list.</p>
 <p>Return the least busy available backend for those that
@@ -670,7 +670,7 @@ particular error, which subclasses both <a class="reference internal" href="#qis
     doc.expectHtml(`<span class="target" id="module-qiskit.exceptions"><span id="qiskit-exceptions"></span></span><section id="top-level-exceptions-qiskit-exceptions">
 <h1>Top-level exceptions (<a class="reference internal" href="#module-qiskit.exceptions" title="qiskit.exceptions"><code class="xref py py-mod docutils literal notranslate"><span class="pre">qiskit.exceptions</span></code></a>)<a class="headerlink" href="#top-level-exceptions-qiskit-exceptions" title="Permalink to this heading">¶</a></h1>
 <p>All Qiskit-related errors raised by Qiskit are subclasses of the base:</p>
-<h3 data-header-type="class-header">QiskitError</h3><div><class id="qiskit.exceptions.QiskitError" attributetypehint="undefined" attributetypehinthref="undefined" attributevalue="undefined" isdedicatedpage="undefined" github="../_modules/qiskit/exceptions.html#QiskitError" signature="qiskit.exceptions.QiskitError(*message)¶" modifiers="exception" extrasignatures="[]">
+<h3 data-header-type="class-header">QiskitError</h3><div><class id="qiskit.exceptions.QiskitError" isdedicatedpage="undefined" github="../_modules/qiskit/exceptions.html#QiskitError" signature="qiskit.exceptions.QiskitError(*message)¶" modifiers="exception" extrasignatures="[]">
   
 <div><p>Base class for errors raised by Qiskit.</p>
 <p>Set the error message.</p>
@@ -718,7 +718,7 @@ marked as builtins since they are not actually present in any include file this
       isIbmQuantumSchemasPage: false,
     });
     doc.expectHtml(`
-<h3 data-header-type="attribute-header">qiskit.qasm2.LEGACY_CUSTOM_INSTRUCTIONS¶</h3><div><attribute id="qiskit.qasm2.LEGACY_CUSTOM_INSTRUCTIONS" attributetypehint="" attributetypehinthref="undefined" attributevalue="" isdedicatedpage="undefined" github="undefined" signature="" modifiers="" extrasignatures="[]">
+<h3 data-header-type="attribute-header">qiskit.qasm2.LEGACY_CUSTOM_INSTRUCTIONS¶</h3><div><attribute id="qiskit.qasm2.LEGACY_CUSTOM_INSTRUCTIONS" isdedicatedpage="undefined" github="undefined" signature="" modifiers="" extrasignatures="[]">
   
 <div><p>A tuple containing the extra <cite>custom_instructions</cite> that Qiskit’s legacy built-in converters used
 if <code class="docutils literal notranslate"><span class="pre">qelib1.inc</span></code> is included, and there is any definition of a <code class="docutils literal notranslate"><span class="pre">delay</span></code> instruction.  The gates
@@ -761,7 +761,7 @@ marked as builtins since they are not actually present in any include file this
       isRoot: false,
       isIbmQuantumSchemasPage: false,
     });
-    doc.expectHtml(`<h3 data-header-type=\"method-header\">qk_obs_identity</h3><div><function id=\"qk_obs_identity\" attributetypehint=\"undefined\" attributetypehinthref=\"undefined\" attributevalue=\"undefined\" isdedicatedpage=\"undefined\" github=\"undefined\" signature=\"QkSparseObservable *qk_obs_identity(uint32_t num_qubits)¶\" modifiers=\"\" extrasignatures=\"[]\">
+    doc.expectHtml(`<h3 data-header-type=\"method-header\">qk_obs_identity</h3><div><function id=\"qk_obs_identity\" isdedicatedpage=\"undefined\" github=\"undefined\" signature=\"QkSparseObservable *qk_obs_identity(uint32_t num_qubits)¶\" modifiers=\"\" extrasignatures=\"[]\">
   
 <div><p>Construct the identity observable.</p>
 <section id=\"group__QkSparseObservable_1autotoc_md4\">