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 1607452506d..e74905e110b 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -54,6 +54,7 @@ For more information about feature release stages, refer to [Release life cycle
 | `kubernetesPlaylists`                | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s                                                                                                                                | Yes                |
 | `recoveryThreshold`                  | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                                                                                                                                     | Yes                |
 | `lokiStructuredMetadata`             | Enables the loki data source to request structured metadata from the Loki server                                                                                                                                             | Yes                |
+| `awsDatasourcesNewFormStyling`       | Applies new form styling for configuration and query editors in AWS plugins                                                                                                                                                  | Yes                |
 | `managedPluginsInstall`              | Install managed plugins directly from plugins catalog                                                                                                                                                                        | Yes                |
 | `annotationPermissionUpdate`         | Change the way annotation permissions work by scoping them to folders and dashboards.                                                                                                                                        | Yes                |
 | `ssoSettingsApi`                     | Enables the SSO settings API and the OAuth configuration UIs in Grafana                                                                                                                                                      | Yes                |
@@ -94,7 +95,6 @@ For more information about feature release stages, refer to [Release life cycle
 | `transformationsVariableSupport`       | Allows using variables in transformations                                                                                                                                                    |
 | `cloudWatchBatchQueries`               | Runs CloudWatch metrics queries as separate batches                                                                                                                                          |
 | `teamHttpHeaders`                      | Enables Team LBAC for datasources to apply team headers to the client requests                                                                                                               |
-| `awsDatasourcesNewFormStyling`         | Applies new form styling for configuration and query editors in AWS plugins                                                                                                                  |
 | `addFieldFromCalculationStatFunctions` | Add cumulative and window functions to the add field from calculation transformation                                                                                                         |
 | `pdfTables`                            | Enables generating table data as PDF in reporting                                                                                                                                            |
 | `canvasPanelPanZoom`                   | Allow pan and zoom in canvas panel                                                                                                                                                           |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 2da8f76522f..9b4ec6eac77 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -829,7 +829,8 @@ var (
 		{
 			Name:         "awsDatasourcesNewFormStyling",
 			Description:  "Applies new form styling for configuration and query editors in AWS plugins",
-			Stage:        FeatureStagePublicPreview,
+			Stage:        FeatureStageGeneralAvailability,
+			Expression:   "true",
 			FrontendOnly: true,
 			Owner:        awsDatasourcesSquad,
 		},
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 83f9ab5a28c..d56184b50cd 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -110,7 +110,7 @@ cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false
 recoveryThreshold,GA,@grafana/alerting-squad,false,true,false
 lokiStructuredMetadata,GA,@grafana/observability-logs,false,false,false
 teamHttpHeaders,preview,@grafana/identity-access-team,false,false,false
-awsDatasourcesNewFormStyling,preview,@grafana/aws-datasources,false,false,true
+awsDatasourcesNewFormStyling,GA,@grafana/aws-datasources,false,false,true
 cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false
 panelTitleSearchInV1,experimental,@grafana/search-and-storage,true,false,false
 managedPluginsInstall,GA,@grafana/plugins-platform-backend,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index e6ec5319015..02fc2a385d2 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -135,12 +135,15 @@
     {
       "metadata": {
         "name": "awsDatasourcesNewFormStyling",
-        "resourceVersion": "1713545444177",
-        "creationTimestamp": "2024-04-19T16:50:44Z"
+        "resourceVersion": "1715590364201",
+        "creationTimestamp": "2024-04-19T16:50:44Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2024-05-13 08:52:44.201182 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Applies new form styling for configuration and query editors in AWS plugins",
-        "stage": "preview",
+        "stage": "GA",
         "codeowner": "@grafana/aws-datasources",
         "frontend": true
       }