diff --git a/features.md b/features.md
index 14dc4288326..b024bbf42a0 100644
--- a/features.md
+++ b/features.md
@@ -78,7 +78,6 @@
 | ImageModeStatusReporting| | | <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>  |
 | IngressComponentRouteLabels| | | <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>  |
 | IngressControllerLBSecurityGroupsAWS| | | <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>  |
-| MACSecurity| | | <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>  |
 | MachineAPIMigration| | | <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>  |
 | MachineAPIMigrationAWS| | | <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>  |
 | MachineAPIMigrationNutanix| | | <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>  |
@@ -125,6 +124,7 @@
 | IrreconcilableMachineConfig| <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> | <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>  |
 | KMSEncryption| <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> | <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>  |
 | KMSv1| <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> | <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>  |
+| MACSecurity| <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> | <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>  |
 | ManagedBootImagesCPMS| <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> | <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>  |
 | MetricsCollectionProfiles| <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> | <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>  |
 | MutableCSINodeAllocatableCount| <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> | <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 b62a4b0d249..3ff776f27a3 100644
--- a/features/features.go
+++ b/features/features.go
@@ -199,7 +199,7 @@ var (
 				contactPerson("jcaamano").
 				productScope(ocpSpecific).
 				enhancementPR("https://github.com/ovn-kubernetes/ovn-kubernetes/pull/6528").
-				enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+				enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 				mustRegister()
 
 	FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index 250fbc1a2ab..5e115fbe87a 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -185,9 +185,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -391,6 +388,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index 94dcae45003..517abded9e3 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -187,9 +187,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -393,6 +390,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
index 65aeea7f1e1..318bedfa809 100644
--- a/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
@@ -182,9 +182,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -382,6 +379,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml
index 91aade13f7e..f8ffd984fd9 100644
--- a/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -384,6 +381,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml
index 5054075d350..676edbe9135 100644
--- a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml
@@ -182,9 +182,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -379,6 +376,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml
index 0dfce799d9d..6b1c676a82c 100644
--- a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "KarpenterOperator"
                     },
-                    {
-                        "name": "MACSecurity"
-                    },
                     {
                         "name": "MachineAPIMigration"
                     },
@@ -381,6 +378,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "MACSecurity"
+                    },
                     {
                         "name": "ManagedBootImagesCPMS"
                     },