diff --git a/microsite/data/plugins/argo-cd.yaml b/microsite/data/plugins/argo-cd.yaml
index a47fa08d82..ca753f682a 100644
--- a/microsite/data/plugins/argo-cd.yaml
+++ b/microsite/data/plugins/argo-cd.yaml
@@ -2,7 +2,7 @@
 title: Argo CD
 author: roadie.io
 authorUrl: https://roadie.io
-category: CI
+category: CI/CD
 description: View Argo CD status for your projects in Backstage.
 documentation: https://roadie.io/backstage/plugins/argo-cd
 iconUrl: https://roadie.io/images/logos/argo.png
diff --git a/microsite/data/plugins/buildkite.yaml b/microsite/data/plugins/buildkite.yaml
index eeb9440aac..16c6960898 100644
--- a/microsite/data/plugins/buildkite.yaml
+++ b/microsite/data/plugins/buildkite.yaml
@@ -2,7 +2,7 @@
 title: Buildkite
 author: roadie.io
 authorUrl: https://roadie.io
-category: CI
+category: CI/CD
 description: View Buildkite CI builds for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/buildkite
 iconUrl: https://roadie.io/images/logos/buildkite.png
diff --git a/microsite/data/plugins/circleci.yaml b/microsite/data/plugins/circleci.yaml
index 467da9fb1e..0acad832fa 100644
--- a/microsite/data/plugins/circleci.yaml
+++ b/microsite/data/plugins/circleci.yaml
@@ -2,7 +2,7 @@
 title: CircleCI
 author: Spotify
 authorUrl: https://github.com/spotify
-category: CI
+category: CI/CD
 description: Automate your development process with CI hosted in the cloud or on a private server.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/circleci
 iconUrl: https://www.saaves.com/storage/brochure/logo-circleci-icon1583764538.png
diff --git a/microsite/data/plugins/cloud-build.yaml b/microsite/data/plugins/cloud-build.yaml
index 2b40d02de2..253a935392 100644
--- a/microsite/data/plugins/cloud-build.yaml
+++ b/microsite/data/plugins/cloud-build.yaml
@@ -2,7 +2,7 @@
 title: Google Cloud Build
 author: Trivago
 authorUrl: https://www.trivago.com
-category: CI
+category: CI/CD
 description: Build, test, and deploy on Google's serverless CI/CD platform.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/cloudbuild
 iconUrl: https://avatars2.githubusercontent.com/u/38220399?s=400&v=4
diff --git a/microsite/data/plugins/gcp-projects.yaml b/microsite/data/plugins/gcp-projects.yaml
index 1c015821b2..7c4b75d2a4 100644
--- a/microsite/data/plugins/gcp-projects.yaml
+++ b/microsite/data/plugins/gcp-projects.yaml
@@ -2,7 +2,7 @@
 title: GCP Project Creator
 author: Trivago
 authorUrl: https://www.trivago.com
-category: Cloud
+category: Infrastructure
 description: Create, list and manage your Google Cloud Projects.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/gcp-projects
 iconUrl: https://avatars1.githubusercontent.com/u/2810941?s=280&v=4
diff --git a/microsite/data/plugins/github-actions.yaml b/microsite/data/plugins/github-actions.yaml
index aeccdc9b86..8d5a74d9ce 100644
--- a/microsite/data/plugins/github-actions.yaml
+++ b/microsite/data/plugins/github-actions.yaml
@@ -2,7 +2,7 @@
 title: GitHub Actions
 author: Spotify
 authorUrl: https://github.com/spotify
-category: CI
+category: CI/CD
 description: GitHub Actions makes it easy to automate all your software workflows, now with world-class CI/CD. Build, test, and deploy your code right from GitHub.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/github-actions
 iconUrl: https://avatars2.githubusercontent.com/u/44036562?s=400&v=4
diff --git a/microsite/data/plugins/github-insights.yaml b/microsite/data/plugins/github-insights.yaml
index 1dba3dcfd1..f127f88a3c 100644
--- a/microsite/data/plugins/github-insights.yaml
+++ b/microsite/data/plugins/github-insights.yaml
@@ -2,7 +2,7 @@
 title: GitHub Insights
 author: roadie.io
 authorUrl: https://roadie.io
