diff --git a/features.md b/features.md
index f5231897023..3ed3e8ba3d6 100644
--- a/features.md
+++ b/features.md
@@ -73,6 +73,7 @@
 | OSStreams| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OVNObservability| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OnPremDNSRecords| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| PodAndContainerStatsFromCRI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SignatureStores| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <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 711f0e3eae8..7152799cf37 100644
--- a/features/features.go
+++ b/features/features.go
@@ -930,4 +930,12 @@ var (
 						enhancementPR("https://github.com/openshift/enhancements/pull/1465").
 						enableIn(configv1.DevPreviewNoUpgrade).
 						mustRegister()
+
+	FeatureGatePodAndContainerStatsFromCRI = newFeatureGate("PodAndContainerStatsFromCRI").
+						reportProblemsToJiraComponent("node").
+						contactPerson("dgrisonnet").
+						productScope(kubernetes).
+						enhancementPR("https://github.com/kubernetes/enhancements/issues/2371").
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 6e7f38a3952..eee793dc0ce 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -222,6 +222,9 @@
                     {
                         "name": "OnPremDNSRecords"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index f2d42970b3c..2785e899f3d 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -298,6 +298,9 @@
                     {
                         "name": "PinnedImages"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
index f04e1374f45..0f66b420208 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -224,6 +224,9 @@
                     {
                         "name": "OnPremDNSRecords"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 80149f830a0..e8c37a91271 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -301,6 +301,9 @@
                     {
                         "name": "PinnedImages"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "RouteExternalCertificate"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 72ba161bd2d..33ab30baffe 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -216,6 +216,9 @@
                     {
                         "name": "OnPremDNSRecords"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index b5713ccc677..d2b02599efe 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -298,6 +298,9 @@
                     {
                         "name": "PinnedImages"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
index 6b1778c2fe7..be7879a3915 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -218,6 +218,9 @@
                     {
                         "name": "OnPremDNSRecords"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index dcf280fee1d..9abc6e9e1d0 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -301,6 +301,9 @@
                     {
                         "name": "PinnedImages"
                     },
+                    {
+                        "name": "PodAndContainerStatsFromCRI"
+                    },
                     {
                         "name": "RouteExternalCertificate"
                     },