diff --git a/grafana/rmf-app/.config/webpack/webpack.config.ts b/grafana/rmf-app/.config/webpack/webpack.config.ts
index 1a7f713d..83738129 100644
--- a/grafana/rmf-app/.config/webpack/webpack.config.ts
+++ b/grafana/rmf-app/.config/webpack/webpack.config.ts
@@ -202,6 +202,7 @@ const config = async (env): Promise<Configuration> => {
           { from: 'libs/**/*', to: '.', noErrorOnMissing: true }, // Optional
           { from: 'static/**/*', to: '.', noErrorOnMissing: true }, // Optional
           { from: '**/query_help.md', to: '.', noErrorOnMissing: true }, // Optional
+          { from: 'datasource/README.md', to: 'datasource', noErrorOnMissing: true }, // Nested datasource README
         ],
       }),
       // Replace certain template-variables in the README and plugin.json
diff --git a/grafana/rmf-app/src/datasource/plugin.json b/grafana/rmf-app/src/datasource/plugin.json
index 4e34285e..89f3a71a 100644
--- a/grafana/rmf-app/src/datasource/plugin.json
+++ b/grafana/rmf-app/src/datasource/plugin.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "IBM RMF for z/OS",
+  "name": "IBM RMF Data Source",
   "id": "ibm-rmf-datasource",
   "metrics": true,
   "backend": true,
diff --git a/grafana/rmf-app/src/plugin.json b/grafana/rmf-app/src/plugin.json
index 42925972..96b28b5f 100644
--- a/grafana/rmf-app/src/plugin.json
+++ b/grafana/rmf-app/src/plugin.json
@@ -7,7 +7,7 @@
   "includes": [
     {
       "type": "datasource",
-      "name": "IBM RMF for z/OS",
+      "name": "IBM RMF Data Source",
       "path": "datasource/plugin.json"
     },
     {