diff --git a/microsite/data/plugins/aws-lambda.yaml b/microsite/data/plugins/aws-lambda.yaml
index 7fa276f444..f325c0df8b 100644
--- a/microsite/data/plugins/aws-lambda.yaml
+++ b/microsite/data/plugins/aws-lambda.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io
 category: Monitoring
 description: View AWS Lambda functions for your components in Backstage.
 documentation: https://roadie.io/backstage/plugins/aws-lambda
-iconUrl: https://roadie.io/static/77f62f79e27ae8565496e4df7eef8be5/45f2b/logo.png
+iconUrl: https://roadie.io/images/logos/lambda.png
 npmPackageName: '@roadiehq/backstage-plugin-aws-lambda'
diff --git a/microsite/data/plugins/buildkite.yaml b/microsite/data/plugins/buildkite.yaml
new file mode 100644
index 0000000000..eeb9440aac
--- /dev/null
+++ b/microsite/data/plugins/buildkite.yaml
@@ -0,0 +1,12 @@
+---
+title: Buildkite
+author: roadie.io
+authorUrl: https://roadie.io
+category: CI
+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
+npmPackageName: '@roadiehq/backstage-plugin-buildkite'
+tags:
+  - ci
+  - cd
diff --git a/microsite/data/plugins/firebase-functions.yaml b/microsite/data/plugins/firebase-functions.yaml
index 097ef00e50..6d399a2350 100644
--- a/microsite/data/plugins/firebase-functions.yaml
+++ b/microsite/data/plugins/firebase-functions.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io/
 category: Monitoring
 description: View Firebase Functions details for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/firebase-functions
-iconUrl: https://roadie.io/static/49fb23200ad0eaa6703b4ddf75c78cf1/45f2b/logo-vertical.png
+iconUrl: https://roadie.io/images/logos/github.png
 npmPackageName: '@roadiehq/backstage-plugin-firebase-functions'
diff --git a/microsite/data/plugins/github-insights.yaml b/microsite/data/plugins/github-insights.yaml
index 8ac8321da0..1dba3dcfd1 100644
--- a/microsite/data/plugins/github-insights.yaml
+++ b/microsite/data/plugins/github-insights.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io
 category: Monitoring
 description: View GitHub Insights for your components in Backstage.
 documentation: https://roadie.io/backstage/plugins/github-insights
-iconUrl: https://roadie.io/static/2ad5123c425908efde0c922d707e737b/06c84/code-icon.png
+iconUrl: https://roadie.io/images/logos/insights.png
 npmPackageName: '@roadiehq/backstage-plugin-github-insights'
diff --git a/microsite/data/plugins/github-pull-requests.yaml b/microsite/data/plugins/github-pull-requests.yaml
index 6479452c8e..8e44a4bf56 100644
--- a/microsite/data/plugins/github-pull-requests.yaml
+++ b/microsite/data/plugins/github-pull-requests.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io/
 category: CI
 description: View GitHub pull requests for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/github-pull-requests
-iconUrl: https://roadie.io/static/7f13bb8d861d8dedc5112fb939d215f9/351f2/GitHub-Mark-Light-120px-plus.png
+iconUrl: https://roadie.io/images/logos/github.png
 npmPackageName: '@roadiehq/backstage-plugin-github-pull-requests'
diff --git a/microsite/data/plugins/security-insights.yaml b/microsite/data/plugins/security-insights.yaml
index 1cbcfbc3aa..4f34f79027 100644
--- a/microsite/data/plugins/security-insights.yaml
+++ b/microsite/data/plugins/security-insights.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io/
 category: Security
 description: View Security Insights for your components in Backstage.
 documentation: https://roadie.io/backstage/plugins/security-insights
-iconUrl: https://roadie.io/static/7f13bb8d861d8dedc5112fb939d215f9/351f2/GitHub-Mark-Light-120px-plus.png
+iconUrl: https://roadie.io/images/logos/github.png
 npmPackageName: '@roadiehq/backstage-plugin-security-insights'
diff --git a/microsite/data/plugins/travis-ci.yaml b/microsite/data/plugins/travis-ci.yaml
index 520b884c20..fe1b18c9d4 100644
--- a/microsite/data/plugins/travis-ci.yaml
+++ b/microsite/data/plugins/travis-ci.yaml
@@ -5,5 +5,5 @@ authorUrl: https://roadie.io/
 category: CI
 description: View Travis CI builds for your service in Backstage.
 documentation: https://roadie.io/backstage/plugins/travis-ci
-iconUrl: https://roadie.io/static/af2941eaf0af675facb281d566f42e14/45f2b/travis-ci-mascot-200x200.png
+iconUrl: https://roadie.io/images/logos/travis.png
 npmPackageName: '@roadiehq/backstage-plugin-travis-ci'