diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 31070c6febe..12d33557fa0 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -38,6 +38,7 @@ Some features are enabled by default. You can disable these feature by setting t
 | `lokiQuerySplitting`                 | Split large interval queries into subqueries with smaller time intervals                                                                                                                                                     | Yes                |
 | `prometheusMetricEncyclopedia`       | Adds the metrics explorer component to the Prometheus query builder as an option in metric select                                                                                                                            | Yes                |
 | `influxdbBackendMigration`           | Query InfluxDB InfluxQL without the proxy                                                                                                                                                                                    | Yes                |
+| `clientTokenRotation`                | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                                                     | Yes                |
 | `prometheusDataplane`                | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. | Yes                |
 | `lokiMetricDataplane`                | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                                         | Yes                |
 | `dataplaneFrontendFallback`          | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                                         | Yes                |
@@ -102,7 +103,6 @@ Experimental features might be changed or removed without prior notice.
 | `editPanelCSVDragAndDrop`                   | Enables drag and drop for CSV and Excel files                                                                                                                                                                                                                                     |
 | `lokiQuerySplittingConfig`                  | Give users the option to configure split durations for Loki queries                                                                                                                                                                                                               |
 | `individualCookiePreferences`               | Support overriding cookie preferences per user                                                                                                                                                                                                                                    |
-| `clientTokenRotation`                       | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                                                                                                          |
 | `lokiLogsDataplane`                         | Changes logs responses from Loki to be compliant with the dataplane specification.                                                                                                                                                                                                |
 | `disableSSEDataplane`                       | Disables dataplane specific processing in server side expressions.                                                                                                                                                                                                                |
 | `alertStateHistoryLokiSecondary`            | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                                                                                                      |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 131400d811a..7b53db06e66 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -359,10 +359,12 @@ var (
 			AllowSelfServe: falsePtr,
 		},
 		{
-			Name:        "clientTokenRotation",
-			Description: "Replaces the current in-request token rotation so that the client initiates the rotation",
-			Stage:       FeatureStageExperimental,
-			Owner:       identityAccessTeam,
+			Name:           "clientTokenRotation",
+			Description:    "Replaces the current in-request token rotation so that the client initiates the rotation",
+			Stage:          FeatureStageGeneralAvailability,
+			Expression:     "true",
+			Owner:          identityAccessTeam,
+			AllowSelfServe: falsePtr,
 		},
 		{
 			Name:           "prometheusDataplane",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index d478efa2317..b1cbe037f8d 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -46,7 +46,7 @@ lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,fa
 individualCookiePreferences,experimental,@grafana/backend-platform,false,false,false,false
 prometheusMetricEncyclopedia,GA,@grafana/observability-metrics,false,false,false,true
 influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,false,true
-clientTokenRotation,experimental,@grafana/identity-access-team,false,false,false,false
+clientTokenRotation,GA,@grafana/identity-access-team,false,false,false,false
 prometheusDataplane,GA,@grafana/observability-metrics,false,false,false,false
 lokiMetricDataplane,GA,@grafana/observability-logs,false,false,false,false
 lokiLogsDataplane,experimental,@grafana/observability-logs,false,false,false,false