diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
index 07afd398..6e0afebc 100644
--- a/controllers/gitrepository_controller.go
+++ b/controllers/gitrepository_controller.go
@@ -141,12 +141,7 @@ func (r *GitRepositoryReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, o
 	r.requeueDependency = opts.DependencyRequeueInterval
 
 	if r.features == nil {
-		r.features = map[string]bool{}
-	}
-
-	// Check and enable gated features.
-	if oc, _ := features.Enabled(features.OptimizedGitClones); oc {
-		r.features[features.OptimizedGitClones] = true
+		r.features = features.FeatureGates()
 	}
 
 	return ctrl.NewControllerManagedBy(mgr).
diff --git a/controllers/gitrepository_controller_test.go b/controllers/gitrepository_controller_test.go
index c25b6f6d..5cb0eed7 100644
--- a/controllers/gitrepository_controller_test.go
+++ b/controllers/gitrepository_controller_test.go
@@ -727,10 +727,12 @@ func TestGitRepositoryReconciler_reconcileSource_checkoutStrategy(t *testing.T)
 	}
 
 	r := &GitRepositoryReconciler{
-		Client:                      fakeclient.NewClientBuilder().WithScheme(runtime.NewScheme()).Build(),
-		EventRecorder:               record.NewFakeRecorder(32),
-		Storage:                     testStorage,
-		features:                    features.FeatureGates(),
+		Client:        fakeclient.NewClientBuilder().WithScheme(runtime.NewScheme()).Build(),
+		EventRecorder: record.NewFakeRecorder(32),
+		Storage:       testStorage,
+		features: map[string]bool{
+			features.OptimizedGitClones: true,
+		},
 		Libgit2TransportInitialized: transport.Enabled,
 	}