diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md
index 6cd814d1dec..0f6c25cf752 100644
--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -138,6 +138,7 @@ guaranteed because plugin developers can override this functionality. The follow
     <td>
       <ul>
         <li>ClickHouse</li>
+        <li>CloudWatch</li>
         <li>Elasticsearch</li>
         <li>Infinity</li>
         <li>InfluxDB</li>
@@ -165,7 +166,6 @@ guaranteed because plugin developers can override this functionality. The follow
   <tr>
     <td>
       <ul>
-        <li>CloudWatch</li>
         <li>Graphite</li>
       </ul>
     </td>
diff --git a/pkg/services/publicdashboards/commands/generate_datasources/generate.go b/pkg/services/publicdashboards/commands/generate_datasources/generate.go
index 072fc9f21e7..68a9c480707 100644
--- a/pkg/services/publicdashboards/commands/generate_datasources/generate.go
+++ b/pkg/services/publicdashboards/commands/generate_datasources/generate.go
@@ -13,9 +13,8 @@ import (
 var grafanaDatasources = []string{expr.DatasourceType, "datasource"}
 
 // there are some datasources that have backend flag as true but don't call /ds/query endpoint
-var unsupportedDataSourcesMap = map[string]bool{
-	"cloudwatch": true,
-}
+// through DataSourceWithBackend class
+var unsupportedDataSourcesMap = map[string]bool{}
 
 type listPluginResponse struct {
 	Items []struct {
diff --git a/pkg/services/publicdashboards/commands/generate_datasources/main.go b/pkg/services/publicdashboards/commands/generate_datasources/main.go
index 1bdda91f4df..67b49268fe2 100644
--- a/pkg/services/publicdashboards/commands/generate_datasources/main.go
+++ b/pkg/services/publicdashboards/commands/generate_datasources/main.go
@@ -26,7 +26,7 @@ func main() {
 	tsTemplate := template.Must(template.New("").Parse(tsDatasourcesTemplate))
 
 	// Generate supported datasources for Typescript
-	tsFile, err := os.Create("./../../../public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts")
+	tsFile, err := os.Create("./../../../../../public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts")
 	if err != nil {
 		fmt.Println(err)
 	}
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
index 10b92f939be..aac1aaaf0f5 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SupportedPubdashDatasources.ts
@@ -2,9 +2,11 @@
 
 export const supportedDatasources = new Set<string>([
   '__expr__',
+  'aggregations-io-datasource',
   'apache-iotdb-datasource',
   'aquaqanalytics-kdbbackend-datasource',
   'axiomhq-axiom-datasource',
+  'cloudwatch',
   'cnos-cnosdb-datasource',
   'datasource',
   'dlopes7-appdynamics-datasource',
@@ -19,7 +21,6 @@ export const supportedDatasources = new Set<string>([
   'grafana-clickhouse-datasource',
   'grafana-databricks-datasource',
   'grafana-datadog-datasource',
-  'grafana-db2-datasource',
   'grafana-dynatrace-datasource',
   'grafana-es-open-distro-datasource',
   'grafana-falconlogscale-datasource',
@@ -45,6 +46,8 @@ export const supportedDatasources = new Set<string>([
   'grafana-snowflake-datasource',
   'grafana-splunk-datasource',
   'grafana-splunk-monitoring-datasource',
+  'grafana-sumologic-datasource',
+  'grafana-testdata-datasource',
   'grafana-timestream-datasource',
   'grafana-wavefront-datasource',
   'grafana-x-ray-datasource',
@@ -55,8 +58,8 @@ export const supportedDatasources = new Set<string>([
   'innius-grpc-datasource',
   'kniepdennis-neo4j-datasource',
   'loki',
+  'manassehzhou-maxcompute-datasource',
   'marcusolsson-csv-datasource',
-  'marcusolsson-ynab-datasource',
   'mssql',
   'mysql',
   'nagasudhirpulla-api-datasource',
@@ -71,6 +74,7 @@ export const supportedDatasources = new Set<string>([
   'spiceai-spicexyz-datasource',
   'stackdriver',
   'tdengine-datasource',
+  'trino-datasource',
   'vertamedia-clickhouse-datasource',
   'vertica-grafana-datasource',
   'ydbtech-ydb-datasource',