diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 6283847aa1a..83738ec5cf1 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -211,7 +211,7 @@ export interface FeatureToggles {
   exploreLogsAggregatedMetrics?: boolean;
   exploreLogsLimitedTimeRange?: boolean;
   homeSetupGuide?: boolean;
-  appPlatformAccessTokens?: boolean;
+  appPlatformGrpcClientAuth?: boolean;
   appSidecar?: boolean;
   groupAttributeSync?: boolean;
   alertingQueryAndExpressionsStepMode?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1d289b98596..9034ce2fb89 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1457,8 +1457,8 @@ var (
 			Owner:        growthAndOnboarding,
 		},
 		{
-			Name:              "appPlatformAccessTokens",
-			Description:       "Enables the use of access tokens for the App Platform",
+			Name:              "appPlatformGrpcClientAuth",
+			Description:       "Enables the gRPC client to authenticate with the App Platform by using ID & access tokens",
 			Stage:             FeatureStageExperimental,
 			Owner:             identityAccessTeam,
 			HideFromDocs:      true,
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 3dd5ee565ce..e65a21dd9b5 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -192,7 +192,7 @@ exploreLogsShardSplitting,experimental,@grafana/observability-logs,false,false,t
 exploreLogsAggregatedMetrics,experimental,@grafana/observability-logs,false,false,true
 exploreLogsLimitedTimeRange,experimental,@grafana/observability-logs,false,false,true
 homeSetupGuide,experimental,@grafana/growth-and-onboarding,false,false,true
-appPlatformAccessTokens,experimental,@grafana/identity-access-team,false,false,false
+appPlatformGrpcClientAuth,experimental,@grafana/identity-access-team,false,false,false
 appSidecar,experimental,@grafana/explore-squad,false,false,false
 groupAttributeSync,experimental,@grafana/identity-access-team,false,false,false
 alertingQueryAndExpressionsStepMode,experimental,@grafana/alerting-squad,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 1aee2335aee..31fe284f57f 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -779,9 +779,9 @@ const (
 	// Used in Home for users who want to return to the onboarding flow or quickly find popular config pages
 	FlagHomeSetupGuide = "homeSetupGuide"
 
-	// FlagAppPlatformAccessTokens
-	// Enables the use of access tokens for the App Platform
-	FlagAppPlatformAccessTokens = "appPlatformAccessTokens"
+	// FlagAppPlatformGrpcClientAuth
+	// Enables the gRPC client to authenticate with the App Platform by using ID & access tokens
+	FlagAppPlatformGrpcClientAuth = "appPlatformGrpcClientAuth"
 
 	// FlagAppSidecar
 	// Enable the app sidecar feature that allows rendering 2 apps at the same time
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 1a1e67ca5fe..40e0388ab28 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -386,7 +386,8 @@
       "metadata": {
         "name": "appPlatformAccessTokens",
         "resourceVersion": "1725549369316",
-        "creationTimestamp": "2024-09-05T15:16:09Z"
+        "creationTimestamp": "2024-09-05T15:16:09Z",
+        "deletionTimestamp": "2024-10-11T15:54:21Z"
       },
       "spec": {
         "description": "Enables the use of access tokens for the App Platform",
@@ -396,6 +397,20 @@
         "hideFromDocs": true
       }
     },
+    {
+      "metadata": {
+        "name": "appPlatformGrpcClientAuth",
+        "resourceVersion": "1728662061076",
+        "creationTimestamp": "2024-10-11T15:54:21Z"
+      },
+      "spec": {
+        "description": "Enables the gRPC client to authenticate with the App Platform by using ID \u0026 access tokens",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
     {
       "metadata": {
         "name": "appSidecar",