diff --git a/workspaces/gocd/.changeset/unlucky-ants-cover.md b/workspaces/gocd/.changeset/unlucky-ants-cover.md
new file mode 100644
index 0000000000..48952c72e5
--- /dev/null
+++ b/workspaces/gocd/.changeset/unlucky-ants-cover.md
@@ -0,0 +1,5 @@
+---
+'@backstage-community/plugin-gocd': patch
+---
+
+Replaces global JSX reference with React.JSX import
diff --git a/workspaces/gocd/bcp.json b/workspaces/gocd/bcp.json
index 9d2158e4fb..e1b8e25f0c 100644
--- a/workspaces/gocd/bcp.json
+++ b/workspaces/gocd/bcp.json
@@ -1,4 +1,5 @@
 {
   "autoVersionBump": true,
-  "knipReports": false
+  "knipReports": false,
+  "listDeprecations": true
 }
diff --git a/workspaces/gocd/plugins/gocd/report.api.md b/workspaces/gocd/plugins/gocd/report.api.md
index f7b86f6eaf..8732c17dff 100644
--- a/workspaces/gocd/plugins/gocd/report.api.md
+++ b/workspaces/gocd/plugins/gocd/report.api.md
@@ -7,9 +7,10 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { JSX as JSX_2 } from 'react';
 
 // @public
-export const EntityGoCdContent: () => JSX.Element;
+export const EntityGoCdContent: () => JSX_2.Element;
 
 // @public
 export const GOCD_PIPELINES_ANNOTATION = 'gocd.org/pipelines';
diff --git a/workspaces/gocd/plugins/gocd/src/api/gocdApi.client.test.ts b/workspaces/gocd/plugins/gocd/src/api/gocdApi.client.test.ts
index c687d24944..d0f0df3a9c 100644
--- a/workspaces/gocd/plugins/gocd/src/api/gocdApi.client.test.ts
+++ b/workspaces/gocd/plugins/gocd/src/api/gocdApi.client.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { registerMswTestHooks } from '@backstage/test-utils';
 import { GoCdClientApi } from './gocdApi.client';
 import { HttpResponse, http } from 'msw';
 import { setupServer } from 'msw/node';
@@ -22,7 +22,7 @@ import { PipelineHistory } from './gocdApi.model';
 
 describe('GoCdClientApi', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  registerMswTestHooks(server);
 
   it('makes requests through the proxy, using the provided fetch api', async () => {
     const response: PipelineHistory = {
diff --git a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx
index 9fe31377bf..b597727757 100644
--- a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx
+++ b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useState } from 'react';
+import { useState, JSX } from 'react';
 import { Entity } from '@backstage/catalog-model';
 import {
   useEntity,
diff --git a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsInsights/GoCdBuildsInsights.tsx b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsInsights/GoCdBuildsInsights.tsx
index e355faed0e..e9144eaa85 100644
--- a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsInsights/GoCdBuildsInsights.tsx
+++ b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsInsights/GoCdBuildsInsights.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { JSX } from 'react';
 import { groupBy, mean } from 'lodash';
 import {
   PipelineHistory,
diff --git a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsTable/GoCdBuildsTable.tsx b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsTable/GoCdBuildsTable.tsx
index bc85a814d8..c3c48ea26b 100644
--- a/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsTable/GoCdBuildsTable.tsx
+++ b/workspaces/gocd/plugins/gocd/src/components/GoCdBuildsTable/GoCdBuildsTable.tsx
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useState } from 'react';
-
-import * as React from 'react';
+import { useState, JSX } from 'react';
 import { Entity, getEntitySourceLocation } from '@backstage/catalog-model';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import Alert from '@material-ui/lab/Alert';
diff --git a/workspaces/gocd/plugins/gocd/src/components/Select/Select.tsx b/workspaces/gocd/plugins/gocd/src/components/Select/Select.tsx
index 15048b45d3..0c00a99331 100644
--- a/workspaces/gocd/plugins/gocd/src/components/Select/Select.tsx
+++ b/workspaces/gocd/plugins/gocd/src/components/Select/Select.tsx
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { JSX } from 'react';
 import FormControl from '@material-ui/core/FormControl';
 import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import Select from '@material-ui/core/Select';
 import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
-import * as React from 'react';
 
 export type Item = {
   label: string;