-category: Monitoring
+category: Source Control Mgmt
 description: View GitHub Insights for your components in Backstage.
 documentation: https://roadie.io/backstage/plugins/github-insights
 iconUrl: https://roadie.io/images/logos/insights.png
diff --git a/microsite/data/plugins/github-pull-requests.yaml b/microsite/data/plugins/github-pull-requests.yaml
index 8e44a4bf56..4172cdff6b 100644
--- a/microsite/data/plugins/github-pull-requests.yaml
+++ b/microsite/data/plugins/github-pull-requests.yaml
@@ -2,7 +2,7 @@
 title: GitHub Pull Requests
 author: roadie.io
 authorUrl: https://roadie.io/
-category: CI
+category: Source Control Mgmt
 description: View GitHub pull requests for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/github-pull-requests
 iconUrl: https://roadie.io/images/logos/github.png
diff --git a/microsite/data/plugins/jenkins.yaml b/microsite/data/plugins/jenkins.yaml
index 638758d54d..7a8f884221 100644
--- a/microsite/data/plugins/jenkins.yaml
+++ b/microsite/data/plugins/jenkins.yaml
@@ -2,7 +2,7 @@
 title: Jenkins
 author: '@timja'
 authorUrl: https://github.com/timja
-category: CI
+category: CI/CD
 description: Jenkins offers a simple way to set up a continuous integration and continuous delivery environment.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/jenkins
 iconUrl: https://img.icons8.com/color/1600/jenkins.png
diff --git a/microsite/data/plugins/jira.yaml b/microsite/data/plugins/jira.yaml
index 579243d11c..c32455c7d5 100644
--- a/microsite/data/plugins/jira.yaml
+++ b/microsite/data/plugins/jira.yaml
@@ -2,7 +2,7 @@
 title: Jira
 author: roadie.io
 authorUrl: https://roadie.io
-category: Project Management
+category: Agile Planning
 description: View Jira summary for your projects in Backstage.
 documentation: https://roadie.io/backstage/plugins/jira
 iconUrl: https://roadie.io/images/logos/jira.png
diff --git a/microsite/data/plugins/lighthouse.yaml b/microsite/data/plugins/lighthouse.yaml
index 88d444e0ef..be70dfd74a 100644
--- a/microsite/data/plugins/lighthouse.yaml
+++ b/microsite/data/plugins/lighthouse.yaml
@@ -2,7 +2,7 @@
 title: Lighthouse
 author: Spotify
 authorUrl: https://github.com/spotify
-category: Accessibility
+category: Quality
 description: Google's Lighthouse tool is a great resource for benchmarking and improving the accessibility, performance, SEO, and best practices of your website.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/lighthouse
 iconUrl: https://seeklogo.com/images/G/google-lighthouse-logo-1C7FA08580-seeklogo.com.png
diff --git a/microsite/data/plugins/travis-ci.yaml b/microsite/data/plugins/travis-ci.yaml
index fe1b18c9d4..a6b8c6ebd7 100644
--- a/microsite/data/plugins/travis-ci.yaml
+++ b/microsite/data/plugins/travis-ci.yaml
@@ -2,7 +2,7 @@
 title: Travis CI
 author: roadie.io
 authorUrl: https://roadie.io/
-category: CI
+category: CI/CD
 description: View Travis CI builds for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/travis-ci
 iconUrl: https://roadie.io/images/logos/travis.png
diff --git a/microsite/pages/en/plugins.js b/microsite/pages/en/plugins.js
index c7a626bd1d..9ee54173f1 100644
--- a/microsite/pages/en/plugins.js
+++ b/microsite/pages/en/plugins.js
@@ -97,14 +97,14 @@ const Plugins = () => (
           </div>
           <Container className="PluginCardFooter">
             <p>
-              See what plugins are already{' '}
+              See what plugins are already
               <a href="https://github.com/backstage/backstage/issues?q=is%3Aissue+is%3Aopen+label%3Aplugin+sort%3Areactions-%2B1-desc">
                 in progress
-              </a>{' '}
-              and 👍. Missing a plugin for your favorite tool? Please{' '}
+              </a>
+              and 👍. Missing a plugin for your favorite tool? Please
               <a href="https://github.com/backstage/backstage/issues/new?labels=plugin&template=plugin_template.md&title=%5BPlugin%5D+THE+PLUGIN+NAME">
                 suggest
-              </a>{' '}
+              </a>
               a new one.
             </p>
           </Container>