diff --git a/features/features.go b/features/features.go
index 7f496239543..ee28a1acb90 100644
--- a/features/features.go
+++ b/features/features.go
@@ -85,9 +85,11 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
+	// OpenShift and Node Team will keep this turned off until evictions and
+	// disk provisioning are fixed even though upstream will take this GA.
 	FeatureGateNodeSwap = newFeatureGate("NodeSwap").
 				reportProblemsToJiraComponent("node").
-				contactPerson("ehashman").
+				contactPerson("harche").
 				productScope(kubernetes).
 				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()