diff --git a/packages/api/src/controllers/plugins.js b/packages/api/src/controllers/plugins.js
index e9d62b20d..4a537decf 100644
--- a/packages/api/src/controllers/plugins.js
+++ b/packages/api/src/controllers/plugins.js
@@ -89,6 +89,12 @@ module.exports = {
               encoding: 'utf-8',
             })
             .then(x => JSON.parse(x));
+          if (!manifest.keywords) {
+            continue;
+          }
+          if (!manifest.keywords.includes('dbgateplugin')) {
+            continue;
+          }
           const readmeFile = path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'README.md');
           // @ts-ignore
           if (await fs.exists(readmeFile)) {
diff --git a/packages/dbgate/package.json b/packages/dbgate/package.json
index dcbab9e0f..1e8ae9dc2 100644
--- a/packages/dbgate/package.json
+++ b/packages/dbgate/package.json
@@ -10,7 +10,7 @@
   "author": "Jan Prochazka",
   "license": "MIT",
   "bin": {
-    "dbgate": "./bin/dbgate-serve.js"
+    "dbgate-serve": "./bin/dbgate-serve.js"
   },
   "keywords": [
     "sql",