diff --git a/config/v1/tests/clusterversions.config.openshift.io/CVORelatedObjects.yaml b/config/v1/tests/clusterversions.config.openshift.io/CVORelatedObjects.yaml
new file mode 100644
index 00000000000..3f920ce710c
--- /dev/null
+++ b/config/v1/tests/clusterversions.config.openshift.io/CVORelatedObjects.yaml
@@ -0,0 +1,74 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "ClusterVersion"
+crdName: clusterversions.config.openshift.io
+featureGates:
+- CVORelatedObjects
+tests:
+  onCreate:
+    - name: Should be able to create a minimal ClusterVersion
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: ClusterVersion
+        spec:
+          clusterID: foo
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: ClusterVersion
+        spec:
+          clusterID: foo
+  onUpdate:
+    - name: .status.relatedObjects namespace default should be empty
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: ClusterVersion
+        spec:
+          clusterID: foo
+        status:
+          desired:
+            version: foo
+            image: foo
+            architecture: Multi
+          observedGeneration: 1
+          versionHash: foo
+          availableUpdates:
+          - version: foo
+            image: foo
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: ClusterVersion
+        spec:
+          clusterID: foo
+        status:
+          desired:
+            version: foo
+            image: foo
+            architecture: Multi
+          observedGeneration: 1
+          versionHash: foo
+          availableUpdates:
+          - version: foo
+            image: foo
+          relatedObjects:
+            - group: g1
+              resource: r1
+              name: n1
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: ClusterVersion
+        spec:
+          clusterID: foo
+        status:
+          desired:
+            version: foo
+            image: foo
+            architecture: Multi
+          observedGeneration: 1
+          versionHash: foo
+          availableUpdates:
+          - version: foo
+            image: foo
+          relatedObjects:
+            - group: g1
+              resource: r1
+              namespace: ns1
+              name: n1
diff --git a/config/v1/types_cluster_operator.go b/config/v1/types_cluster_operator.go
index a447adb9f4a..444ca94895e 100644
--- a/config/v1/types_cluster_operator.go
+++ b/config/v1/types_cluster_operator.go
@@ -100,6 +100,7 @@ type ObjectReference struct {
 	// +required
 	Resource string `json:"resource"`
 	// namespace of the referent.
+	// +kubebuilder:default=""
 	// +optional
 	Namespace string `json:"namespace,omitempty"`
 	// name of the referent.
diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go
index 092bebff09b..c472614448c 100644
--- a/config/v1/types_cluster_version.go
+++ b/config/v1/types_cluster_version.go
@@ -199,6 +199,21 @@ type ClusterVersionStatus struct {
 	// +listType=atomic
 	// +optional
 	ConditionalUpdates []ConditionalUpdate `json:"conditionalUpdates,omitempty"`
+
+	// relatedObjects is a list of objects that are "interesting" or related to this operator.
+	// `oc adm inspect` honors this field in any type to navigate and collect related data.
+	// Common uses are:
+	// 1. operator namespaces
+	// 2. operand namespaces
+	// +optional
+	// +openshift:enable:FeatureGate=CVORelatedObjects
+	// +kubebuilder:validation:MaxItems=100
+	// +listType=map
+	// +listMapKey=group
+	// +listMapKey=resource
+	// +listMapKey=namespace
+	// +listMapKey=name
+	RelatedObjects []ObjectReference `json:"relatedObjects,omitempty"`
 }
 
 // UpdateState is a constant representing whether an update was successfully
diff --git a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml
index 7ab62874a10..2f12a668710 100644
--- a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml
+++ b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml
@@ -135,6 +135,7 @@ spec:
                       description: name of the referent.
                       type: string
                     namespace:
+                      default: ""
                       description: namespace of the referent.
                       type: string
                     resource:
diff --git a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
index f800eeb2a80..a0d6feaf5d5 100644
--- a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
+++ b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
@@ -807,6 +807,43 @@ spec:
                   and conditions fields may represent a previous version.
                 format: int64
                 type: integer
+              relatedObjects:
+                description: |-
+                  relatedObjects is a list of objects that are "interesting" or related to this operator.
+                  `oc adm inspect` honors this field in any type to navigate and collect related data.
+                  Common uses are:
+                  1. operator namespaces
+                  2. operand namespaces
+                items:
+                  description: ObjectReference contains enough information to let
+                    you inspect or modify the referred object.
+                  properties:
+                    group:
+                      description: group of the referent.
+                      type: string
+                    name:
+                      description: name of the referent.
+                      type: string
+                    namespace:
+                      default: ""
+                      description: namespace of the referent.
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      type: string
+                  required:
+                  - group
+                  - name
+                  - resource
+                  type: object
+                maxItems: 100
+                type: array
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
               versionHash:
                 description: |-
                   versionHash is a fingerprint of the content that the cluster will be
diff --git a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
index 6a9c3426020..40a214f3bc3 100644
--- a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
+++ b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
@@ -807,6 +807,43 @@ spec:
                   and conditions fields may represent a previous version.
                 format: int64
                 type: integer
+              relatedObjects:
+                description: |-
+                  relatedObjects is a list of objects that are "interesting" or related to this operator.
+                  `oc adm inspect` honors this field in any type to navigate and collect related data.
+                  Common uses are:
+                  1. operator namespaces
+                  2. operand namespaces
+                items:
+                  description: ObjectReference contains enough information to let
+                    you inspect or modify the referred object.
+                  properties:
+                    group:
+                      description: group of the referent.
+                      type: string
+                    name:
+                      description: name of the referent.
+                      type: string
+                    namespace:
+                      default: ""
+                      description: namespace of the referent.
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      type: string
+                  required:
+                  - group
+                  - name
+                  - resource
+                  type: object
+                maxItems: 100
+                type: array
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
               versionHash:
                 description: |-
                   versionHash is a fingerprint of the content that the cluster will be
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
index 34f2c0a8233..4f4c3219ae0 100644
--- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
+++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
@@ -488,6 +488,7 @@ spec:
                             description: name of the referent.
                             type: string
                           namespace:
+                            default: ""
                             description: namespace of the referent.
                             type: string
                           resource:
diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go
index 38aa2f6f331..0e63a3c94c2 100644
--- a/config/v1/zz_generated.deepcopy.go
+++ b/config/v1/zz_generated.deepcopy.go
@@ -1345,6 +1345,11 @@ func (in *ClusterVersionStatus) DeepCopyInto(out *ClusterVersionStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.RelatedObjects != nil {
+		in, out := &in.RelatedObjects, &out.RelatedObjects
+		*out = make([]ObjectReference, len(*in))
+		copy(*out, *in)
+	}
 	return
 }
 
diff --git a/config/v1/zz_generated.featuregated-crd-manifests.yaml b/config/v1/zz_generated.featuregated-crd-manifests.yaml
index a681631cf6d..986197689a2 100644
--- a/config/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/config/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -117,6 +117,7 @@ clusterversions.config.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates:
+  - CVORelatedObjects
   - ImageStreamImportMode
   - SignatureStores
   FilenameOperatorName: cluster-version-operator
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/clusteroperators.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/clusteroperators.config.openshift.io/AAA_ungated.yaml
index 0e73af4f402..c5feae501ce 100644
--- a/config/v1/zz_generated.featuregated-crd-manifests/clusteroperators.config.openshift.io/AAA_ungated.yaml
+++ b/config/v1/zz_generated.featuregated-crd-manifests/clusteroperators.config.openshift.io/AAA_ungated.yaml
@@ -138,6 +138,7 @@ spec:
                       description: name of the referent.
                       type: string
                     namespace:
+                      default: ""
                       description: namespace of the referent.
                       type: string
                     resource:
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/CVORelatedObjects.yaml b/config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/CVORelatedObjects.yaml
new file mode 100644
index 00000000000..5044ab9cda2
--- /dev/null
+++ b/config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/CVORelatedObjects.yaml
@@ -0,0 +1,794 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    api-approved.openshift.io: https://github.com/openshift/api/pull/495
+    api.openshift.io/filename-cvo-runlevel: "0000_00"
+    api.openshift.io/filename-operator: cluster-version-operator
+    api.openshift.io/filename-ordering: "01"
+    feature-gate.release.openshift.io/CVORelatedObjects: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+  name: clusterversions.config.openshift.io
+spec:
+  group: config.openshift.io
+  names:
+    kind: ClusterVersion
+    listKind: ClusterVersionList
+    plural: clusterversions
+    singular: clusterversion
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.history[?(@.state=="Completed")].version
+      name: Version
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Available")].status
+      name: Available
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Progressing")].status
+      name: Progressing
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Progressing")].lastTransitionTime
+      name: Since
+      type: date
+    - jsonPath: .status.conditions[?(@.type=="Progressing")].message
+      name: Status
+      type: string
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          ClusterVersion is the configuration for the ClusterVersionOperator. This is where
+          parameters related to automatic updates can be set.
+
+          Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              spec is the desired state of the cluster version - the operator will work
+              to ensure that the desired version is applied to the cluster.
+            properties:
+              capabilities:
+                description: |-
+                  capabilities configures the installation of optional, core
+                  cluster components.  A null value here is identical to an
+                  empty object; see the child properties for default semantics.
+                properties:
+                  additionalEnabledCapabilities:
+                    description: |-
+                      additionalEnabledCapabilities extends the set of managed
+                      capabilities beyond the baseline defined in
+                      baselineCapabilitySet.  The default is an empty set.
+                    items:
+                      description: ClusterVersionCapability enumerates optional, core
+                        cluster components.
+                      enum:
+                      - openshift-samples
+                      - baremetal
+                      - marketplace
+                      - Console
+                      - Insights
+                      - Storage
+                      - CSISnapshot
+                      - NodeTuning
+                      - MachineAPI
+                      - Build
+                      - DeploymentConfig
+                      - ImageRegistry
+                      - OperatorLifecycleManager
+                      - CloudCredential
+                      - Ingress
+                      - CloudControllerManager
+                      - OperatorLifecycleManagerV1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  baselineCapabilitySet:
+                    description: |-
+                      baselineCapabilitySet selects an initial set of
+                      optional capabilities to enable, which can be extended via
+                      additionalEnabledCapabilities.  If unset, the cluster will
+                      choose a default, and the default may change over time.
+                      The current default is vCurrent.
+                    enum:
+                    - None
+                    - v4.11
+                    - v4.12
+                    - v4.13
+                    - v4.14
+                    - v4.15
+                    - v4.16
+                    - v4.17
+                    - v4.18
+                    - vCurrent
+                    type: string
+                type: object
+              channel:
+                description: |-
+                  channel is an identifier for explicitly requesting that a non-default
+                  set of updates be applied to this cluster. The default channel will be
+                  contain stable updates that are appropriate for production clusters.
+                type: string
+              clusterID:
+                description: |-
+                  clusterID uniquely identifies this cluster. This is expected to be
+                  an RFC4122 UUID value (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx in
+                  hexadecimal values). This is a required field.
+                type: string
+              desiredUpdate:
+                description: |-
+                  desiredUpdate is an optional field that indicates the desired value of
+                  the cluster version. Setting this value will trigger an upgrade (if
+                  the current version does not match the desired version). The set of
+                  recommended update values is listed as part of available updates in
+                  status, and setting values outside that range may cause the upgrade
+                  to fail.
+
+                  Some of the fields are inter-related with restrictions and meanings described here.
+                  1. image is specified, version is specified, architecture is specified. API validation error.
+                  2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
+                  3. image is specified, version is not specified, architecture is specified. API validation error.
+                  4. image is specified, version is not specified, architecture is not specified. image is used.
+                  5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
+                  6. image is not specified, version is specified, architecture is not specified. version and current architecture are used to select an image.
+                  7. image is not specified, version is not specified, architecture is specified. API validation error.
+                  8. image is not specified, version is not specified, architecture is not specified. API validation error.
+
+                  If an upgrade fails the operator will halt and report status
+                  about the failing component. Setting the desired update value back to
+                  the previous version will cause a rollback to be attempted. Not all
+                  rollbacks will succeed.
+                properties:
+                  architecture:
+                    description: |-
+                      architecture is an optional field that indicates the desired
+                      value of the cluster architecture. In this context cluster
+                      architecture means either a single architecture or a multi
+                      architecture. architecture can only be set to Multi thereby
+                      only allowing updates from single to multi architecture. If
+                      architecture is set, image cannot be set and version must be
+                      set.
+                      Valid values are 'Multi' and empty.
+                    enum:
+                    - Multi
+                    - ""
+                    type: string
+                  force:
+                    description: |-
+                      force allows an administrator to update to an image that has failed
+                      verification or upgradeable checks. This option should only
+                      be used when the authenticity of the provided image has been verified out
+                      of band because the provided image will run with full administrative access
+                      to the cluster. Do not use this flag with images that comes from unknown
+                      or potentially malicious sources.
+                    type: boolean
+                  image:
+                    description: |-
+                      image is a container image location that contains the update.
+                      image should be used when the desired version does not exist in availableUpdates or history.
+                      When image is set, architecture cannot be specified.
+                      If both version and image are set, the version extracted from the referenced image must match the specified version.
+                    type: string
+                  version:
+                    description: |-
+                      version is a semantic version identifying the update version.
+                      version is required if architecture is specified.
+                      If both version and image are set, the version extracted from the referenced image must match the specified version.
+                    type: string
+                type: object
+                x-kubernetes-validations:
+                - message: cannot set both Architecture and Image
+                  rule: 'has(self.architecture) && has(self.image) ? (self.architecture
+                    == "" || self.image == "") : true'
+                - message: Version must be set if Architecture is set
+                  rule: 'has(self.architecture) && self.architecture != "" ? self.version
+                    != "" : true'
+              overrides:
+                description: |-
+                  overrides is list of overides for components that are managed by
+                  cluster version operator. Marking a component unmanaged will prevent
+                  the operator from creating or updating the object.
+                items:
+                  description: |-
+                    ComponentOverride allows overriding cluster version operator's behavior
+                    for a component.
+                  properties:
+                    group:
+                      description: group identifies the API group that the kind is
+                        in.
+                      type: string
+                    kind:
+                      description: kind indentifies which object to override.
+                      type: string
+                    name:
+                      description: name is the component's name.
+                      type: string
+                    namespace:
+                      description: |-
+                        namespace is the component's namespace. If the resource is cluster
+                        scoped, the namespace should be empty.
+                      type: string
+                    unmanaged:
+                      description: |-
+                        unmanaged controls if cluster version operator should stop managing the
+                        resources in this cluster.
+                        Default: false
+                      type: boolean
+                  required:
+                  - group
+                  - kind
+                  - name
+                  - namespace
+                  - unmanaged
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - kind
+                - group
+                - namespace
+                - name
+                x-kubernetes-list-type: map
+              upstream:
+                description: |-
+                  upstream may be used to specify the preferred update server. By default
+                  it will use the appropriate update server for the cluster and region.
+                type: string
+            required:
+            - clusterID
+            type: object
+          status:
+            description: |-
+              status contains information about the available updates and any in-progress
+              updates.
+            properties:
+              availableUpdates:
+                description: |-
+                  availableUpdates contains updates recommended for this
+                  cluster. Updates which appear in conditionalUpdates but not in
+                  availableUpdates may expose this cluster to known issues. This list
+                  may be empty if no updates are recommended, if the update service
+                  is unavailable, or if an invalid channel has been specified.
+                items:
+                  description: Release represents an OpenShift release image and associated
+                    metadata.
+                  properties:
+                    channels:
+                      description: |-
+                        channels is the set of Cincinnati channels to which the release
+                        currently belongs.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: set
+                    image:
+                      description: |-
+                        image is a container image location that contains the update. When this
+                        field is part of spec, image is optional if version is specified and the
+                        availableUpdates field contains a matching version.
+                      type: string
+                    url:
+                      description: |-
+                        url contains information about this release. This URL is set by
+                        the 'url' metadata property on a release or the metadata returned by
+                        the update API and should be displayed as a link in user
+                        interfaces. The URL field may not be set for test or nightly
+                        releases.
+                      type: string
+                    version:
+                      description: |-
+                        version is a semantic version identifying the update version. When this
+                        field is part of spec, version is optional if image is specified.
+                      type: string
+                  required:
+                  - image
+                  - version
+                  type: object
+                nullable: true
+                type: array
+                x-kubernetes-list-type: atomic
+              capabilities:
+                description: capabilities describes the state of optional, core cluster
+                  components.
+                properties:
+                  enabledCapabilities:
+                    description: enabledCapabilities lists all the capabilities that
+                      are currently managed.
+                    items:
+                      description: ClusterVersionCapability enumerates optional, core
+                        cluster components.
+                      enum:
+                      - openshift-samples
+                      - baremetal
+                      - marketplace
+                      - Console
+                      - Insights
+                      - Storage
+                      - CSISnapshot
+                      - NodeTuning
+                      - MachineAPI
+                      - Build
+                      - DeploymentConfig
+                      - ImageRegistry
+                      - OperatorLifecycleManager
+                      - CloudCredential
+                      - Ingress
+                      - CloudControllerManager
+                      - OperatorLifecycleManagerV1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  knownCapabilities:
+                    description: knownCapabilities lists all the capabilities known
+                      to the current cluster.
+                    items:
+                      description: ClusterVersionCapability enumerates optional, core
+                        cluster components.
+                      enum:
+                      - openshift-samples
+                      - baremetal
+                      - marketplace
+                      - Console
+                      - Insights
+                      - Storage
+                      - CSISnapshot
+                      - NodeTuning
+                      - MachineAPI
+                      - Build
+                      - DeploymentConfig
+                      - ImageRegistry
+                      - OperatorLifecycleManager
+                      - CloudCredential
+                      - Ingress
+                      - CloudControllerManager
+                      - OperatorLifecycleManagerV1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: atomic
+                type: object
+              conditionalUpdates:
+                description: |-
+                  conditionalUpdates contains the list of updates that may be
+                  recommended for this cluster if it meets specific required
+                  conditions. Consumers interested in the set of updates that are
+                  actually recommended for this cluster should use
+                  availableUpdates. This list may be empty if no updates are
+                  recommended, if the update service is unavailable, or if an empty
+                  or invalid channel has been specified.
+                items:
+                  description: |-
+                    ConditionalUpdate represents an update which is recommended to some
+                    clusters on the version the current cluster is reconciling, but which
+                    may not be recommended for the current cluster.
+                  properties:
+                    conditions:
+                      description: |-
+                        conditions represents the observations of the conditional update's
+                        current status. Known types are:
+                        * Recommended, for whether the update is recommended for the current cluster.
+                      items:
+                        description: Condition contains details for one aspect of
+                          the current state of this API Resource.
+                        properties:
+                          lastTransitionTime:
+                            description: |-
+                              lastTransitionTime is the last time the condition transitioned from one status to another.
+                              This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                            format: date-time
+                            type: string
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration represents the .metadata.generation that the condition was set based upon.
+                              For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                              with respect to the current state of the instance.
+                            format: int64
+                            minimum: 0
+                            type: integer
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    release:
+                      description: release is the target of the update.
+                      properties:
+                        channels:
+                          description: |-
+                            channels is the set of Cincinnati channels to which the release
+                            currently belongs.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: set
+                        image:
+                          description: |-
+                            image is a container image location that contains the update. When this
+                            field is part of spec, image is optional if version is specified and the
+                            availableUpdates field contains a matching version.
+                          type: string
+                        url:
+                          description: |-
+                            url contains information about this release. This URL is set by
+                            the 'url' metadata property on a release or the metadata returned by
+                            the update API and should be displayed as a link in user
+                            interfaces. The URL field may not be set for test or nightly
+                            releases.
+                          type: string
+                        version:
+                          description: |-
+                            version is a semantic version identifying the update version. When this
+                            field is part of spec, version is optional if image is specified.
+                          type: string
+                      required:
+                      - image
+                      - version
+                      type: object
+                    risks:
+                      description: |-
+                        risks represents the range of issues associated with
+                        updating to the target release. The cluster-version
+                        operator will evaluate all entries, and only recommend the
+                        update if there is at least one entry and all entries
+                        recommend the update.
+                      items:
+                        description: |-
+                          ConditionalUpdateRisk represents a reason and cluster-state
+                          for not recommending a conditional update.
+                        properties:
+                          matchingRules:
+                            description: |-
+                              matchingRules is a slice of conditions for deciding which
+                              clusters match the risk and which do not. The slice is
+                              ordered by decreasing precedence. The cluster-version
+                              operator will walk the slice in order, and stop after the
+                              first it can successfully evaluate. If no condition can be
+                              successfully evaluated, the update will not be recommended.
+                            items:
+                              description: |-
+                                ClusterCondition is a union of typed cluster conditions.  The 'type'
+                                property determines which of the type-specific properties are relevant.
+                                When evaluated on a cluster, the condition may match, not match, or
+                                fail to evaluate.
+                              properties:
+                                promql:
+                                  description: promql represents a cluster condition
+                                    based on PromQL.
+                                  properties:
+                                    promql:
+                                      description: |-
+                                        promql is a PromQL query classifying clusters. This query
+                                        query should return a 1 in the match case and a 0 in the
+                                        does-not-match case. Queries which return no time
+                                        series, or which return values besides 0 or 1, are
+                                        evaluation failures.
+                                      type: string
+                                  required:
+                                  - promql
+                                  type: object
+                                type:
+                                  description: |-
+                                    type represents the cluster-condition type. This defines
+                                    the members and semantics of any additional properties.
+                                  enum:
+                                  - Always
+                                  - PromQL
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            minItems: 1
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          message:
+                            description: |-
+                              message provides additional information about the risk of
+                              updating, in the event that matchingRules match the cluster
+                              state. This is only to be consumed by humans. It may
+                              contain Line Feed characters (U+000A), which should be
+                              rendered as new lines.
+                            minLength: 1
+                            type: string
+                          name:
+                            description: |-
+                              name is the CamelCase reason for not recommending a
+                              conditional update, in the event that matchingRules match the
+                              cluster state.
+                            minLength: 1
+                            type: string
+                          url:
+                            description: url contains information about this risk.
+                            format: uri
+                            minLength: 1
+                            type: string
+                        required:
+                        - matchingRules
+                        - message
+                        - name
+                        - url
+                        type: object
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                  required:
+                  - release
+                  - risks
+                  type: object
+                type: array
+                x-kubernetes-list-type: atomic
+              conditions:
+                description: |-
+                  conditions provides information about the cluster version. The condition
+                  "Available" is set to true if the desiredUpdate has been reached. The
+                  condition "Progressing" is set to true if an update is being applied.
+                  The condition "Degraded" is set to true if an update is currently blocked
+                  by a temporary or permanent error. Conditions are only valid for the
+                  current desiredUpdate when metadata.generation is equal to
+                  status.generation.
+                items:
+                  description: |-
+                    ClusterOperatorStatusCondition represents the state of the operator's
+                    managed and monitored components.
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the time of the last update
+                        to the current status property.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message provides additional information about the current condition.
+                        This is only to be consumed by humans.  It may contain Line Feed
+                        characters (U+000A), which should be rendered as new lines.
+                      type: string
+                    reason:
+                      description: reason is the CamelCase reason for the condition's
+                        current status.
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: type specifies the aspect reported by this condition.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              desired:
+                description: |-
+                  desired is the version that the cluster is reconciling towards.
+                  If the cluster is not yet fully initialized desired will be set
+                  with the information available, which may be an image or a tag.
+                properties:
+                  channels:
+                    description: |-
+                      channels is the set of Cincinnati channels to which the release
+                      currently belongs.
+                    items:
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                  image:
+                    description: |-
+                      image is a container image location that contains the update. When this
+                      field is part of spec, image is optional if version is specified and the
+                      availableUpdates field contains a matching version.
+                    type: string
+                  url:
+                    description: |-
+                      url contains information about this release. This URL is set by
+                      the 'url' metadata property on a release or the metadata returned by
+                      the update API and should be displayed as a link in user
+                      interfaces. The URL field may not be set for test or nightly
+                      releases.
+                    type: string
+                  version:
+                    description: |-
+                      version is a semantic version identifying the update version. When this
+                      field is part of spec, version is optional if image is specified.
+                    type: string
+                required:
+                - image
+                - version
+                type: object
+              history:
+                description: |-
+                  history contains a list of the most recent versions applied to the cluster.
+                  This value may be empty during cluster startup, and then will be updated
+                  when a new update is being applied. The newest update is first in the
+                  list and it is ordered by recency. Updates in the history have state
+                  Completed if the rollout completed - if an update was failing or halfway
+                  applied the state will be Partial. Only a limited amount of update history
+                  is preserved.
+                items:
+                  description: UpdateHistory is a single attempted update to the cluster.
+                  properties:
+                    acceptedRisks:
+                      description: |-
+                        acceptedRisks records risks which were accepted to initiate the update.
+                        For example, it may menition an Upgradeable=False or missing signature
+                        that was overriden via desiredUpdate.force, or an update that was
+                        initiated despite not being in the availableUpdates set of recommended
+                        update targets.
+                      type: string
+                    completionTime:
+                      description: |-
+                        completionTime, if set, is when the update was fully applied. The update
+                        that is currently being applied will have a null completion time.
+                        Completion time will always be set for entries that are not the current
+                        update (usually to the started time of the next update).
+                      format: date-time
+                      nullable: true
+                      type: string
+                    image:
+                      description: |-
+                        image is a container image location that contains the update. This value
+                        is always populated.
+                      type: string
+                    startedTime:
+                      description: startedTime is the time at which the update was
+                        started.
+                      format: date-time
+                      type: string
+                    state:
+                      description: |-
+                        state reflects whether the update was fully applied. The Partial state
+                        indicates the update is not fully applied, while the Completed state
+                        indicates the update was successfully rolled out at least once (all
+                        parts of the update successfully applied).
+                      type: string
+                    verified:
+                      description: |-
+                        verified indicates whether the provided update was properly verified
+                        before it was installed. If this is false the cluster may not be trusted.
+                        Verified does not cover upgradeable checks that depend on the cluster
+                        state at the time when the update target was accepted.
+                      type: boolean
+                    version:
+                      description: |-
+                        version is a semantic version identifying the update version. If the
+                        requested image does not define a version, or if a failure occurs
+                        retrieving the image, this value may be empty.
+                      type: string
+                  required:
+                  - completionTime
+                  - image
+                  - startedTime
+                  - state
+                  - verified
+                  type: object
+                type: array
+                x-kubernetes-list-type: atomic
+              observedGeneration:
+                description: |-
+                  observedGeneration reports which version of the spec is being synced.
+                  If this value is not equal to metadata.generation, then the desired
+                  and conditions fields may represent a previous version.
+                format: int64
+                type: integer
+              relatedObjects:
+                description: |-
+                  relatedObjects is a list of objects that are "interesting" or related to this operator.
+                  `oc adm inspect` honors this field in any type to navigate and collect related data.
+                  Common uses are:
+                  1. operator namespaces
+                  2. operand namespaces
+                items:
+                  description: ObjectReference contains enough information to let
+                    you inspect or modify the referred object.
+                  properties:
+                    group:
+                      description: group of the referent.
+                      type: string
+                    name:
+                      description: name of the referent.
+                      type: string
+                    namespace:
+                      default: ""
+                      description: namespace of the referent.
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      type: string
+                  required:
+                  - group
+                  - name
+                  - resource
+                  type: object
+                maxItems: 100
+                type: array
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
+              versionHash:
+                description: |-
+                  versionHash is a fingerprint of the content that the cluster will be
+                  updated with. It is used by the operator to avoid unnecessary work
+                  and is for internal use only.
+                type: string
+            required:
+            - availableUpdates
+            - desired
+            - observedGeneration
+            - versionHash
+            type: object
+        required:
+        - spec
+        type: object
+        x-kubernetes-validations:
+        - message: the `marketplace` capability requires the `OperatorLifecycleManager`
+            capability, which is neither explicitly or implicitly enabled in this
+            cluster, please enable the `OperatorLifecycleManager` capability
+          rule: 'has(self.spec.capabilities) && has(self.spec.capabilities.additionalEnabledCapabilities)
+            && self.spec.capabilities.baselineCapabilitySet == ''None'' && ''marketplace''
+            in self.spec.capabilities.additionalEnabledCapabilities ? ''OperatorLifecycleManager''
+            in self.spec.capabilities.additionalEnabledCapabilities || (has(self.status)
+            && has(self.status.capabilities) && has(self.status.capabilities.enabledCapabilities)
+            && ''OperatorLifecycleManager'' in self.status.capabilities.enabledCapabilities)
+            : true'
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml
index faaa4396f91..e8b0b805fbb 100644
--- a/config/v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml
+++ b/config/v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml
@@ -489,6 +489,7 @@ spec:
                             description: name of the referent.
                             type: string
                           namespace:
