diff --git a/packages/app/package.json b/packages/app/package.json
index b960712550..43b12a1cb7 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -59,7 +59,7 @@
     "@backstage/plugin-newrelic": "workspace:^",
     "@backstage/plugin-newrelic-dashboard": "workspace:^",
     "@backstage/plugin-nomad": "workspace:^",
-    "@backstage/plugin-notifications": "^0.0.0",
+    "@backstage/plugin-notifications": "workspace:^",
     "@backstage/plugin-octopus-deploy": "workspace:^",
     "@backstage/plugin-org": "workspace:^",
     "@backstage/plugin-pagerduty": "workspace:^",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 1606158a7e..bb0b0e0ed7 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -55,7 +55,7 @@
     "@backstage/plugin-lighthouse-backend": "workspace:^",
     "@backstage/plugin-linguist-backend": "workspace:^",
     "@backstage/plugin-nomad-backend": "workspace:^",
-    "@backstage/plugin-notifications-backend": "^0.0.0",
+    "@backstage/plugin-notifications-backend": "workspace:^",
     "@backstage/plugin-notifications-node": "workspace:^",
     "@backstage/plugin-permission-backend": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
diff --git a/packages/backend/src/plugins/notifications.ts b/packages/backend/src/plugins/notifications.ts
index 689e42753a..6bef7f0a01 100644
--- a/packages/backend/src/plugins/notifications.ts
+++ b/packages/backend/src/plugins/notifications.ts
@@ -21,21 +21,6 @@ import { PluginEnvironment } from '../types';
 export default async function createPlugin(
   env: PluginEnvironment,
 ): Promise<Router> {
-  // TODO: Remove this test code
-  let notifications = 0;
-  setInterval(() => {
-    if (notifications < 10) {
-      env.notificationService.send({
-        entityRef: 'user:default/guest',
-        title: 'Test',
-        description: 'This is test notification',
-        link: '/catalog',
-        icon: 'SwapHorizRounded',
-      });
-      notifications++;
-    }
-  }, 60000);
-
   return await createRouter({
     logger: env.logger,
     identity: env.identity,
diff --git a/plugins/notifications-backend/catalog-info.yaml b/plugins/notifications-backend/catalog-info.yaml
new file mode 100644
index 0000000000..66b39c39df
--- /dev/null
+++ b/plugins/notifications-backend/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-notifications-backend
+  title: '@backstage/plugin-notifications-backend'
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin
+  owner: maintainers
diff --git a/plugins/notifications-common/catalog-info.yaml b/plugins/notifications-common/catalog-info.yaml
new file mode 100644
index 0000000000..5a888d2372
--- /dev/null
+++ b/plugins/notifications-common/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-notifications-common
+  title: '@backstage/plugin-notifications-common'
+  description: Common functionalities for the notifications plugin
+spec:
+  lifecycle: experimental
+  type: backstage-common-library
+  owner: maintainers
diff --git a/plugins/notifications-node/catalog-info.yaml b/plugins/notifications-node/catalog-info.yaml
new file mode 100644
index 0000000000..cf25f049c9
--- /dev/null
+++ b/plugins/notifications-node/catalog-info.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-notifications-node
+  title: '@backstage/plugin-notifications-node'
+  description: Node.js library for the notifications plugin
+spec:
+  lifecycle: experimental
+  type: backstage-node-library
+  owner: maintainers
diff --git a/plugins/notifications/catalog-info.yaml b/plugins/notifications/catalog-info.yaml
new file mode 100644
index 0000000000..33d39798e7
--- /dev/null
+++ b/plugins/notifications/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-notifications
+  title: '@backstage/plugin-notifications'
+spec:
+  lifecycle: experimental
+  type: backstage-frontend-plugin
+  owner: maintainers
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 5d7abcf148..80804a68c4 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -31,6 +31,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
+    "@types/react": "^16.13.1 || ^17.0.0",
     "react-relative-time": "^0.0.9",
     "react-use": "^17.2.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 3a1a6f0bbf..fe739b0049 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7779,7 +7779,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-notifications-backend@^0.0.0, @backstage/plugin-notifications-backend@workspace:plugins/notifications-backend":
+"@backstage/plugin-notifications-backend@workspace:^, @backstage/plugin-notifications-backend@workspace:plugins/notifications-backend":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-notifications-backend@workspace:plugins/notifications-backend"
   dependencies:
@@ -7826,7 +7826,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-notifications@^0.0.0, @backstage/plugin-notifications@workspace:plugins/notifications":
+"@backstage/plugin-notifications@workspace:^, @backstage/plugin-notifications@workspace:plugins/notifications":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-notifications@workspace:plugins/notifications"
   dependencies:
@@ -7845,6 +7845,7 @@ __metadata:
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
+    "@types/react": ^16.13.1 || ^17.0.0
     msw: ^1.0.0
     react-relative-time: ^0.0.9
     react-use: ^17.2.4
@@ -27136,7 +27137,7 @@ __metadata:
     "@backstage/plugin-newrelic": "workspace:^"
     "@backstage/plugin-newrelic-dashboard": "workspace:^"
     "@backstage/plugin-nomad": "workspace:^"
-    "@backstage/plugin-notifications": ^0.0.0
+    "@backstage/plugin-notifications": "workspace:^"
     "@backstage/plugin-octopus-deploy": "workspace:^"
     "@backstage/plugin-org": "workspace:^"
     "@backstage/plugin-pagerduty": "workspace:^"
@@ -27274,7 +27275,7 @@ __metadata:
     "@backstage/plugin-lighthouse-backend": "workspace:^"
     "@backstage/plugin-linguist-backend": "workspace:^"
     "@backstage/plugin-nomad-backend": "workspace:^"
-    "@backstage/plugin-notifications-backend": ^0.0.0
+    "@backstage/plugin-notifications-backend": "workspace:^"
     "@backstage/plugin-notifications-node": "workspace:^"
     "@backstage/plugin-permission-backend": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"