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 c7f0104bca9..f31e3256483 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -27,6 +27,8 @@ Some features are enabled by default. You can disable these feature by setting t
 | `dataConnectionsConsole`                         | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                        | Yes                |
 | `topnav`                                         | Enables new top navigation and page layouts                                                                                                                                                         | Yes                |
 | `cloudWatchCrossAccountQuerying`                 | Enables cross-account querying in CloudWatch datasources                                                                                                                                            | Yes                |
+| `redshiftAsyncQueryDataSupport`                  | Enable async query data support for Redshift                                                                                                                                                        | Yes                |
+| `athenaAsyncQueryDataSupport`                    | Enable async query data support for Athena                                                                                                                                                          | Yes                |
 | `newPanelChromeUI`                               | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu                                                                                                                 | Yes                |
 | `accessTokenExpirationCheck`                     | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                                                |                    |
 | `emptyDashboardPage`                             | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                                                    | Yes                |
@@ -86,8 +88,6 @@ Experimental features might be changed or removed without prior notice.
 | `scenes`                                 | Experimental framework to build interactive dashboards                                                       |
 | `disableSecretsCompatibility`            | Disable duplicated secret storage in legacy tables                                                           |
 | `logRequestsInstrumentedAsUnknown`       | Logs the path for requests that are instrumented as unknown                                                  |
-| `redshiftAsyncQueryDataSupport`          | Enable async query data support for Redshift                                                                 |
-| `athenaAsyncQueryDataSupport`            | Enable async query data support for Athena                                                                   |
 | `showDashboardValidationWarnings`        | Show warnings when dashboards do not validate against the schema                                             |
 | `mysqlAnsiQuotes`                        | Use double quotes to escape keyword in a MySQL query                                                         |
 | `nestedFolderPicker`                     | Enables the still in-development new folder picker to support nested folders                                 |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 781bcaef961..420d3127bcb 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -214,16 +214,17 @@ var (
 			Owner:       awsPluginsSquad,
 		},
 		{
-			Name:         "redshiftAsyncQueryDataSupport",
-			Description:  "Enable async query data support for Redshift",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: true,
-			Owner:        awsPluginsSquad,
+			Name:        "redshiftAsyncQueryDataSupport",
+			Description: "Enable async query data support for Redshift",
+			Stage:       FeatureStageGeneralAvailability,
+			Expression:  "true", // enabled by default
+			Owner:       awsPluginsSquad,
 		},
 		{
 			Name:         "athenaAsyncQueryDataSupport",
 			Description:  "Enable async query data support for Athena",
-			Stage:        FeatureStageExperimental,
+			Stage:        FeatureStageGeneralAvailability,
+			Expression:   "true", // enabled by default
 			FrontendOnly: true,
 			Owner:        awsPluginsSquad,
 		},
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index b3701a02b77..b24652f8944 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -30,8 +30,8 @@ topnav,GA,@grafana/grafana-frontend-platform,false,false,false,false
 grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false,false
 entityStore,experimental,@grafana/grafana-app-platform-squad,true,false,false,false
 cloudWatchCrossAccountQuerying,GA,@grafana/aws-plugins,false,false,false,false
-redshiftAsyncQueryDataSupport,experimental,@grafana/aws-plugins,false,false,false,true
-athenaAsyncQueryDataSupport,experimental,@grafana/aws-plugins,false,false,false,true
+redshiftAsyncQueryDataSupport,GA,@grafana/aws-plugins,false,false,false,false
+athenaAsyncQueryDataSupport,GA,@grafana/aws-plugins,false,false,false,true
 newPanelChromeUI,GA,@grafana/dashboards-squad,false,false,false,true
 showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false,false
 mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false,false