+                            default: ""
                             description: namespace of the referent.
                             type: string
                           resource:
diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
index 002ea77f318..c912483efd9 100644
--- a/config/v1/zz_generated.swagger_doc_generated.go
+++ b/config/v1/zz_generated.swagger_doc_generated.go
@@ -759,6 +759,7 @@ var map_ClusterVersionStatus = map[string]string{
 	"conditions":         "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Degraded\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.",
 	"availableUpdates":   "availableUpdates contains updates recommended for this cluster. Updates which appear in conditionalUpdates but not in availableUpdates may expose this cluster to known issues. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.",
 	"conditionalUpdates": "conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified.",
+	"relatedObjects":     "relatedObjects is a list of objects that are \"interesting\" or related to this operator. `oc adm inspect` honors this field in any type to navigate and collect related data. Common uses are: 1. operator namespaces 2. operand namespaces",
 }
 
 func (ClusterVersionStatus) SwaggerDoc() map[string]string {
diff --git a/features.md b/features.md
index ed38c2a045e..ecc8948e126 100644
--- a/features.md
+++ b/features.md
@@ -5,6 +5,7 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
+| CVORelatedObjects| | | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | DualReplica| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
diff --git a/features/features.go b/features/features.go
index 312257394bf..a5ee22eb19c 100644
--- a/features/features.go
+++ b/features/features.go
@@ -37,675 +37,675 @@ var (
 	allFeatureGates = map[ClusterProfileName]map[configv1.FeatureSet]*FeatureGateEnabledDisabled{}
 
 	FeatureGateConsolePluginCSP = newFeatureGate("ConsolePluginContentSecurityPolicy").
-					reportProblemsToJiraComponent("Management Console").
-					contactPerson("jhadvig").
-					productScope(ocpSpecific).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1706").
-					mustRegister()
+		reportProblemsToJiraComponent("Management Console").
+		contactPerson("jhadvig").
+		productScope(ocpSpecific).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1706").
+		mustRegister()
 
 	FeatureGateServiceAccountTokenNodeBinding = newFeatureGate("ServiceAccountTokenNodeBinding").
-							reportProblemsToJiraComponent("apiserver-auth").
-							contactPerson("ibihim").
-							productScope(kubernetes).
-							enhancementPR("https://github.com/kubernetes/enhancements/issues/4193").
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("apiserver-auth").
+		contactPerson("ibihim").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/4193").
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateValidatingAdmissionPolicy = newFeatureGate("ValidatingAdmissionPolicy").
-						reportProblemsToJiraComponent("kube-apiserver").
-						contactPerson("benluddy").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/3488").
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("kube-apiserver").
+		contactPerson("benluddy").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/3488").
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateGatewayAPI = newFeatureGate("GatewayAPI").
-				reportProblemsToJiraComponent("Routing").
-				contactPerson("miciah").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("Routing").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateSetEIPForNLBIngressController = newFeatureGate("SetEIPForNLBIngressController").
-							reportProblemsToJiraComponent("Networking / router").
-							contactPerson("miheer").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("Networking / router").
+		contactPerson("miheer").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
-							reportProblemsToJiraComponent("auth").
-							contactPerson("ibihim").
-							productScope(ocpSpecific).
-							enhancementPR("https://github.com/openshift/enhancements/pull/899").
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("auth").
+		contactPerson("ibihim").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/899").
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateBuildCSIVolumes = newFeatureGate("BuildCSIVolumes").
-					reportProblemsToJiraComponent("builds").
-					contactPerson("adkaplan").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("builds").
+		contactPerson("adkaplan").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNodeSwap = newFeatureGate("NodeSwap").
-				reportProblemsToJiraComponent("node").
-				contactPerson("ehashman").
-				productScope(kubernetes).
-				enhancementPR("https://github.com/kubernetes/enhancements/issues/2400").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("node").
+		contactPerson("ehashman").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/2400").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateInsightsConfigAPI = newFeatureGate("InsightsConfigAPI").
-					reportProblemsToJiraComponent("insights").
-					contactPerson("tremes").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("insights").
+		contactPerson("tremes").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateInsightsRuntimeExtractor = newFeatureGate("InsightsRuntimeExtractor").
-						reportProblemsToJiraComponent("insights").
-						contactPerson("jmesnil").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("insights").
+		contactPerson("jmesnil").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateDynamicResourceAllocation = newFeatureGate("DynamicResourceAllocation").
-						reportProblemsToJiraComponent("scheduling").
-						contactPerson("jchaloup").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/4381").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("scheduling").
+		contactPerson("jchaloup").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/4381").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAzureWorkloadIdentity = newFeatureGate("AzureWorkloadIdentity").
-						reportProblemsToJiraComponent("cloud-credential-operator").
-						contactPerson("abutcher").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("cloud-credential-operator").
+		contactPerson("abutcher").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAzureDedicatedHosts = newFeatureGate("AzureDedicatedHosts").
-						reportProblemsToJiraComponent("installer").
-						contactPerson("rvanderp3").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1783").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("installer").
+		contactPerson("rvanderp3").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1783").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMaxUnavailableStatefulSet = newFeatureGate("MaxUnavailableStatefulSet").
-						reportProblemsToJiraComponent("apps").
-						contactPerson("atiratree").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/961").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("apps").
+		contactPerson("atiratree").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/961").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateEventedPLEG = newFeatureGate("EventedPLEG").
-				reportProblemsToJiraComponent("node").
-				contactPerson("sairameshv").
-				productScope(kubernetes).
-				enhancementPR("https://github.com/kubernetes/enhancements/issues/3386").
-				mustRegister()
+		reportProblemsToJiraComponent("node").
+		contactPerson("sairameshv").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/3386").
+		mustRegister()
 
 	FeatureGatePrivateHostedZoneAWS = newFeatureGate("PrivateHostedZoneAWS").
-					reportProblemsToJiraComponent("Routing").
-					contactPerson("miciah").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Routing").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateSigstoreImageVerification = newFeatureGate("SigstoreImageVerification").
-						reportProblemsToJiraComponent("node").
-						contactPerson("sgrunert").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("node").
+		contactPerson("sgrunert").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateSigstoreImageVerificationPKI = newFeatureGate("SigstoreImageVerificationPKI").
-						reportProblemsToJiraComponent("node").
-						contactPerson("QiWang").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1658").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("node").
+		contactPerson("QiWang").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1658").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateGCPLabelsTags = newFeatureGate("GCPLabelsTags").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("bhb").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("bhb").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAlibabaPlatform = newFeatureGate("AlibabaPlatform").
-					reportProblemsToJiraComponent("cloud-provider").
-					contactPerson("jspeed").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("cloud-provider").
+		contactPerson("jspeed").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateVSphereHostVMGroupZonal = newFeatureGate("VSphereHostVMGroupZonal").
-						reportProblemsToJiraComponent("splat").
-						contactPerson("jcpowermac").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1677").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("splat").
+		contactPerson("jcpowermac").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1677").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateVSphereMultiDisk = newFeatureGate("VSphereMultiDisk").
-					reportProblemsToJiraComponent("splat").
-					contactPerson("vr4manta").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1709").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("splat").
+		contactPerson("vr4manta").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1709").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateRouteExternalCertificate = newFeatureGate("RouteExternalCertificate").
-						reportProblemsToJiraComponent("router").
-						contactPerson("chiragkyal").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("router").
+		contactPerson("chiragkyal").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateCPMSMachineNamePrefix = newFeatureGate("CPMSMachineNamePrefix").
-						reportProblemsToJiraComponent("Cloud Compute / ControlPlaneMachineSet").
-						contactPerson("chiragkyal").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1714").
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Cloud Compute / ControlPlaneMachineSet").
+		contactPerson("chiragkyal").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1714").
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAdminNetworkPolicy = newFeatureGate("AdminNetworkPolicy").
-					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-					contactPerson("tssurya").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+		contactPerson("tssurya").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNetworkSegmentation = newFeatureGate("NetworkSegmentation").
-					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-					contactPerson("tssurya").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1623").
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+		contactPerson("tssurya").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1623").
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAdditionalRoutingCapabilities = newFeatureGate("AdditionalRoutingCapabilities").
-							reportProblemsToJiraComponent("Networking/cluster-network-operator").
-							contactPerson("jcaamano").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("Networking/cluster-network-operator").
+		contactPerson("jcaamano").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateRouteAdvertisements = newFeatureGate("RouteAdvertisements").
-					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-					contactPerson("jcaamano").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+		contactPerson("jcaamano").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNetworkLiveMigration = newFeatureGate("NetworkLiveMigration").
-					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-					contactPerson("pliu").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+		contactPerson("pliu").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNetworkDiagnosticsConfig = newFeatureGate("NetworkDiagnosticsConfig").
-						reportProblemsToJiraComponent("Networking/cluster-network-operator").
-						contactPerson("kyrtapz").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Networking/cluster-network-operator").
+		contactPerson("kyrtapz").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateOVNObservability = newFeatureGate("OVNObservability").
-					reportProblemsToJiraComponent("Networking").
-					contactPerson("npinaeva").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking").
+		contactPerson("npinaeva").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateHardwareSpeed = newFeatureGate("HardwareSpeed").
-					reportProblemsToJiraComponent("etcd").
-					contactPerson("hasbro17").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("etcd").
+		contactPerson("hasbro17").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").
-					reportProblemsToJiraComponent("etcd").
-					contactPerson("hasbro17").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("etcd").
+		contactPerson("hasbro17").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAutomatedEtcdBackup = newFeatureGate("AutomatedEtcdBackup").
-					reportProblemsToJiraComponent("etcd").
-					contactPerson("hasbro17").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("etcd").
+		contactPerson("hasbro17").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMachineAPIOperatorDisableMachineHealthCheckController = newFeatureGate("MachineAPIOperatorDisableMachineHealthCheckController").
-										reportProblemsToJiraComponent("ecoproject").
-										contactPerson("msluiter").
-										productScope(ocpSpecific).
-										enhancementPR(legacyFeatureGateWithoutEnhancement).
-										mustRegister()
+		reportProblemsToJiraComponent("ecoproject").
+		contactPerson("msluiter").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		mustRegister()
 
 	FeatureGateDNSNameResolver = newFeatureGate("DNSNameResolver").
-					reportProblemsToJiraComponent("dns").
-					contactPerson("miciah").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("dns").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMachineConfigNodes = newFeatureGate("MachineConfigNodes").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("cdoern").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("cdoern").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateClusterAPIInstall = newFeatureGate("ClusterAPIInstall").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("vincepri").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("vincepri").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		mustRegister()
 
 	FeatureGateGCPClusterHostedDNS = newFeatureGate("GCPClusterHostedDNS").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("barbacbd").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("barbacbd").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAWSClusterHostedDNS = newFeatureGate("AWSClusterHostedDNS").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("barbacbd").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("barbacbd").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMixedCPUsAllocation = newFeatureGate("MixedCPUsAllocation").
-					reportProblemsToJiraComponent("NodeTuningOperator").
-					contactPerson("titzhak").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("NodeTuningOperator").
+		contactPerson("titzhak").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateManagedBootImages = newFeatureGate("ManagedBootImages").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("djoshy").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("djoshy").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateManagedBootImagesAWS = newFeatureGate("ManagedBootImagesAWS").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("djoshy").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("djoshy").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateManagedBootImagesvSphere = newFeatureGate("ManagedBootImagesvSphere").
-						reportProblemsToJiraComponent("MachineConfigOperator").
-						contactPerson("rsaini").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1496").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("rsaini").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1496").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateOnClusterBuild = newFeatureGate("OnClusterBuild").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("cheesesashimi").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("cheesesashimi").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateBootcNodeManagement = newFeatureGate("BootcNodeManagement").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("inesqyx").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("inesqyx").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateSignatureStores = newFeatureGate("SignatureStores").
-					reportProblemsToJiraComponent("Cluster Version Operator").
-					contactPerson("lmohanty").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Cluster Version Operator").
+		contactPerson("lmohanty").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateKMSv1 = newFeatureGate("KMSv1").
-				reportProblemsToJiraComponent("kube-apiserver").
-				contactPerson("dgrisonnet").
-				productScope(kubernetes).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("kube-apiserver").
+		contactPerson("dgrisonnet").
+		productScope(kubernetes).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGatePinnedImages = newFeatureGate("PinnedImages").
-				reportProblemsToJiraComponent("MachineConfigOperator").
-				contactPerson("jhernand").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("jhernand").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateUpgradeStatus = newFeatureGate("UpgradeStatus").
-					reportProblemsToJiraComponent("Cluster Version Operator").
-					contactPerson("pmuller").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Cluster Version Operator").
+		contactPerson("pmuller").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateTranslateStreamCloseWebsocketRequests = newFeatureGate("TranslateStreamCloseWebsocketRequests").
-								reportProblemsToJiraComponent("kube-apiserver").
-								contactPerson("akashem").
-								productScope(kubernetes).
-								enhancementPR("https://github.com/kubernetes/enhancements/issues/4006").
-								enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								mustRegister()
+		reportProblemsToJiraComponent("kube-apiserver").
+		contactPerson("akashem").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/4006").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateVolumeAttributesClass = newFeatureGate("VolumeAttributesClass").
-						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-						contactPerson("dfajmon").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/3751").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+		contactPerson("dfajmon").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/3751").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateVolumeGroupSnapshot = newFeatureGate("VolumeGroupSnapshot").
-					reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-					contactPerson("fbertina").
-					productScope(kubernetes).
-					enhancementPR("https://github.com/kubernetes/enhancements/issues/3476").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+		contactPerson("fbertina").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/3476").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateExternalOIDC = newFeatureGate("ExternalOIDC").
-				reportProblemsToJiraComponent("authentication").
-				contactPerson("liouk").
-				productScope(ocpSpecific).
-				enhancementPR("https://github.com/openshift/enhancements/pull/1596").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				enableForClusterProfile(Hypershift, configv1.Default, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("authentication").
+		contactPerson("liouk").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1596").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		enableForClusterProfile(Hypershift, configv1.Default, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateExternalOIDCWithAdditionalClaimMappings = newFeatureGate("ExternalOIDCWithUIDAndExtraClaimMappings").
-								reportProblemsToJiraComponent("authentication").
-								contactPerson("bpalmer").
-								productScope(ocpSpecific).
-								enhancementPR("https://github.com/openshift/enhancements/pull/1777").
-								enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								mustRegister()
+		reportProblemsToJiraComponent("authentication").
+		contactPerson("bpalmer").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1777").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateExample = newFeatureGate("Example").
-				reportProblemsToJiraComponent("cluster-config").
-				contactPerson("deads").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("cluster-config").
+		contactPerson("deads").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateExample2 = newFeatureGate("Example2").
-				reportProblemsToJiraComponent("cluster-config").
-				contactPerson("JoelSpeed").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.DevPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("cluster-config").
+		contactPerson("JoelSpeed").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNewOLM = newFeatureGate("NewOLM").
-				reportProblemsToJiraComponent("olm").
-				contactPerson("joe").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
-				mustRegister()
+		reportProblemsToJiraComponent("olm").
+		contactPerson("joe").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
+		mustRegister()
 
 	FeatureGateNewOLMCatalogdAPIV1Metas = newFeatureGate("NewOLMCatalogdAPIV1Metas").
-						reportProblemsToJiraComponent("olm").
-						contactPerson("jordank").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1749").
-						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("olm").
+		contactPerson("jordank").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1749").
+		enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNewOLMPreflightPermissionChecks = newFeatureGate("NewOLMPreflightPermissionChecks").
-							reportProblemsToJiraComponent("olm").
-							contactPerson("tshort").
-							productScope(ocpSpecific).
-							enhancementPR("https://github.com/openshift/enhancements/pull/1768").
-							enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("olm").
+		contactPerson("tshort").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1768").
+		enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNewOLMOwnSingleNamespace = newFeatureGate("NewOLMOwnSingleNamespace").
-						reportProblemsToJiraComponent("olm").
-						contactPerson("nschieder").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1774").
-						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("olm").
+		contactPerson("nschieder").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1774").
+		enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNewOLMWebhookProviderOpenshiftServiceCA = newFeatureGate("NewOLMWebhookProviderOpenshiftServiceCA").
-								reportProblemsToJiraComponent("olm").
-								contactPerson("pegoncal").
-								productScope(ocpSpecific).
-								enhancementPR("https://github.com/openshift/enhancements/pull/1799").
-								enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								mustRegister()
+		reportProblemsToJiraComponent("olm").
+		contactPerson("pegoncal").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1799").
+		enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather").
-						reportProblemsToJiraComponent("insights").
-						contactPerson("tremes").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("insights").
+		contactPerson("tremes").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateInsightsConfig = newFeatureGate("InsightsConfig").
-					reportProblemsToJiraComponent("insights").
-					contactPerson("tremes").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("insights").
+		contactPerson("tremes").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateNodeDisruptionPolicy = newFeatureGate("NodeDisruptionPolicy").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("jerzhang").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("MachineConfigOperator").
+		contactPerson("jerzhang").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMetricsCollectionProfiles = newFeatureGate("MetricsCollectionProfiles").
-						reportProblemsToJiraComponent("Monitoring").
-						contactPerson("rexagod").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Monitoring").
+		contactPerson("rexagod").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateClusterAPIInstallIBMCloud = newFeatureGate("ClusterAPIInstallIBMCloud").
-						reportProblemsToJiraComponent("Installer").
-						contactPerson("cjschaef").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("cjschaef").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateChunkSizeMiB = newFeatureGate("ChunkSizeMiB").
-				reportProblemsToJiraComponent("Image Registry").
-				contactPerson("flavianmissi").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("Image Registry").
+		contactPerson("flavianmissi").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMachineAPIMigration = newFeatureGate("MachineAPIMigration").
-					reportProblemsToJiraComponent("OCPCLOUD").
-					contactPerson("jspeed").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("OCPCLOUD").
+		contactPerson("jspeed").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGatePersistentIPsForVirtualization = newFeatureGate("PersistentIPsForVirtualization").
-							reportProblemsToJiraComponent("CNV Network").
-							contactPerson("mduarted").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("CNV Network").
+		contactPerson("mduarted").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateClusterMonitoringConfig = newFeatureGate("ClusterMonitoringConfig").
-						reportProblemsToJiraComponent("Monitoring").
-						contactPerson("marioferh").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Monitoring").
+		contactPerson("marioferh").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMultiArchInstallAzure = newFeatureGate("MultiArchInstallAzure").
-						reportProblemsToJiraComponent("Installer").
-						contactPerson("r4f4").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("r4f4").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		mustRegister()
 
 	FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS").
-							reportProblemsToJiraComponent("Routing").
-							contactPerson("miciah").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("Routing").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAWSEFSDriverVolumeMetrics = newFeatureGate("AWSEFSDriverVolumeMetrics").
-						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-						contactPerson("fbertina").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+		contactPerson("fbertina").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
-						reportProblemsToJiraComponent("Multi-Arch").
-						contactPerson("psundara").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Multi-Arch").
+		contactPerson("psundara").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateUserNamespacesSupport = newFeatureGate("UserNamespacesSupport").
-						reportProblemsToJiraComponent("Node").
-						contactPerson("haircommander").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
-						mustRegister()
+		reportProblemsToJiraComponent("Node").
+		contactPerson("haircommander").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
+		mustRegister()
 
 	// Note: this feature is perma-alpha, but it is safe and desireable to enable.
 	// It was an oversight in upstream to not remove the feature gate after the version skew became safe in 1.33.
 	// See https://github.com/kubernetes/enhancements/tree/d4226c42/keps/sig-node/127-user-namespaces#pod-security-standards-pss-integration
 	FeatureGateUserNamespacesPodSecurityStandards = newFeatureGate("UserNamespacesPodSecurityStandards").
-							reportProblemsToJiraComponent("Node").
-							contactPerson("haircommander").
-							productScope(kubernetes).
-							enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
-							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
-							mustRegister()
+		reportProblemsToJiraComponent("Node").
+		contactPerson("haircommander").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
+		mustRegister()
 
 	FeatureGateProcMountType = newFeatureGate("ProcMountType").
-					reportProblemsToJiraComponent("Node").
-					contactPerson("haircommander").
-					productScope(kubernetes).
-					enhancementPR("https://github.com/kubernetes/enhancements/issues/4265").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
-					mustRegister()
+		reportProblemsToJiraComponent("Node").
+		contactPerson("haircommander").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/4265").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
+		mustRegister()
 
 	FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
-					reportProblemsToJiraComponent("SPLAT").
-					contactPerson("rvanderp").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("SPLAT").
+		contactPerson("rvanderp").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateIngressControllerDynamicConfigurationManager = newFeatureGate("IngressControllerDynamicConfigurationManager").
-								reportProblemsToJiraComponent("Networking/router").
-								contactPerson("miciah").
-								productScope(ocpSpecific).
-								enhancementPR(legacyFeatureGateWithoutEnhancement).
-								enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								mustRegister()
+		reportProblemsToJiraComponent("Networking/router").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
+		enhancementPR(legacyFeatureGateWithoutEnhancement).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateMinimumKubeletVersion = newFeatureGate("MinimumKubeletVersion").
-						reportProblemsToJiraComponent("Node").
-						contactPerson("haircommander").
-						productScope(ocpSpecific).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1697").
-						mustRegister()
+		reportProblemsToJiraComponent("Node").
+		contactPerson("haircommander").
+		productScope(ocpSpecific).
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1697").
+		mustRegister()
 
 	FeatureGateNutanixMultiSubnets = newFeatureGate("NutanixMultiSubnets").
-					reportProblemsToJiraComponent("Cloud Compute / Nutanix Provider").
-					contactPerson("yanhli").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1711").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Cloud Compute / Nutanix Provider").
+		contactPerson("yanhli").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1711").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateKMSEncryptionProvider = newFeatureGate("KMSEncryptionProvider").
-						reportProblemsToJiraComponent("kube-apiserver").
-						contactPerson("swghosh").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1682").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("kube-apiserver").
+		contactPerson("swghosh").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1682").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateHighlyAvailableArbiter = newFeatureGate("HighlyAvailableArbiter").
-						reportProblemsToJiraComponent("Two Node with Arbiter").
-						contactPerson("eggfoobar").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1674").
+		reportProblemsToJiraComponent("Two Node with Arbiter").
+		contactPerson("eggfoobar").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1674").
 		// TODO: Do not go GA until jira issue is resolved: https://issues.redhat.com/browse/OCPEDGE-1637
 		// Annotations must correctly handle either DualReplica or HighlyAvailableArbiter going GA with
 		// the other still in TechPreview.
