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 a0102004c82..fd815737da9 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -49,6 +49,7 @@ Some features are enabled by default. You can disable these feature by setting t
 | `recordedQueriesMulti`               | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
 | `transformationsRedesign`            | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
 | `grafanaAPIServer`                   | Enable Kubernetes API Server for Grafana resources                                                                                                                                                                           | Yes                |
+| `awsAsyncQueryCaching`               | Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled                                     | Yes                |
 | `splitScopes`                        | Support faster dashboard and folder search by splitting permission scopes into parts                                                                                                                                         | Yes                |
 | `prometheusConfigOverhaulAuth`       | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
 | `influxdbSqlSupport`                 | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                              | Yes                |
@@ -76,7 +77,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | `faroDatasourceSelector`               | Enable the data source selector within the Frontend Apps section of the Frontend Observability                                                                                               |
 | `enableDatagridEditing`                | Enables the edit functionality in the datagrid panel                                                                                                                                         |
 | `sqlDatasourceDatabaseSelection`       | Enables previous SQL data source dataset dropdown behavior                                                                                                                                   |
-| `awsAsyncQueryCaching`                 | Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled     |
 | `dashgpt`                              | Enable AI powered features in dashboards                                                                                                                                                     |
 | `reportingRetries`                     | Enables rendering retries for the reporting feature                                                                                                                                          |
 | `formatString`                         | Enable format string transformer                                                                                                                                                             |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 52c6aed50e5..7af80e6bf97 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -754,7 +754,8 @@ var (
 		{
 			Name:        "awsAsyncQueryCaching",
 			Description: "Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled",
-			Stage:       FeatureStagePublicPreview,
+			Stage:       FeatureStageGeneralAvailability,
+			Expression:  "true", // enabled by default
 			Owner:       awsDatasourcesSquad,
 			Created:     time.Date(2023, time.July, 21, 12, 0, 0, 0, time.UTC),
 		},
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index bbb4baacc49..42cf19f6ab1 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -87,7 +87,7 @@ grafanaAPIServer,GA,@grafana/grafana-app-platform-squad,2023-07-14,false,false,t
 grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-squad,2023-10-06,true,false,true,false
 grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,2023-12-06,true,false,true,false
 featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,2023-07-18,false,false,true,false
-awsAsyncQueryCaching,preview,@grafana/aws-datasources,2023-07-21,false,false,false,false
+awsAsyncQueryCaching,GA,@grafana/aws-datasources,2023-07-21,false,false,false,false
 splitScopes,GA,@grafana/identity-access-team,2023-07-21,false,false,true,false
 traceToProfiles,experimental,@grafana/observability-traces-and-profiling,2023-11-01,false,false,false,true
 tracesEmbeddedFlameGraph,experimental,@grafana/observability-traces-and-profiling,2023-11-02,false,false,false,true