@@ -713,42 +713,42 @@ var (
 		mustRegister()
 
 	FeatureGateCVOConfiguration = newFeatureGate("ClusterVersionOperatorConfiguration").
-					reportProblemsToJiraComponent("Cluster Version Operator").
-					contactPerson("dhurta").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1492").
-					enableIn(configv1.DevPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Cluster Version Operator").
+		contactPerson("dhurta").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1492").
+		enableIn(configv1.DevPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateGCPCustomAPIEndpoints = newFeatureGate("GCPCustomAPIEndpoints").
-						reportProblemsToJiraComponent("Installer").
-						contactPerson("barbacbd").
-						productScope(ocpSpecific).
-						enhancementPR("https://github.com/openshift/enhancements/pull/1492").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("barbacbd").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1492").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateDyanmicServiceEndpointIBMCloud = newFeatureGate("DyanmicServiceEndpointIBMCloud").
-							reportProblemsToJiraComponent("Cloud Compute / IBM Provider").
-							contactPerson("jared-hayes-dev").
-							productScope(ocpSpecific).
-							enhancementPR("https://github.com/openshift/enhancements/pull/1712").
-							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
+		reportProblemsToJiraComponent("Cloud Compute / IBM Provider").
+		contactPerson("jared-hayes-dev").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1712").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateSELinuxMount = newFeatureGate("SELinuxMount").
-				reportProblemsToJiraComponent("Storage / Kubernetes").
-				contactPerson("jsafrane").
-				productScope(kubernetes).
-				enhancementPR("https://github.com/kubernetes/enhancements/issues/1710").
-				enableIn(configv1.DevPreviewNoUpgrade).
-				mustRegister()
+		reportProblemsToJiraComponent("Storage / Kubernetes").
+		contactPerson("jsafrane").
+		productScope(kubernetes).
+		enhancementPR("https://github.com/kubernetes/enhancements/issues/1710").
+		enableIn(configv1.DevPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateDualReplica = newFeatureGate("DualReplica").
-				reportProblemsToJiraComponent("Two Node Fencing").
-				contactPerson("jaypoulz").
-				productScope(ocpSpecific).
-				enhancementPR("https://github.com/openshift/enhancements/pull/1675").
+		reportProblemsToJiraComponent("Two Node Fencing").
+		contactPerson("jaypoulz").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1675").
 		// TODO: Do not go GA until jira issue is resolved: https://issues.redhat.com/browse/OCPEDGE-1637
 		// Annotations must correctly handle either DualReplica or HighlyAvailableArbiter going GA with
 		// the other still in TechPreview.
@@ -756,9 +756,9 @@ var (
 		mustRegister()
 
 	FeatureGateGatewayAPIController = newFeatureGate("GatewayAPIController").
-					reportProblemsToJiraComponent("Routing").
-					contactPerson("miciah").
-					productScope(ocpSpecific).
+		reportProblemsToJiraComponent("Routing").
+		contactPerson("miciah").
+		productScope(ocpSpecific).
 		// Previously, the "GatewayAPI" feature gate managed both the GatewayAPI CRDs
 		// and the Gateway Controller. However, with the introduction of Gateway CRD
 		// lifecycle management (EP#1756), these responsibilities were separated.
@@ -769,49 +769,57 @@ var (
 		mustRegister()
 
 	FeatureShortCertRotation = newFeatureGate("ShortCertRotation").
-					reportProblemsToJiraComponent("kube-apiserver").
-					contactPerson("vrutkovs").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1670").
-					mustRegister()
+		reportProblemsToJiraComponent("kube-apiserver").
+		contactPerson("vrutkovs").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1670").
+		mustRegister()
 
 	FeatureGateVSphereConfigurableMaxAllowedBlockVolumesPerNode = newFeatureGate("VSphereConfigurableMaxAllowedBlockVolumesPerNode").
-									reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-									contactPerson("rbednar").
-									productScope(ocpSpecific).
-									enhancementPR("https://github.com/openshift/enhancements/pull/1748").
-									enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-									mustRegister()
+		reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+		contactPerson("rbednar").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1748").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAzureMultiDisk = newFeatureGate("AzureMultiDisk").
-					reportProblemsToJiraComponent("splat").
-					contactPerson("jcpowermac").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1779").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("splat").
+		contactPerson("jcpowermac").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1779").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateAWSDedicatedHosts = newFeatureGate("AWSDedicatedHosts").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("faermanj").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1781").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Installer").
+		contactPerson("faermanj").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1781").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGateVSphereMixedNodeEnv = newFeatureGate("VSphereMixedNodeEnv").
-					reportProblemsToJiraComponent("splat").
-					contactPerson("vr4manta").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1772").
-					enableIn(configv1.DevPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("splat").
+		contactPerson("vr4manta").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1772").
+		enableIn(configv1.DevPreviewNoUpgrade).
+		mustRegister()
 
 	FeatureGatePreconfiguredUDNAddresses = newFeatureGate("PreconfiguredUDNAddresses").
-					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-					contactPerson("kyrtapz").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1793").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+		reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+		contactPerson("kyrtapz").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/1793").
+		enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+		mustRegister()
+
+	FeatureGateCVORelatedObjects = newFeatureGate("CVORelatedObjects").
+		reportProblemsToJiraComponent("Cluster Version Operator").
+		contactPerson("wking").
+		productScope(ocpSpecific).
+		enhancementPR("https://github.com/openshift/enhancements/pull/40").
+		enableIn(configv1.TechPreviewNoUpgrade).
+		mustRegister()
 )
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
index 80b0a06ff0c..ec9b1842436 100644
--- a/openapi/generated_openapi/zz_generated.openapi.go
+++ b/openapi/generated_openapi/zz_generated.openapi.go
@@ -10918,12 +10918,37 @@ func schema_openshift_api_config_v1_ClusterVersionStatus(ref common.ReferenceCal
 							},
 						},
 					},
+					"relatedObjects": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-map-keys": []interface{}{
+									"group",
+									"resource",
+									"namespace",
+									"name",
+								},
+								"x-kubernetes-list-type": "map",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "relatedObjects is a list of objects that are \"interesting\" or related to this operator. `oc adm inspect` honors this field in any type to navigate and collect related data. Common uses are: 1. operator namespaces 2. operand namespaces",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/openshift/api/config/v1.ObjectReference"),
+									},
+								},
+							},
+						},
+					},
 				},
 				Required: []string{"desired", "observedGeneration", "versionHash", "capabilities", "availableUpdates"},
 			},
 		},
 		Dependencies: []string{
-			"github.com/openshift/api/config/v1.ClusterOperatorStatusCondition", "github.com/openshift/api/config/v1.ClusterVersionCapabilitiesStatus", "github.com/openshift/api/config/v1.ConditionalUpdate", "github.com/openshift/api/config/v1.Release", "github.com/openshift/api/config/v1.UpdateHistory"},
+			"github.com/openshift/api/config/v1.ClusterOperatorStatusCondition", "github.com/openshift/api/config/v1.ClusterVersionCapabilitiesStatus", "github.com/openshift/api/config/v1.ConditionalUpdate", "github.com/openshift/api/config/v1.ObjectReference", "github.com/openshift/api/config/v1.Release", "github.com/openshift/api/config/v1.UpdateHistory"},
 	}
 }
 
diff --git a/openapi/openapi.json b/openapi/openapi.json
index 5a06896d85f..6a14b1e3323 100644
--- a/openapi/openapi.json
+++ b/openapi/openapi.json
@@ -5516,6 +5516,21 @@
           "format": "int64",
           "default": 0
         },
+        "relatedObjects": {
+          "description": "relatedObjects is a list of objects that are \"interesting\" or related to this operator. `oc adm inspect` honors this field in any type to navigate and collect related data. Common uses are: 1. operator namespaces 2. operand namespaces",
+          "type": "array",
+          "items": {
+            "default": {},
+            "$ref": "#/definitions/com.github.openshift.api.config.v1.ObjectReference"
+          },
+          "x-kubernetes-list-map-keys": [
+            "group",
+            "resource",
+            "namespace",
+            "name"
+          ],
+          "x-kubernetes-list-type": "map"
+        },
         "versionHash": {
           "description": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.",
           "type": "string",
diff --git a/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml
index 34f2c0a8233..4f4c3219ae0 100644
--- a/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml
+++ b/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml
@@ -488,6 +488,7 @@ spec:
                             description: name of the referent.
                             type: string
                           namespace:
+                            default: ""
                             description: namespace of the referent.
                             type: string
                           resource:
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 39508d952b5..0dfd4938189 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -31,6 +31,9 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 575eb663c25..a93f7df30a8 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -15,6 +15,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 405faf246a9..d00e7be426a 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -101,6 +101,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index cdef57cc23b..0acc7a07753 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -31,6 +31,9 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 40c45f7016e..ba12a6923af 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -15,6 +15,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index d81b50add63..a648f7c277d 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -86,6 +86,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "CVORelatedObjects"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },