diff --git a/workspaces/kiali/.changeset/icy-clouds-feel.md b/workspaces/kiali/.changeset/icy-clouds-feel.md
new file mode 100644
index 000000000..a8902b7d0
--- /dev/null
+++ b/workspaces/kiali/.changeset/icy-clouds-feel.md
@@ -0,0 +1,5 @@
+---
+'@backstage-community/plugin-kiali': minor
+---
+
+Fix provider selector
diff --git a/workspaces/kiali/DEVELOPMENT.md b/workspaces/kiali/DEVELOPMENT.md
index f5eb24ec8..d32d11695 100644
--- a/workspaces/kiali/DEVELOPMENT.md
+++ b/workspaces/kiali/DEVELOPMENT.md
@@ -28,7 +28,7 @@
 
 ```bash
     export KIALI_BASE_URL=https://kiali-istio-system.apps-crc.testing;`
-    yarn start:backstage
+    yarn start
 ```
 
 ## Configure auth
diff --git a/workspaces/kiali/app-config.yaml b/workspaces/kiali/app-config.yaml
index 707820e05..7b815098d 100644
--- a/workspaces/kiali/app-config.yaml
+++ b/workspaces/kiali/app-config.yaml
@@ -87,9 +87,9 @@ kubernetes:
 
 kiali:
   providers:
-    - name: default
+    - name: Kubernetes
       # See the README file for configuration
-      url: ${KIALI_BASE_URL}
+      url: http://localhost:20001/kiali/
       # Optional. Kiali public URL to redirect to standalone Kiali. When not specified, url will be used.
       # urlExternal: ''
       # Optional. Required by token authentication
@@ -102,9 +102,9 @@ kiali:
       # caFile: ''
       # Optional. Time in seconds that session is enabled, defaults to 1 minute.
       sessionTime: 60
-    - name: kubernetes
+    - name: default
       # See the README file for configuration
-      url: http://localhost:20001/kiali/
+      url: ${KIALI_BASE_URL}
       # Optional. Kiali public URL to redirect to standalone Kiali. When not specified, url will be used.
       # urlExternal: ''
       # Optional. Required by token authentication
diff --git a/workspaces/kiali/package.json b/workspaces/kiali/package.json
index eea670ace..6136ef6b9 100644
--- a/workspaces/kiali/package.json
+++ b/workspaces/kiali/package.json
@@ -6,12 +6,12 @@
     "node": "20"
   },
   "scripts": {
-    "start:backstage": "concurrently -c auto -n \"fe,be\" -p \"{name}:{pid}\" \"yarn start-app\" \"yarn start-backend\"",
+    "start": "backstage-cli repo start",
     "start-app": "yarn workspace app start",
     "start-backend": "yarn workspace backend start",
     "tsc": "tsc",
     "tsc:full": "tsc --skipLibCheck true --incremental false",
-    "build:all": "backstage-cli repo build --all",
+    "build:all": "CI=true backstage-cli repo build --all",
     "build:api-reports": "yarn build:api-reports:only",
     "build:api-reports:only": "backstage-repo-tools api-reports --allow-all-warnings -o ae-wrong-input-file-type,ae-undocumented --validate-release-tags",
     "clean": "backstage-cli repo clean",
diff --git a/workspaces/kiali/packages/app/src/App.test.tsx b/workspaces/kiali/packages/app/src/App.test.tsx
index 19a8d6cba..c6a60149b 100644
--- a/workspaces/kiali/packages/app/src/App.test.tsx
+++ b/workspaces/kiali/packages/app/src/App.test.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { render, waitFor } from '@testing-library/react';
-import React from 'react';
 import App from './App';
 
 describe('App', () => {
diff --git a/workspaces/kiali/packages/app/src/App.tsx b/workspaces/kiali/packages/app/src/App.tsx
index 3baf955e2..f0bbeda4a 100644
--- a/workspaces/kiali/packages/app/src/App.tsx
+++ b/workspaces/kiali/packages/app/src/App.tsx
@@ -45,7 +45,6 @@ import {
 import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
-import React from 'react';
 import { Navigate, Route } from 'react-router-dom';
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
diff --git a/workspaces/kiali/packages/app/src/components/Root/LogoFull.tsx b/workspaces/kiali/packages/app/src/components/Root/LogoFull.tsx
index 52c92a694..68cc912e8 100644
--- a/workspaces/kiali/packages/app/src/components/Root/LogoFull.tsx
+++ b/workspaces/kiali/packages/app/src/components/Root/LogoFull.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { makeStyles } from '@material-ui/core';
-import React from 'react';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/workspaces/kiali/packages/app/src/components/Root/LogoIcon.tsx b/workspaces/kiali/packages/app/src/components/Root/LogoIcon.tsx
index bfb8941e3..bf6a8b32c 100644
--- a/workspaces/kiali/packages/app/src/components/Root/LogoIcon.tsx
+++ b/workspaces/kiali/packages/app/src/components/Root/LogoIcon.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { makeStyles } from '@material-ui/core';
-import React from 'react';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/workspaces/kiali/packages/app/src/components/Root/Root.tsx b/workspaces/kiali/packages/app/src/components/Root/Root.tsx
index b8eeea568..c7a211393 100644
--- a/workspaces/kiali/packages/app/src/components/Root/Root.tsx
+++ b/workspaces/kiali/packages/app/src/components/Root/Root.tsx
@@ -40,7 +40,7 @@ import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import MenuIcon from '@material-ui/icons/Menu';
 import GroupIcon from '@material-ui/icons/People';
 import SearchIcon from '@material-ui/icons/Search';
-import React, { PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
 
diff --git a/workspaces/kiali/packages/app/src/components/catalog/EntityPage.tsx b/workspaces/kiali/packages/app/src/components/catalog/EntityPage.tsx
index bff475648..6a0e4bac6 100644
--- a/workspaces/kiali/packages/app/src/components/catalog/EntityPage.tsx
+++ b/workspaces/kiali/packages/app/src/components/catalog/EntityPage.tsx
@@ -74,7 +74,6 @@ import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
 import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import { Button, Grid } from '@material-ui/core';
-import React from 'react';
 
 const techdocsContent = (
   <EntityTechdocsContent>
diff --git a/workspaces/kiali/packages/app/src/components/search/SearchPage.tsx b/workspaces/kiali/packages/app/src/components/search/SearchPage.tsx
index 8a37529a3..fc57fdcba 100644
--- a/workspaces/kiali/packages/app/src/components/search/SearchPage.tsx
+++ b/workspaces/kiali/packages/app/src/components/search/SearchPage.tsx
@@ -36,7 +36,6 @@ import {
 } from '@backstage/plugin-search-react';
 import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
 import { Grid, makeStyles, Paper, Theme } from '@material-ui/core';
-import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {
diff --git a/workspaces/kiali/packages/app/src/index.tsx b/workspaces/kiali/packages/app/src/index.tsx
index 233899123..ea13d30f0 100644
--- a/workspaces/kiali/packages/app/src/index.tsx
+++ b/workspaces/kiali/packages/app/src/index.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import '@backstage/cli/asset-types';
-import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
 
diff --git a/workspaces/kiali/plugins/kiali/dev/index.tsx b/workspaces/kiali/plugins/kiali/dev/index.tsx
index e3c362992..f2ac11750 100644
--- a/workspaces/kiali/plugins/kiali/dev/index.tsx
+++ b/workspaces/kiali/plugins/kiali/dev/index.tsx
@@ -21,7 +21,6 @@ import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { TestApiProvider } from '@backstage/test-utils';
 import { Grid } from '@material-ui/core';
 import { getAllThemes } from '@redhat-developer/red-hat-developer-hub-theme';
-import React from 'react';
 import { EntityKialiResourcesCard, kialiPlugin } from '../src';
 import { KialiHelper } from '../src/pages/Kiali/KialiHelper';
 import { KialiNoAnnotation } from '../src/pages/Kiali/KialiNoAnnotation';
diff --git a/workspaces/kiali/plugins/kiali/report.api.md b/workspaces/kiali/plugins/kiali/report.api.md
index 32708ced0..9e111c6e3 100644
--- a/workspaces/kiali/plugins/kiali/report.api.md
+++ b/workspaces/kiali/plugins/kiali/report.api.md
@@ -6,7 +6,7 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { JSX as JSX_2 } from 'react';
+import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { default as KialiIcon } from '@mui/icons-material/Troubleshoot';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
diff --git a/workspaces/kiali/plugins/kiali/src/components/About/AboutUIModal.tsx b/workspaces/kiali/plugins/kiali/src/components/About/AboutUIModal.tsx
index 8e9ecdac8..be457a738 100644
--- a/workspaces/kiali/plugins/kiali/src/components/About/AboutUIModal.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/About/AboutUIModal.tsx
@@ -29,7 +29,7 @@ import {
 } from '@material-ui/core';
 import CloseIcon from '@material-ui/icons/Close';
 import { Alert } from '@material-ui/lab';
-import * as React from 'react';
+import { default as React } from 'react';
 import { config, KialiIcon, KialiLogo } from '../../config';
 import { kialiStyle } from '../../styles/StyleUtils';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientBadge.tsx b/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientBadge.tsx
index 6ccac601f..0a9f8f0f3 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientBadge.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientBadge.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Chip, Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 
 type AmbientLabelProps = {
   style?: React.CSSProperties;
diff --git a/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientLabel.tsx b/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientLabel.tsx
index 31d843c9d..aaa5a2cff 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientLabel.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Ambient/AmbientLabel.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Chip, Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 
 type AmbientLabelProps = {
   tooltip: boolean;
diff --git a/workspaces/kiali/plugins/kiali/src/components/Banners/TechPreviewWarning.tsx b/workspaces/kiali/plugins/kiali/src/components/Banners/TechPreviewWarning.tsx
index 846fc5838..80201c734 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Banners/TechPreviewWarning.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Banners/TechPreviewWarning.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Alert } from '@material-ui/lab';
-import * as React from 'react';
 
 type defaultProps = {
   message?: string;
diff --git a/workspaces/kiali/plugins/kiali/src/components/BreadcrumbView/BreadcrumbView.tsx b/workspaces/kiali/plugins/kiali/src/components/BreadcrumbView/BreadcrumbView.tsx
index 261fcae30..e20f35308 100644
--- a/workspaces/kiali/plugins/kiali/src/components/BreadcrumbView/BreadcrumbView.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/BreadcrumbView/BreadcrumbView.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Breadcrumbs } from '@material-ui/core';
-import * as React from 'react';
 import { Location, useLocation } from 'react-router-dom';
 import { HistoryManager } from '../../app/History';
 import { Paths } from '../../config';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Charts/ChartWithLegend.tsx b/workspaces/kiali/plugins/kiali/src/components/Charts/ChartWithLegend.tsx
index b7a513c15..a4a5dd3b1 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Charts/ChartWithLegend.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Charts/ChartWithLegend.tsx
@@ -28,7 +28,7 @@ import {
 } from '@patternfly/react-charts';
 import { Button, ButtonVariant } from '@patternfly/react-core';
 import { format as d3Format } from 'd3-format';
-import * as React from 'react';
+import { default as React } from 'react';
 import regression from 'regression';
 import { VictoryBoxPlot } from 'victory-box-plot';
 import { VictoryPortal } from 'victory-core';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Charts/CustomTooltip.tsx b/workspaces/kiali/plugins/kiali/src/components/Charts/CustomTooltip.tsx
index e2c2ee4ed..93e480f31 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Charts/CustomTooltip.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Charts/CustomTooltip.tsx
@@ -20,7 +20,7 @@ import {
   ChartTooltip,
   ChartTooltipProps,
 } from '@patternfly/react-charts';
-import * as React from 'react';
+import { default as React } from 'react';
 import { VCDataPoint } from '../../types/VictoryChartInfo';
 import { toLocaleStringWithConditionalDate } from '../../utils/Date';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Charts/Dashboard.tsx b/workspaces/kiali/plugins/kiali/src/components/Charts/Dashboard.tsx
index adc2ca3f2..b295f5926 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Charts/Dashboard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Charts/Dashboard.tsx
@@ -16,7 +16,7 @@
 import { Grid } from '@material-ui/core';
 import { ChartThemeColor, getTheme } from '@patternfly/react-charts';
 import { isArray } from 'lodash';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ChartModel, DashboardModel } from '../../types/Dashboards';
 import { AllPromLabelsValues } from '../../types/Metrics';
 import { Overlay } from '../../types/Overlay';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Charts/KChart.tsx b/workspaces/kiali/plugins/kiali/src/components/Charts/KChart.tsx
index afa8c2329..c46053f9f 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Charts/KChart.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Charts/KChart.tsx
@@ -28,7 +28,7 @@ import {
   EmptyStateVariant,
 } from '@patternfly/react-core';
 import { CubesIcon, ErrorCircleOIcon } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { PFColors } from '../../components/Pf/PfColors';
 import { KialiIcon } from '../../config/KialiIcon';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Charts/SparklineChart.tsx b/workspaces/kiali/plugins/kiali/src/components/Charts/SparklineChart.tsx
index 01f87fb8c..526383aeb 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Charts/SparklineChart.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Charts/SparklineChart.tsx
@@ -25,7 +25,7 @@ import {
   ChartThreshold,
   ChartVoronoiContainer,
 } from '@patternfly/react-charts';
-import * as React from 'react';
+import { default as React } from 'react';
 import {
   RichDataPoint,
   VCDataPoint,
diff --git a/workspaces/kiali/plugins/kiali/src/components/DefaultSecondaryMasthead/DefaultSecondaryMasthead.tsx b/workspaces/kiali/plugins/kiali/src/components/DefaultSecondaryMasthead/DefaultSecondaryMasthead.tsx
index f6c02aa35..e0d20ddbb 100644
--- a/workspaces/kiali/plugins/kiali/src/components/DefaultSecondaryMasthead/DefaultSecondaryMasthead.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/DefaultSecondaryMasthead/DefaultSecondaryMasthead.tsx
@@ -15,7 +15,7 @@
  */
 import { Grid, IconButton, Tooltip } from '@material-ui/core';
 import Refresh from '@material-ui/icons/Refresh';
-import React from 'react';
+import { default as React } from 'react';
 
 type DefaultProps = {
   hideNamespaceSelector?: boolean;
diff --git a/workspaces/kiali/plugins/kiali/src/components/DetailDescription/DetailDescription.tsx b/workspaces/kiali/plugins/kiali/src/components/DetailDescription/DetailDescription.tsx
index b2323c1cc..5dfeb4c76 100644
--- a/workspaces/kiali/plugins/kiali/src/components/DetailDescription/DetailDescription.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/DetailDescription/DetailDescription.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { Link } from 'react-router-dom';
 import { isMultiCluster, serverConfig } from '../../config';
 import { createIcon, KialiIcon } from '../../config/KialiIcon';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Drawers/AppDetailsDrawer.tsx b/workspaces/kiali/plugins/kiali/src/components/Drawers/AppDetailsDrawer.tsx
index 864a8bc52..647da56f8 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Drawers/AppDetailsDrawer.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Drawers/AppDetailsDrawer.tsx
@@ -16,7 +16,7 @@
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
 import { AxiosError } from 'axios';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { HistoryManager } from '../../app/History';
 import { AppInfo } from '../../pages/AppDetails/AppInfo';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Drawers/ServiceDetailsDrawer.tsx b/workspaces/kiali/plugins/kiali/src/components/Drawers/ServiceDetailsDrawer.tsx
index 76c716989..235cebc10 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Drawers/ServiceDetailsDrawer.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Drawers/ServiceDetailsDrawer.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { HistoryManager } from '../../app/History';
 import { ServiceInfo } from '../../pages/ServiceDetails/ServiceInfo';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Drawers/WorkloadDetailsDrawer.tsx b/workspaces/kiali/plugins/kiali/src/components/Drawers/WorkloadDetailsDrawer.tsx
index ab90dbeac..fde9fb3a2 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Drawers/WorkloadDetailsDrawer.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Drawers/WorkloadDetailsDrawer.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { WorkloadInfo } from '../../pages/WorkloadDetails/WorkloadInfo';
 import { kialiApiRef } from '../../services/Api';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Envoy/AccessLogModal.tsx b/workspaces/kiali/plugins/kiali/src/components/Envoy/AccessLogModal.tsx
index cd1496314..a1f726ea1 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Envoy/AccessLogModal.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Envoy/AccessLogModal.tsx
@@ -27,7 +27,7 @@ import {
   Split,
   SplitItem,
 } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { classes } from 'typestyle';
 import { PFColors } from '../../components/Pf/PfColors';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Filters/LabelFilter.tsx b/workspaces/kiali/plugins/kiali/src/components/Filters/LabelFilter.tsx
index b105e1285..de7032abf 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Filters/LabelFilter.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Filters/LabelFilter.tsx
@@ -20,7 +20,7 @@ import {
   PopoverPosition,
   TextInput,
 } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config/KialiIcon';
 import { kialiStyle } from '../../styles/StyleUtils';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Filters/StatefulFilters.tsx b/workspaces/kiali/plugins/kiali/src/components/Filters/StatefulFilters.tsx
index bde032a21..d3c160223 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Filters/StatefulFilters.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Filters/StatefulFilters.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { history, HistoryManager } from '../../app/History';
 import {
   ActiveFilter,
diff --git a/workspaces/kiali/plugins/kiali/src/components/Health/HealthDetails.tsx b/workspaces/kiali/plugins/kiali/src/components/Health/HealthDetails.tsx
index 335e181d2..04fe885cc 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Health/HealthDetails.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Health/HealthDetails.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Typography } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config';
 import * as H from '../../types/Health';
 import { PFColors } from '../Pf/PfColors';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Health/HealthIndicator.tsx b/workspaces/kiali/plugins/kiali/src/components/Health/HealthIndicator.tsx
index 671ad1a8d..d553f7798 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Health/HealthIndicator.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Health/HealthIndicator.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { PopoverPosition, Tooltip } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { createTooltipIcon } from '../../config/KialiIcon';
 import * as H from '../../types/Health';
 import { HealthDetails } from './HealthDetails';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Health/Helper.ts b/workspaces/kiali/plugins/kiali/src/components/Health/Helper.ts
index 99f2e4bc6..dff497021 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Health/Helper.ts
+++ b/workspaces/kiali/plugins/kiali/src/components/Health/Helper.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Icon } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { Status } from '../../types/Health';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/IstioConfigCard/IstioConfigCard.tsx b/workspaces/kiali/plugins/kiali/src/components/IstioConfigCard/IstioConfigCard.tsx
index de4537f3b..6a0e23f2a 100644
--- a/workspaces/kiali/plugins/kiali/src/components/IstioConfigCard/IstioConfigCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/IstioConfigCard/IstioConfigCard.tsx
@@ -21,7 +21,7 @@ import {
   TableCellProps,
   Typography,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { cardsHeight } from '../../styles/StyleUtils';
 import { IstioConfigItem } from '../../types/IstioConfigList';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioComponentStatus.tsx b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioComponentStatus.tsx
index 3f9f7c051..ee8219502 100644
--- a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioComponentStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioComponentStatus.tsx
@@ -21,7 +21,7 @@ import {
   MinusCircleIcon,
 } from '@patternfly/react-icons';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ComponentStatus, Status } from '../../types/IstioStatus';
 import { PFColors } from '../Pf/PfColors';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatus.tsx b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatus.tsx
index 69da1d065..bbfc65c83 100644
--- a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatus.tsx
@@ -16,7 +16,7 @@
 import { Tooltip } from '@material-ui/core';
 import { ResourcesFullIcon } from '@patternfly/react-icons';
 import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ComponentStatus, Status } from '../../types/IstioStatus';
 import { PFColors } from '../Pf/PfColors';
 import { IstioStatusList } from './IstioStatusList';
diff --git a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusInline.tsx b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusInline.tsx
index bffd819fd..1646ed1fe 100644
--- a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusInline.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusInline.tsx
@@ -19,7 +19,7 @@ import {
   ExclamationTriangleIcon,
   MinusCircleIcon,
 } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ComponentStatus } from '../../types/IstioStatus';
 import { IstioStatus } from './IstioStatus';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusList.tsx b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusList.tsx
index 37b48f9c0..262b25167 100644
--- a/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusList.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/IstioStatus/IstioStatusList.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { List, Typography } from '@material-ui/core';
-import * as React from 'react';
 import { ComponentStatus, Status } from '../../types/IstioStatus';
 import { IstioComponentStatus } from './IstioComponentStatus';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Label/Label.tsx b/workspaces/kiali/plugins/kiali/src/components/Label/Label.tsx
index bb080d406..eeafdddd4 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Label/Label.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Label/Label.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Label as PfLabel } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { canRender } from '../../utils/SafeRender';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Label/Labels.tsx b/workspaces/kiali/plugins/kiali/src/components/Label/Labels.tsx
index d062434e3..1e7254782 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Label/Labels.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Label/Labels.tsx
@@ -15,7 +15,7 @@
  */
 import { Tooltip } from '@material-ui/core';
 import Button from '@material-ui/core/Button';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config/KialiIcon';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { Label } from './Label';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Link/IstioConfigListLink.tsx b/workspaces/kiali/plugins/kiali/src/components/Link/IstioConfigListLink.tsx
index ef1534e92..1f5677b89 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Link/IstioConfigListLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Link/IstioConfigListLink.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { Link } from 'react-router-dom';
 import { Paths } from '../../config';
 import { FilterSelected } from '../Filters/StatefulFilters';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Link/IstioObjectLink.tsx b/workspaces/kiali/plugins/kiali/src/components/Link/IstioObjectLink.tsx
index ba9f488ba..f13823a83 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Link/IstioObjectLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Link/IstioObjectLink.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { GroupVersionKind } from '../../types/IstioObjects';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Link/ServiceLink.tsx b/workspaces/kiali/plugins/kiali/src/components/Link/ServiceLink.tsx
index 8e594bde9..a6ab93159 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Link/ServiceLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Link/ServiceLink.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 import { PFBadge, PFBadges } from '../../components/Pf/PfBadges';
 import { BackstageObjectLink } from '../../utils/backstageLinks';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Link/ValidationSummaryLink.tsx b/workspaces/kiali/plugins/kiali/src/components/Link/ValidationSummaryLink.tsx
index 6efdc9281..8c4f7a8d6 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Link/ValidationSummaryLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Link/ValidationSummaryLink.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { IstioConfigListLink } from './IstioConfigListLink';
 
 type Props = {
diff --git a/workspaces/kiali/plugins/kiali/src/components/Link/WorkloadLink.tsx b/workspaces/kiali/plugins/kiali/src/components/Link/WorkloadLink.tsx
index 7ae81cd87..805f56864 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Link/WorkloadLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Link/WorkloadLink.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 import { BackstageObjectLink } from '../../utils/backstageLinks';
 import { PFBadge, PFBadges } from '../Pf/PfBadges';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Logos/Logos.tsx b/workspaces/kiali/plugins/kiali/src/components/Logos/Logos.tsx
index 2720e116b..f51c51ce4 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Logos/Logos.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Logos/Logos.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import { default as React } from 'react';
 import GraphqlIcon from '../../assets/img/api/graphql.svg';
 import GrpcIcon from '../../assets/img/api/grpc.svg';
 import RestIcon from '../../assets/img/api/rest.svg';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSIcon.tsx b/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSIcon.tsx
index 2246c8614..57b6666ce 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSIcon.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSIcon.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip, TooltipPosition } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import fullIconDark from '../../assets/img/mtls-status-full-dark.svg';
 import fullIcon from '../../assets/img/mtls-status-full.svg';
 import hollowIconDark from '../../assets/img/mtls-status-partial-dark.svg';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSStatus.tsx b/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSStatus.tsx
index 2678b4352..173524ddf 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MTls/MTLSStatus.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { TooltipPosition } from '@patternfly/react-core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { MTLSIcon } from './MTLSIcon';
 
 type Props = {
diff --git a/workspaces/kiali/plugins/kiali/src/components/MTls/NamespaceMTLSStatus.tsx b/workspaces/kiali/plugins/kiali/src/components/MTls/NamespaceMTLSStatus.tsx
index d65396a07..34e395678 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MTls/NamespaceMTLSStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MTls/NamespaceMTLSStatus.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { MTLSStatuses } from '../../types/TLSStatus';
 import { MTLSIconTypes } from './MTLSIcon';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawer.tsx b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawer.tsx
index 255cda641..cc7dc8bdb 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawer.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawer.tsx
@@ -25,7 +25,7 @@ import {
 } from '@material-ui/core';
 import ExpandMoreRounded from '@material-ui/icons/ExpandMoreRounded';
 import { InfoIcon } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiAppAction } from '../../actions/KialiAppAction';
 import { MessageCenterState } from '../../store';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerGroup.tsx b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerGroup.tsx
index 1084e1f01..bfca75f4b 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerGroup.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerGroup.tsx
@@ -15,7 +15,7 @@
  */
 import { Button, Card, CardActions, CardContent } from '@material-ui/core';
 import { InfoIcon } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { MessageCenterActions } from '../../actions';
 import { KialiAppState, KialiContext } from '../../store';
 import { NotificationGroup } from '../../types/MessageCenter';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerMessage.tsx b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerMessage.tsx
index f7edcb5dd..7ebd557ac 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerMessage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/AlertDrawerMessage.tsx
@@ -23,7 +23,7 @@ import {
 } from '@material-ui/core';
 import ExpandMoreRounded from '@material-ui/icons/ExpandMoreRounded';
 import moment from 'moment';
-import * as React from 'react';
+import { default as React } from 'react';
 import { MessageCenterActions } from '../../actions/MessageCenterActions';
 import { KialiIcon } from '../../config/KialiIcon';
 import { KialiAppState, KialiContext } from '../../store';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/MessageCenter.tsx b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/MessageCenter.tsx
index 0f3f88e71..dc8d1ae8c 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MessageCenter/MessageCenter.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MessageCenter/MessageCenter.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Badge, Button, Drawer } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config/KialiIcon';
 import { KialiAppState, KialiContext } from '../../store';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Metrics/GrafanaLinks.tsx b/workspaces/kiali/plugins/kiali/src/components/Metrics/GrafanaLinks.tsx
index ea8cfc37e..661228b53 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Metrics/GrafanaLinks.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Metrics/GrafanaLinks.tsx
@@ -15,7 +15,7 @@
  */
 import { ToolbarItem } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ExternalLink } from '../../types/Dashboards';
 import { MetricsObjectTypes } from '../../types/Metrics';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Metrics/IstioMetrics.tsx b/workspaces/kiali/plugins/kiali/src/components/Metrics/IstioMetrics.tsx
index 1114078fa..a0674c453 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Metrics/IstioMetrics.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Metrics/IstioMetrics.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { Checkbox, FormControlLabel, Toolbar } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { history, URLParam } from '../../app/History';
 import { Dashboard } from '../../components/Charts/Dashboard';
@@ -212,13 +212,17 @@ export const IstioMetrics = (props: Props) => {
   const refresh = (): void => {
     fetchMetrics();
     if (tracingIntegration) {
-      spanOverlay.fetch({
-        namespace: props.namespace,
-        cluster: props.cluster,
-        target: props.object,
-        targetKind: props.objectType,
-        range: timeRange,
-      });
+      spanOverlay.fetch(
+        {
+          namespace: props.namespace,
+          cluster: props.cluster,
+          target: props.object,
+          targetKind: props.objectType,
+          range: timeRange,
+        },
+        kialiClient,
+        kialiState,
+      );
     }
   };
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Metrics/SpanOverlay.ts b/workspaces/kiali/plugins/kiali/src/components/Metrics/SpanOverlay.ts
index a819a94dd..7f07b1f47 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Metrics/SpanOverlay.ts
+++ b/workspaces/kiali/plugins/kiali/src/components/Metrics/SpanOverlay.ts
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useApi } from '@backstage/core-plugin-api';
-import * as React from 'react';
 import { PFColors } from '../../components/Pf/PfColors';
-import { kialiApiRef } from '../../services/Api';
-import { KialiAppState, KialiContext } from '../../store';
+import { KialiApi } from '../../services/Api';
+import { KialiAppState } from '../../store';
 import {
   durationToBounds,
   guardTimeRange,
@@ -43,8 +41,6 @@ type FetchOptions = {
 export class SpanOverlay {
   private spans: Span[] = [];
   private lastFetchError = false;
-  private kialiClient = useApi(kialiApiRef);
-  private kialiState = React.useContext(KialiContext) as KialiAppState;
 
   constructor(public onChange: (overlay?: Overlay<JaegerLineInfo>) => void) {}
 
@@ -56,7 +52,7 @@ export class SpanOverlay {
     this.spans = spans;
   }
 
-  fetch(opts: FetchOptions) {
+  fetch(opts: FetchOptions, kialiClient: KialiApi, kialiState: KialiAppState) {
     const boundsMillis = guardTimeRange(opts.range, durationToBounds, b => b);
     const defaultFrom = new Date().getTime() - defaultMetricsDuration * 1000;
     const q: TracingQuery = {
@@ -78,10 +74,10 @@ export class SpanOverlay {
     const apiCall =
       // eslint-disable-next-line no-nested-ternary
       opts.targetKind === MetricsObjectTypes.APP
-        ? this.kialiClient.getAppSpans
+        ? kialiClient.getAppSpans
         : opts.targetKind === MetricsObjectTypes.SERVICE
-        ? this.kialiClient.getServiceSpans
-        : this.kialiClient.getWorkloadSpans;
+        ? kialiClient.getServiceSpans
+        : kialiClient.getWorkloadSpans;
     apiCall(opts.namespace, opts.target, q, opts.cluster)
       .then(res => {
         this.lastFetchError = false;
@@ -91,7 +87,7 @@ export class SpanOverlay {
       })
       .catch(err => {
         if (!this.lastFetchError) {
-          this.kialiState.alertUtils!.add(`Could not fetch spans., ${err}`);
+          kialiState.alertUtils!.add(`Could not fetch spans., ${err}`);
           this.lastFetchError = true;
         }
       });
diff --git a/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsReporter.tsx b/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsReporter.tsx
index abbce59ce..40280955a 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsReporter.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsReporter.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { HistoryManager, URLParam } from '../../app/History';
 import { KialiIcon } from '../../config/KialiIcon';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsSettingsDropdown.tsx b/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsSettingsDropdown.tsx
index b832366f1..15c9feede 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsSettingsDropdown.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MetricsOptions/MetricsSettingsDropdown.tsx
@@ -28,7 +28,7 @@ import {
   MenuToggleElement,
 } from '@patternfly/react-core';
 import isEqual from 'lodash/isEqual';
-import * as React from 'react';
+import { default as React } from 'react';
 import { classes } from 'typestyle';
 import { history, URLParam } from '../../app/History';
 import { KialiIcon } from '../../config/KialiIcon';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MissingAuthPolicy/MissingAuthPolicy.tsx b/workspaces/kiali/plugins/kiali/src/components/MissingAuthPolicy/MissingAuthPolicy.tsx
index a223e20d0..d4a48ea88 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MissingAuthPolicy/MissingAuthPolicy.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MissingAuthPolicy/MissingAuthPolicy.tsx
@@ -15,7 +15,7 @@
  */
 import { Tooltip, TooltipPosition } from '@patternfly/react-core';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
-import * as React from 'react';
+import { default as React } from 'react';
 import { icons } from '../../config/Icons';
 import { KialiIcon } from '../../config/KialiIcon';
 import { isIstioNamespace } from '../../config/ServerConfig';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MissingLabel/MissingLabel.tsx b/workspaces/kiali/plugins/kiali/src/components/MissingLabel/MissingLabel.tsx
index a4e4ee9d3..c430d0c4e 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MissingLabel/MissingLabel.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MissingLabel/MissingLabel.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { icons } from '../../config/Icons';
 import { KialiIcon } from '../../config/KialiIcon';
 import { serverConfig } from '../../config/ServerConfig';
diff --git a/workspaces/kiali/plugins/kiali/src/components/MissingSidecar/MissingSidecar.tsx b/workspaces/kiali/plugins/kiali/src/components/MissingSidecar/MissingSidecar.tsx
index 27c585bba..657ede38e 100644
--- a/workspaces/kiali/plugins/kiali/src/components/MissingSidecar/MissingSidecar.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/MissingSidecar/MissingSidecar.tsx
@@ -15,7 +15,7 @@
  */
 import { Tooltip, TooltipPosition } from '@patternfly/react-core';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
-import * as React from 'react';
+import { default as React } from 'react';
 import { icons } from '../../config/Icons';
 import { KialiIcon } from '../../config/KialiIcon';
 import { isIstioNamespace, serverConfig } from '../../config/ServerConfig';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Nav/Page/RenderComponentScroll.tsx b/workspaces/kiali/plugins/kiali/src/components/Nav/Page/RenderComponentScroll.tsx
index 229b36010..6228760e3 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Nav/Page/RenderComponentScroll.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Nav/Page/RenderComponentScroll.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import { default as React } from 'react';
 import { classes } from 'typestyle';
 import { kialiStyle } from '../../../styles/StyleUtils';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/NoData.tsx b/workspaces/kiali/plugins/kiali/src/components/NoData.tsx
index 3efb1bbc9..911f74b68 100644
--- a/workspaces/kiali/plugins/kiali/src/components/NoData.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/NoData.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { EmptyState } from '@backstage/core-components';
-import React from 'react';
 
 const containerStyle = { width: '100%', height: '100%' };
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Overview/TLSInfo.tsx b/workspaces/kiali/plugins/kiali/src/components/Overview/TLSInfo.tsx
index 5b7b8abf5..59af87608 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Overview/TLSInfo.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Overview/TLSInfo.tsx
@@ -15,63 +15,20 @@
  */
 import { Chip, Tooltip } from '@material-ui/core';
 import { useTheme } from '@material-ui/core/styles';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon } from '../../config/KialiIcon';
 import { infoStyle } from '../../pages/Overview/OverviewCard/OverviewCardControlPlaneNamespace';
 import { getChipStyle, kialiStyle } from '../../styles/StyleUtils';
-import { CertsInfo } from '../../types/CertsInfo';
 
 type Props = {
-  certificatesInformationIndicators: boolean;
   version?: string;
-  certsInfo: CertsInfo[];
 };
 
 const lockIconStyle = kialiStyle({ marginLeft: '5px' });
 
-function showCerts(certs: CertsInfo[]) {
-  if (certs) {
-    const rows = certs.map(item => (
-      <div key="showCerts">
-        <div
-          style={{
-            display: 'inline-block',
-            width: '125px',
-            whiteSpace: 'nowrap',
-          }}
-        >
-          From {item.issuer}
-        </div>
-        <div>
-          <div>Issuer: </div>
-          <div>{item.secretName}</div>
-        </div>
-        <div>
-          <div>Valid From: </div>
-          <div>{item.notAfter}</div>
-        </div>
-        <div>
-          <div>Valid To: </div>
-          <div>{item.notBefore}</div>
-        </div>
-      </div>
-    ));
-    return <div>{rows}</div>;
-  }
-  return 'No cert info';
-}
-
-function LockIcon(props: Props) {
-  return props.certificatesInformationIndicators === true ? (
-    <Tooltip placement="top" title={showCerts(props.certsInfo)}>
-      <span data-test="lockerCA">
-        <KialiIcon.MtlsLock className={lockIconStyle} />
-      </span>
-    </Tooltip>
-  ) : (
-    <KialiIcon.MtlsLock className={lockIconStyle} />
-  );
-}
+const LockIcon = (): React.ReactElement => {
+  return <KialiIcon.MtlsLock className={lockIconStyle} />;
+};
 
 export const TLSInfo = (props: Props) => {
   const theme = useTheme();
@@ -96,13 +53,7 @@ export const TLSInfo = (props: Props) => {
           data-test="label-TLS"
           label={
             <div style={{ display: '-webkit-box' }}>
-              {props.version}{' '}
-              <LockIcon
-                certificatesInformationIndicators={
-                  props.certificatesInformationIndicators
-                }
-                certsInfo={props.certsInfo}
-              />
+              {props.version} <LockIcon />
               <Tooltip
                 placement="right"
                 title={
diff --git a/workspaces/kiali/plugins/kiali/src/components/Pf/PfTitle.tsx b/workspaces/kiali/plugins/kiali/src/components/Pf/PfTitle.tsx
index 2b9194bc7..835feefb0 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Pf/PfTitle.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Pf/PfTitle.tsx
@@ -19,7 +19,7 @@ import {
   BundleIcon,
   ServiceIcon,
 } from '@patternfly/react-icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { MissingSidecar } from '../MissingSidecar/MissingSidecar';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Router.tsx b/workspaces/kiali/plugins/kiali/src/components/Router.tsx
index 9a7136d05..e35a59efc 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Router.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Router.tsx
@@ -16,7 +16,6 @@
 import { Entity } from '@backstage/catalog-model';
 import { Content, Page } from '@backstage/core-components';
 import { useEntity } from '@backstage/plugin-catalog-react';
-import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 import { AppDetailsPage } from '../pages/AppDetails/AppDetailsPage';
 import { AppListPage } from '../pages/AppList/AppListPage';
diff --git a/workspaces/kiali/plugins/kiali/src/components/SimpleTable.tsx b/workspaces/kiali/plugins/kiali/src/components/SimpleTable.tsx
index 65c609ccf..7ceac49e6 100644
--- a/workspaces/kiali/plugins/kiali/src/components/SimpleTable.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/SimpleTable.tsx
@@ -22,7 +22,7 @@ import {
   TableHead,
   TableRow,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../styles/StyleUtils';
 
 export interface SortableTh extends TableCellProps {
diff --git a/workspaces/kiali/plugins/kiali/src/components/Tab/TabPanel.tsx b/workspaces/kiali/plugins/kiali/src/components/Tab/TabPanel.tsx
index b98e42908..a29288baa 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Tab/TabPanel.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Tab/TabPanel.tsx
@@ -15,7 +15,6 @@
  */
 import { Box, makeStyles, Typography } from '@material-ui/core';
 import PropTypes from 'prop-types';
-import * as React from 'react';
 
 export const useStyles = makeStyles(theme => ({
   root: {
diff --git a/workspaces/kiali/plugins/kiali/src/components/TextOrLink.tsx b/workspaces/kiali/plugins/kiali/src/components/TextOrLink.tsx
index d30b06cde..7fa26ce80 100644
--- a/workspaces/kiali/plugins/kiali/src/components/TextOrLink.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/TextOrLink.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 
 type TextOrLinkProps = {
   text: string;
diff --git a/workspaces/kiali/plugins/kiali/src/components/Time/LocalTime.tsx b/workspaces/kiali/plugins/kiali/src/components/Time/LocalTime.tsx
index 4ce6ca284..cd7fb1407 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Time/LocalTime.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Time/LocalTime.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { toString } from './Utils';
 
 interface TimeProps {
diff --git a/workspaces/kiali/plugins/kiali/src/components/Time/TimeDurationComponent.tsx b/workspaces/kiali/plugins/kiali/src/components/Time/TimeDurationComponent.tsx
index b181a3c31..193f99982 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Time/TimeDurationComponent.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Time/TimeDurationComponent.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Select } from '@backstage/core-components';
-import * as React from 'react';
+import { default as React } from 'react';
 import { HistoryManager, URLParam } from '../../app/History';
 import { getDurationType } from '../../pages/Overview/OverviewToolbar';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/ToolbarDropdown/ToolbarDropdown.tsx b/workspaces/kiali/plugins/kiali/src/components/ToolbarDropdown/ToolbarDropdown.tsx
index ae5672b5d..7973b94bf 100644
--- a/workspaces/kiali/plugins/kiali/src/components/ToolbarDropdown/ToolbarDropdown.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/ToolbarDropdown/ToolbarDropdown.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { MenuItem, Select, Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 
 const dropdownTitle = kialiStyle({
diff --git a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationList.tsx b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationList.tsx
index 82f9d5af4..ea140d8ae 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationList.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationList.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { ObjectCheck, ValidationTypes } from '../../types/IstioObjects';
 import { highestSeverity } from '../../types/ServiceInfo';
 import { Validation } from './Validation';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationObjectSummary.tsx b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationObjectSummary.tsx
index 06278028f..4e38c1a70 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationObjectSummary.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationObjectSummary.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import {
   ObjectValidation,
   StatusCondition,
diff --git a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationServiceSummary.tsx b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationServiceSummary.tsx
index e9a47b12f..df75c0e2e 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationServiceSummary.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationServiceSummary.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { ObjectValidation, ValidationTypes } from '../../types/IstioObjects';
 import { ValidationSummary } from './ValidationSummary';
 
diff --git a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationStack.tsx b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationStack.tsx
index 8f9a9a359..3895d2996 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationStack.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationStack.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { ObjectCheck, ValidationTypes } from '../../types/IstioObjects';
 import { highestSeverity } from '../../types/ServiceInfo';
diff --git a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationSummary.tsx b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationSummary.tsx
index a93705cfc..36abc026e 100644
--- a/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationSummary.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/Validations/ValidationSummary.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Tooltip, Typography } from '@material-ui/core';
-import * as React from 'react';
 import { CSSProperties } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { StatusCondition, ValidationTypes } from '../../types/IstioObjects';
diff --git a/workspaces/kiali/plugins/kiali/src/components/VirtualList/Config.tsx b/workspaces/kiali/plugins/kiali/src/components/VirtualList/Config.tsx
index 96af014ae..4e7f76c04 100644
--- a/workspaces/kiali/plugins/kiali/src/components/VirtualList/Config.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/VirtualList/Config.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { StatefulFilters } from '../../components/Filters/StatefulFilters';
 import { serverConfig } from '../../config';
 import { isGateway, isWaypoint } from '../../helpers/LabelFilterHelper';
diff --git a/workspaces/kiali/plugins/kiali/src/components/VirtualList/Renderers.tsx b/workspaces/kiali/plugins/kiali/src/components/VirtualList/Renderers.tsx
index bc34b65f5..8a46d8483 100644
--- a/workspaces/kiali/plugins/kiali/src/components/VirtualList/Renderers.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/VirtualList/Renderers.tsx
@@ -24,7 +24,7 @@ import {
 } from '@material-ui/core';
 // eslint-disable-next-line no-restricted-imports
 import { Close } from '@material-ui/icons';
-import * as React from 'react';
+import { default as React } from 'react';
 import { KialiIcon, serverConfig } from '../../config';
 import { isWaypoint } from '../../helpers/LabelFilterHelper';
 import { infoStyle } from '../../pages/Overview/OverviewCard/CanaryUpgradeProgress';
diff --git a/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualItem.tsx b/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualItem.tsx
index 286325a91..e815b1591 100644
--- a/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualItem.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualItem.tsx
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 import { TableRow } from '@material-ui/core';
-import * as React from 'react';
-import { CSSProperties } from 'react';
+import { CSSProperties, default as React } from 'react';
 import { useLinkStyle } from '../../styles/StyleUtils';
 import { hasHealth, Health } from '../../types/Health';
 import { IstioConfigItem } from '../../types/IstioConfigList';
diff --git a/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualList.tsx b/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualList.tsx
index 08d8920f5..faecc7a3d 100644
--- a/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualList.tsx
+++ b/workspaces/kiali/plugins/kiali/src/components/VirtualList/VirtualList.tsx
@@ -26,7 +26,7 @@ import {
   TableRow,
   TableSortLabel,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { kialiStyle } from '../../styles/StyleUtils';
 import { Namespace } from '../../types/Namespace';
 import { NamespaceInfo } from '../../types/NamespaceInfo';
diff --git a/workspaces/kiali/plugins/kiali/src/config/Config.ts b/workspaces/kiali/plugins/kiali/src/config/Config.ts
index 44252da4f..aa564bf87 100644
--- a/workspaces/kiali/plugins/kiali/src/config/Config.ts
+++ b/workspaces/kiali/plugins/kiali/src/config/Config.ts
@@ -146,7 +146,6 @@ const conf = {
         `api/namespaces/${namespace}/apps/${app}/dashboard`,
       appSpans: (namespace: string, app: string) =>
         `api/namespaces/${namespace}/apps/${app}/spans`,
-      canaryUpgradeStatus: () => 'api/mesh/canaries/status',
       clusters: 'api/clusters',
       clustersHealth: () => `api/clusters/health`,
       clustersWorkloads: () => `api/clusters/workloads`,
@@ -200,10 +199,8 @@ const conf = {
         `api/namespaces/${namespace}/validations`,
       configValidations: () => `api/istio/validations`,
       meshTls: () => 'api/mesh/tls',
-      outboundTrafficPolicyMode: () => 'api/mesh/outbound_traffic_policy/mode',
       istioStatus: () => 'api/istio/status',
       istioCertsInfo: () => 'api/istio/certs',
-      istiodResourceThresholds: () => 'api/mesh/resources/thresholds',
       pod: (namespace: string, pod: string) =>
         `api/namespaces/${namespace}/pods/${pod}`,
       podLogs: (namespace: string, pod: string) =>
diff --git a/workspaces/kiali/plugins/kiali/src/config/Icons.ts b/workspaces/kiali/plugins/kiali/src/config/Icons.ts
index 03866f922..b8e2cfbca 100644
--- a/workspaces/kiali/plugins/kiali/src/config/Icons.ts
+++ b/workspaces/kiali/plugins/kiali/src/config/Icons.ts
@@ -27,7 +27,7 @@ import PlayCircleOutlineIcon from '@material-ui/icons/PlayCircleOutline';
 import ScheduleIcon from '@material-ui/icons/Schedule';
 import SecurityIcon from '@material-ui/icons/Security';
 import ShareIcon from '@material-ui/icons/Share';
-import React from 'react';
+import { default as React } from 'react';
 import hollowPinIcon from '../assets/img/hollow-pin.png';
 import solidPinIcon from '../assets/img/solid-pin.png';
 
diff --git a/workspaces/kiali/plugins/kiali/src/config/KialiIcon.tsx b/workspaces/kiali/plugins/kiali/src/config/KialiIcon.tsx
index 1ff394fba..e0a4e38e1 100644
--- a/workspaces/kiali/plugins/kiali/src/config/KialiIcon.tsx
+++ b/workspaces/kiali/plugins/kiali/src/config/KialiIcon.tsx
@@ -72,7 +72,7 @@ import {
   WarningTriangleIcon,
 } from '@patternfly/react-icons';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
-import * as React from 'react';
+import { default as React } from 'react';
 import { classes } from 'typestyle';
 import { PFColors } from '../components/Pf/PfColors';
 import { kialiStyle } from '../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/config/KialiLogo.tsx b/workspaces/kiali/plugins/kiali/src/config/KialiLogo.tsx
index 83f9931cf..38cc43c4f 100644
--- a/workspaces/kiali/plugins/kiali/src/config/KialiLogo.tsx
+++ b/workspaces/kiali/plugins/kiali/src/config/KialiLogo.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 
 export const KialiLogo = () => {
   return (
diff --git a/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiGraphCard.tsx b/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiGraphCard.tsx
index 18c5aa7a4..77e59f7fb 100644
--- a/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiGraphCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiGraphCard.tsx
@@ -16,7 +16,6 @@
 import { CodeSnippet, EmptyState } from '@backstage/core-components';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Box } from '@material-ui/core';
-import * as React from 'react';
 import { TrafficGraphCard } from '../pages/TrafficGraph/TrafficGraphCard';
 import { KialiProvider } from '../store/KialiProvider';
 
diff --git a/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiResourcesCard.tsx b/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiResourcesCard.tsx
index 166c04f36..e2aa9bf94 100644
--- a/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiResourcesCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/dynamic/EntityKialiResourcesCard.tsx
@@ -21,8 +21,7 @@ import {
 } from '@backstage/core-components';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Box } from '@material-ui/core';
-import * as React from 'react';
-import { useRef } from 'react';
+import { default as React, useRef } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { AppListPage } from '../pages/AppList/AppListPage';
 import { ServiceListPage } from '../pages/ServiceList/ServiceListPage';
diff --git a/workspaces/kiali/plugins/kiali/src/dynamic/KialiContext.tsx b/workspaces/kiali/plugins/kiali/src/dynamic/KialiContext.tsx
index e400dd69b..aab8f1e92 100644
--- a/workspaces/kiali/plugins/kiali/src/dynamic/KialiContext.tsx
+++ b/workspaces/kiali/plugins/kiali/src/dynamic/KialiContext.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { useEntity } from '@backstage/plugin-catalog-react';
-import React, { createContext, useContext, useMemo } from 'react';
+import { createContext, useContext, useMemo } from 'react';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useDebounce from 'react-use/lib/useDebounce';
 import { KIALI_NAMESPACE, KIALI_PROVIDER } from '../components/Router';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDescription.tsx b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDescription.tsx
index 84bc76dbc..efcc7afb9 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDescription.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDescription.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Card, CardContent, CardHeader, Typography } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { DetailDescription } from '../../components/DetailDescription/DetailDescription';
 import { HealthIndicator } from '../../components/Health/HealthIndicator';
 import { Labels } from '../../components/Label/Labels';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDetailsPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDetailsPage.tsx
index 7f839e800..b6c38d6b6 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDetailsPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppDetailsPage.tsx
@@ -17,7 +17,7 @@ import { Content, EmptyState } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress, Tab, Tabs } from '@material-ui/core';
 import { AxiosError } from 'axios';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { HistoryManager } from '../../app/History';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppInfo.tsx b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppInfo.tsx
index c4bdb4215..fe811c839 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppInfo.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/AppDetails/AppInfo.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Grid } from '@material-ui/core';
-import React from 'react';
 import { App } from '../../types/App';
 import { DurationInSeconds } from '../../types/Common';
 import { AppHealth } from '../../types/Health';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/AppList/AppListPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/AppList/AppListPage.tsx
index fc26f54a6..ebb592d4a 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/AppList/AppListPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/AppList/AppListPage.tsx
@@ -16,8 +16,7 @@
 import { Entity } from '@backstage/catalog-model';
 import { Content, InfoCard } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
-import * as React from 'react';
-import { useRef } from 'react';
+import { default as React, useRef } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { DefaultSecondaryMasthead } from '../../components/DefaultSecondaryMasthead/DefaultSecondaryMasthead';
 import * as FilterHelper from '../../components/FilterList/FilterHelper';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsOverview.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsOverview.tsx
index 13a732665..4c4991682 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsOverview.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsOverview.tsx
@@ -21,7 +21,7 @@ import {
   Tooltip,
   Typography,
 } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { HistoryManager } from '../../app/History';
 import { Labels } from '../../components/Label/Labels';
 import { PFBadge } from '../../components/Pf/PfBadges';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsPage.tsx
index 1c1000a39..c722abf96 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigDetailsPage.tsx
@@ -17,7 +17,7 @@ import { Content } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { Grid } from '@material-ui/core';
 import jsYaml from 'js-yaml';
-import * as React from 'react';
+import { default as React } from 'react';
 import AceEditor from 'react-ace';
 import { useLocation } from 'react-router-dom';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigReferences.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigReferences.tsx
index eb82005d2..f2fb4e621 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigReferences.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigReferences.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { List, ListItem, Typography } from '@material-ui/core';
-import React from 'react';
 import { ReferenceIstioObjectLink } from '../../components/Link/IstioObjectLink';
 import { ServiceLink } from '../../components/Link/ServiceLink';
 import { WorkloadLink } from '../../components/Link/WorkloadLink';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigValidationReferences.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigValidationReferences.tsx
index 45af96294..563c4d400 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigValidationReferences.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioConfigValidationReferences.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { List, ListItem, Typography } from '@material-ui/core';
-import React from 'react';
 import { ReferenceIstioObjectLink } from '../../components/Link/IstioObjectLink';
 import { ObjectReference } from '../../types/IstioObjects';
 
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioStatusMessageList.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioStatusMessageList.tsx
index 3e7061c30..48404405c 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioStatusMessageList.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigDetails/IstioStatusMessageList.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { List, ListItem, Tooltip, Typography } from '@material-ui/core';
-import React from 'react';
 import { Validation } from '../../components/Validations/Validation';
 import { KialiIcon } from '../../config/KialiIcon';
 import { kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigList/IstioConfigListPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigList/IstioConfigListPage.tsx
index 81a4d5801..b60fa2cae 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/IstioConfigList/IstioConfigListPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/IstioConfigList/IstioConfigListPage.tsx
@@ -16,7 +16,7 @@
 import { Content, InfoCard } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { DefaultSecondaryMasthead } from '../../components/DefaultSecondaryMasthead/DefaultSecondaryMasthead';
 import { KIALI_PROVIDER } from '../../components/Router';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/HelpKiali.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/HelpKiali.tsx
index 435b78a62..a19128cdb 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/HelpKiali.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/HelpKiali.tsx
@@ -15,7 +15,7 @@
  */
 import { Button } from '@material-ui/core';
 import { QuestionCircleIcon } from '@patternfly/react-icons';
-import React from 'react';
+import { default as React } from 'react';
 import { AboutUIModal } from '../../../components/About/AboutUIModal';
 import { KialiAppState, KialiContext } from '../../../store';
 
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeader.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeader.tsx
index f3ab589a2..62d4eca65 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeader.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeader.tsx
@@ -16,7 +16,7 @@
 import { Header } from '@backstage/core-components';
 import { Chip, Tooltip, Typography } from '@material-ui/core';
 import { ClusterIcon } from '@patternfly/react-icons';
-import React from 'react';
+import { default as React } from 'react';
 import { MessageCenter } from '../../../components/MessageCenter/MessageCenter';
 import { homeCluster } from '../../../config';
 import { KialiAppState, KialiContext } from '../../../store';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeaderEntity.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeaderEntity.tsx
index c01c20879..29c1bb28c 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeaderEntity.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiHeaderEntity.tsx
@@ -15,7 +15,7 @@
  */
 import { Chip, Grid, Tooltip } from '@material-ui/core';
 import { ClusterIcon } from '@patternfly/react-icons';
-import React from 'react';
+import { default as React } from 'react';
 import { MessageCenter } from '../../../components/MessageCenter/MessageCenter';
 import { homeCluster } from '../../../config';
 import { KialiAppState, KialiContext } from '../../../store';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiTabs.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiTabs.tsx
index f67a72655..e3d833a32 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiTabs.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/KialiTabs.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { HeaderTabs } from '@backstage/core-components';
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 import { matchRoutes, useNavigate, useParams } from 'react-router-dom';
 import { pluginName } from '../../../plugin';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/NamespaceSelector.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/NamespaceSelector.tsx
index bc428cd51..646334d9e 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/NamespaceSelector.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/NamespaceSelector.tsx
@@ -20,7 +20,7 @@ import {
   MenuItem,
   Select,
 } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { NamespaceActions } from '../../../actions';
 import { KialiAppState, KialiContext } from '../../../store';
 
@@ -33,9 +33,11 @@ export const NamespaceSelector = (props: { page?: boolean }) => {
     } = event;
     kialiState.dispatch.namespaceDispatch(
       NamespaceActions.setActiveNamespaces(
-        (kialiState.namespaces.items || []).filter(ns =>
-          (value as string[]).includes(ns.name),
-        ),
+        (
+          kialiState.namespaces.items?.filter(
+            ns => ns.cluster === kialiState.providers.activeProvider,
+          ) || []
+        ).filter(ns => (value as string[]).includes(ns.name)),
       ),
     );
   };
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/ProviderSelector.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/ProviderSelector.tsx
index 55e0c0579..65c4a9e57 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/ProviderSelector.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/Header/ProviderSelector.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { InputLabel, MenuItem, Select } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { NamespaceActions } from '../../../actions';
 import { ProviderActions } from '../../../actions/ProviderAction';
 import { KIALI_PROVIDER } from '../../../components/Router';
@@ -37,10 +37,15 @@ export const ProviderSelector = (props: { page?: boolean }) => {
       .getNamespaces()
       .then(data => {
         kialiState.dispatch.namespaceDispatch(
-          NamespaceActions.receiveList([...data], new Date()),
+          NamespaceActions.receiveList(
+            [...data.filter(ns => ns.cluster === (value as string))],
+            new Date(),
+          ),
         );
         kialiState.dispatch.namespaceDispatch(
-          NamespaceActions.setActiveNamespaces([...data]),
+          NamespaceActions.setActiveNamespaces([
+            ...data.filter(ns => ns.cluster === (value as string)),
+          ]),
         );
       })
       .catch(_ => {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiEntity.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiEntity.tsx
index d86ab7076..13d19b912 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiEntity.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiEntity.tsx
@@ -16,7 +16,6 @@
 import { Content } from '@backstage/core-components';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Grid } from '@material-ui/core';
-import React from 'react';
 import { baseStyle } from '../../styles/StyleUtils';
 import { IstioConfigCard } from '../Overview/IstioConfigCard';
 import { ListViewPage } from '../Overview/ListView/ListViewPage';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiHelper.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiHelper.tsx
index 647d3b316..d71018ad7 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiHelper.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiHelper.tsx
@@ -20,7 +20,6 @@ import {
   WarningPanel,
 } from '@backstage/core-components';
 import HelpRounded from '@material-ui/icons/HelpRounded';
-import React from 'react';
 import { KialiChecker } from '../../store/KialiProvider';
 
 export const KialiHelper = (props: { check: KialiChecker }) => {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoAnnotation.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoAnnotation.tsx
index 0c14bcee2..3e83a03ca 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoAnnotation.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoAnnotation.tsx
@@ -18,7 +18,6 @@ import {
   MissingAnnotationEmptyState,
   Page,
 } from '@backstage/core-components';
-import React from 'react';
 import { ANNOTATION_SUPPORTED } from '../../components/Router';
 
 export const KialiNoAnnotation = () => {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoResources.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoResources.tsx
index 41da2b49f..654d0add3 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoResources.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiNoResources.tsx
@@ -21,7 +21,6 @@ import {
   Page,
 } from '@backstage/core-components';
 import { Box } from '@material-ui/core';
-import React from 'react';
 import { ANNOTATION_SUPPORTED } from '../../components/Router';
 
 export const KialiNoResources = (props: { entity: Entity }) => {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiPage.tsx
index 15e6145bf..f9727ea56 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/KialiPage.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Content, Page } from '@backstage/core-components';
-import React from 'react';
+import { default as React } from 'react';
 import { AppListPage } from '../AppList/AppListPage';
 import { IstioConfigListPage } from '../IstioConfigList/IstioConfigListPage';
 import { OverviewPage } from '../Overview/OverviewPage';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Kiali/NoPath.tsx b/workspaces/kiali/plugins/kiali/src/pages/Kiali/NoPath.tsx
index f18d53371..62385792e 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Kiali/NoPath.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Kiali/NoPath.tsx
@@ -15,7 +15,6 @@
  */
 import { Content, Link, Page, WarningPanel } from '@backstage/core-components';
 import { useRouteRef } from '@backstage/core-plugin-api';
-import React from 'react';
 import { useLocation } from 'react-router-dom';
 import { rootRouteRef } from '../../routes';
 
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/IstioConfigCard.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/IstioConfigCard.tsx
index 583486913..a5b396846 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/IstioConfigCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/IstioConfigCard.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 import '@backstage/core-components';
 import { Card, CardHeader } from '@material-ui/core';
 import { ENTITY } from '../../types/types';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/ListView/ListViewPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/ListView/ListViewPage.tsx
index c6f7791ee..3e2014720 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/ListView/ListViewPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/ListView/ListViewPage.tsx
@@ -15,7 +15,7 @@
  */
 import { Entity } from '@backstage/catalog-model';
 import { CardTab, TabbedCard } from '@backstage/core-components';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { ENTITY } from '../../../types/types';
 import { AppListPage } from '../../AppList/AppListPage';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/CanaryUpgradeProgress.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/CanaryUpgradeProgress.tsx
index f0ac9034e..6fdc4d322 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/CanaryUpgradeProgress.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/CanaryUpgradeProgress.tsx
@@ -19,7 +19,6 @@ import {
   ChartLabel,
   ChartThemeColor,
 } from '@patternfly/react-charts';
-import * as React from 'react';
 import { KialiIcon } from '../../../config/KialiIcon';
 import { kialiStyle } from '../../../styles/StyleUtils';
 import { CanaryUpgradeStatus } from '../../../types/IstioObjects';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneBadge.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneBadge.tsx
index c8b869d97..27d808a47 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneBadge.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneBadge.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Chip, makeStyles } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { AmbientBadge } from '../../../components/Ambient/AmbientBadge';
 import { IstioStatusInline } from '../../../components/IstioStatus/IstioStatusInline';
 import { serverConfig } from '../../../config';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneNamespaceStatus.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneNamespaceStatus.tsx
index ab73f3ff0..5f655d2a1 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneNamespaceStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneNamespaceStatus.tsx
@@ -15,7 +15,6 @@
  */
 import { Chip, Tooltip } from '@material-ui/core';
 import { useTheme } from '@material-ui/core/styles';
-import * as React from 'react';
 import { KialiIcon } from '../../../config/KialiIcon';
 import { getChipStyle } from '../../../styles/StyleUtils';
 import { OutboundTrafficPolicy } from '../../../types/IstioObjects';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneVersionBadge.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneVersionBadge.tsx
index bddb58a27..988a59385 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneVersionBadge.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/ControlPlaneVersionBadge.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Chip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 
 type Props = {
   version: string;
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceHeader.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceHeader.tsx
index 10bb945b5..513e5aaa3 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceHeader.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceHeader.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { CardHeader, Chip } from '@material-ui/core';
-import React from 'react';
 import { serverConfig } from '../../../config';
 import { CanaryUpgradeStatus } from '../../../types/IstioObjects';
 import { ComponentStatus } from '../../../types/IstioStatus';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceLabels.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceLabels.tsx
index 3e014f56b..f320a3226 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceLabels.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceLabels.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import React from 'react';
 import { KialiIcon } from '../../../config';
 import { infoStyle } from './CanaryUpgradeProgress';
 
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceStatus.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceStatus.tsx
index 6ed8806bc..3ce0ae076 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/NamespaceStatus.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
 import { Paths } from '../../../config';
 import {
   DurationInSeconds,
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCard.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCard.tsx
index 424fec047..adbadac7d 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCard.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Card, CardContent, Grid } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import * as FilterHelper from '../../../components/FilterList/FilterHelper';
 import { NamespaceMTLSStatus } from '../../../components/MTls/NamespaceMTLSStatus';
 import { TLSInfo } from '../../../components/Overview/TLSInfo';
@@ -28,13 +28,9 @@ import {
 } from '../../../types/Common';
 import {
   CanaryUpgradeStatus,
-  OutboundTrafficPolicy,
   ValidationStatus,
 } from '../../../types/IstioObjects';
-import {
-  ComponentStatus,
-  IstiodResourceThresholds,
-} from '../../../types/IstioStatus';
+import { ComponentStatus } from '../../../types/IstioStatus';
 import { NamespaceInfo, NamespaceInfoStatus } from '../NamespaceInfo';
 import { DirectionType, OverviewType } from '../OverviewToolbar';
 import { CanaryUpgradeProgress } from './CanaryUpgradeProgress';
@@ -55,14 +51,13 @@ type OverviewCardProps = {
   direction: DirectionType;
   certsInfo: CertsInfo[];
   minTLS: string;
-  outboundTrafficPolicy: OutboundTrafficPolicy;
-  istiodResourceThresholds?: IstiodResourceThresholds;
   istioStatus: ComponentStatus[];
   healthNs?: NamespaceInfoStatus;
 };
 
 export const OverviewCard = (props: OverviewCardProps) => {
   const isIstioSystem = serverConfig.istioNamespace === props.namespace.name;
+
   const hasCanaryUpgradeConfigured = (): boolean => {
     return props.canaryUpgradeStatus
       ? props.canaryUpgradeStatus.pendingNamespaces.length > 0 ||
@@ -82,7 +77,6 @@ export const OverviewCard = (props: OverviewCardProps) => {
         metrics={props.namespace.metrics}
         errorMetrics={props.namespace.errorMetrics}
         controlPlaneMetrics={props.namespace.controlPlaneMetrics}
-        istiodResourceThresholds={props.istiodResourceThresholds}
       />
     );
     const canaryConfigured = hasCanaryUpgradeConfigured();
@@ -160,18 +154,8 @@ export const OverviewCard = (props: OverviewCardProps) => {
             {!props.entity && <NamespaceStatus {...props} />}
             {isIstioSystem && (
               <>
-                <ControlPlaneNamespaceStatus
-                  outboundTrafficPolicy={props.outboundTrafficPolicy}
-                  namespace={props.namespace}
-                />
-                <TLSInfo
-                  certificatesInformationIndicators={
-                    serverConfig.kialiFeatureFlags
-                      .certificatesInformationIndicators.enabled
-                  }
-                  certsInfo={props.certsInfo}
-                  version={props.minTLS}
-                />
+                <ControlPlaneNamespaceStatus namespace={props.namespace} />
+                <TLSInfo version={props.minTLS} />
               </>
             )}
           </Grid>
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardControlPlaneNamespace.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardControlPlaneNamespace.tsx
index e7193b545..413fea47d 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardControlPlaneNamespace.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardControlPlaneNamespace.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Card, CardContent, Grid, Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { SparklineChart } from '../../../components/Charts/SparklineChart';
 import { PFColors } from '../../../components/Pf/PfColors';
 import { KialiIcon } from '../../../config/KialiIcon';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardDataPlaneNamespace.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardDataPlaneNamespace.tsx
index 5cc86108a..f643eba6b 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardDataPlaneNamespace.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardDataPlaneNamespace.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { SparklineChart } from '../../../components/Charts/SparklineChart';
 import { PFColors } from '../../../components/Pf/PfColors';
 import { DurationInSeconds } from '../../../types/Common';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardSparklineCharts.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardSparklineCharts.tsx
index 2272b72ff..2158ea556 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardSparklineCharts.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/OverviewCardSparklineCharts.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 import { serverConfig } from '../../../config';
 import { DurationInSeconds } from '../../../types/Common';
 import { IstiodResourceThresholds } from '../../../types/IstioStatus';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/RemoteClusterBadge.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/RemoteClusterBadge.tsx
index a26abed3d..cd7782279 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/RemoteClusterBadge.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewCard/RemoteClusterBadge.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Chip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 
 export const RemoteClusterBadge = (): React.JSX.Element => {
   return (
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewPage.tsx
index a4f42e483..d94d37bb4 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewPage.tsx
@@ -23,7 +23,7 @@ import {
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress, Grid } from '@material-ui/core';
 import _ from 'lodash';
-import React, { useRef, useState } from 'react';
+import { default as React, useRef, useState } from 'react';
 import * as FilterHelper from '../../components/FilterList/FilterHelper';
 import { KIALI_PROVIDER } from '../../components/Router';
 import { isMultiCluster, serverConfig } from '../../config';
@@ -43,12 +43,6 @@ import {
   NamespaceWorkloadHealth,
   NOT_READY,
 } from '../../types/Health';
-import {
-  CanaryUpgradeStatus,
-  OutboundTrafficPolicy,
-} from '../../types/IstioObjects';
-import { IstiodResourceThresholds } from '../../types/IstioStatus';
-import { MessageType } from '../../types/MessageCenter';
 import { IstioMetricsOptions } from '../../types/MetricsOptions';
 import { SortField } from '../../types/SortFilters';
 import { nsWideMTLSStatus } from '../../types/TLSStatus';
@@ -108,13 +102,6 @@ export const OverviewPage = (props: { entity?: Entity }) => {
   const prevActiveNs = useRef(activeNsName);
   const promises = new PromisesRegistry();
   const [namespaces, setNamespaces] = React.useState<NamespaceInfo[]>([]);
-  const [outboundTrafficPolicy, setOutboundTrafficPolicy] =
-    React.useState<OutboundTrafficPolicy>({});
-  const [canaryUpgradeStatus, setCanaryUpgradeStatus] = React.useState<
-    CanaryUpgradeStatus | undefined
-  >(undefined);
-  const [istiodResourceThresholds, setIstiodResourceThresholds] =
-    React.useState<IstiodResourceThresholds>({ memory: 0, cpu: 0 });
   const [duration, setDuration] = React.useState<number>(
     FilterHelper.currentDuration(),
   );
@@ -300,56 +287,6 @@ export const OverviewPage = (props: { entity?: Entity }) => {
     });
   };
 
-  const fetchOutboundTrafficPolicyMode = () => {
-    kialiClient
-      .getOutboundTrafficPolicyMode()
-      .then(response => {
-        setOutboundTrafficPolicy({ mode: response.mode });
-      })
-      .catch(error => {
-        kialiState.alertUtils!.addError(
-          'Error fetching Mesh OutboundTrafficPolicy.Mode.',
-          error,
-          'default',
-          MessageType.ERROR,
-        );
-      });
-  };
-
-  const fetchCanariesStatus = () =>
-    kialiClient
-      .getCanaryUpgradeStatus()
-      .then(response => {
-        setCanaryUpgradeStatus({
-          currentVersion: response.currentVersion,
-          upgradeVersion: response.upgradeVersion,
-          migratedNamespaces: response.migratedNamespaces,
-          pendingNamespaces: response.pendingNamespaces,
-        });
-      })
-      .catch(error => {
-        kialiState.alertUtils!.addError(
-          'Error fetching canary upgrade status.',
-          error,
-          'default',
-          MessageType.ERROR,
-        );
-      });
-
-  const fetchIstiodResourceThresholds = () => {
-    kialiClient
-      .getIstiodResourceThresholds()
-      .then(response => setIstiodResourceThresholds(response))
-      .catch(error => {
-        kialiState.alertUtils!.addError(
-          'Error fetching Istiod resource thresholds.',
-          error,
-          'default',
-          MessageType.ERROR,
-        );
-      });
-  };
-
   const fetchValidationResultForCluster = async (
     nss: NamespaceInfo[],
     cluster: string,
@@ -495,9 +432,6 @@ export const OverviewPage = (props: { entity?: Entity }) => {
         fetchHealth(isAscending, sortField, overviewType, sortNs);
         fetchTLS(sortNs, isAscending, sortField);
         fetchValidations(sortNs, isAscending, sortField);
-        fetchOutboundTrafficPolicyMode();
-        fetchCanariesStatus();
-        fetchIstiodResourceThresholds();
         fetchMetrics(sortNs);
         setNamespaces(sortNs);
         promises.waitAll();
@@ -543,7 +477,6 @@ export const OverviewPage = (props: { entity?: Entity }) => {
                 <OverviewCard
                   entity
                   namespace={ns}
-                  canaryUpgradeStatus={canaryUpgradeStatus}
                   istioAPIEnabled={
                     kialiState.statusState.istioEnvironment.istioAPIEnabled
                   }
@@ -553,9 +486,7 @@ export const OverviewPage = (props: { entity?: Entity }) => {
                   refreshInterval={kialiState.userSettings.refreshInterval}
                   certsInfo={kialiState.istioCertsInfo}
                   minTLS={kialiState.meshTLSStatus.minTLS}
-                  istiodResourceThresholds={istiodResourceThresholds}
                   istioStatus={kialiState.istioStatus}
-                  outboundTrafficPolicy={outboundTrafficPolicy}
                 />
               </CardTab>
             ))}
@@ -586,7 +517,6 @@ export const OverviewPage = (props: { entity?: Entity }) => {
                     >
                       <OverviewCard
                         namespace={ns}
-                        canaryUpgradeStatus={canaryUpgradeStatus}
                         istioAPIEnabled={
                           kialiState.statusState.istioEnvironment
                             .istioAPIEnabled
@@ -599,9 +529,7 @@ export const OverviewPage = (props: { entity?: Entity }) => {
                         }
                         certsInfo={kialiState.istioCertsInfo}
                         minTLS={kialiState.meshTLSStatus.minTLS}
-                        istiodResourceThresholds={istiodResourceThresholds}
                         istioStatus={kialiState.istioStatus}
-                        outboundTrafficPolicy={outboundTrafficPolicy}
                       />
                     </Grid>
                   ))}
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewStatus.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewStatus.tsx
index e7a35a4d2..09a84b1b4 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewStatus.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { healthFilter } from '../../components/Filters/CommonFilters';
 import { FilterSelected } from '../../components/Filters/StatefulFilters';
 import { healthIndicatorStyle } from '../../components/Health/HealthStyle';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewToolbar.tsx b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewToolbar.tsx
index f6d105a43..3a3b01912 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewToolbar.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/Overview/OverviewToolbar.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Select, SelectItem } from '@backstage/core-components';
-import React from 'react';
+import { default as React } from 'react';
 import { HistoryManager, URLParam } from '../../app/History';
 import { DefaultSecondaryMasthead } from '../../components/DefaultSecondaryMasthead/DefaultSecondaryMasthead';
 import { TimeDurationComponent } from '../../components/Time/TimeDurationComponent';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDescription.tsx b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDescription.tsx
index 183a193b1..dad01c1f9 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDescription.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDescription.tsx
@@ -20,7 +20,7 @@ import {
   Tooltip,
   Typography,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { HistoryManager } from '../../app/History';
 import { DetailDescription } from '../../components/DetailDescription/DetailDescription';
 import { HealthIndicator } from '../../components/Health/HealthIndicator';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDetailsPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDetailsPage.tsx
index 5a94db287..3b1c7dd73 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDetailsPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceDetailsPage.tsx
@@ -16,7 +16,7 @@
 import { Content, EmptyState } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress, Tab, Tabs } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { HistoryManager } from '../../app/History';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceInfo.tsx b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceInfo.tsx
index 3dde9d178..d53bc671d 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceInfo.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceInfo.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Grid } from '@material-ui/core';
-import React from 'react';
 import { IstioConfigCard } from '../../components/IstioConfigCard/IstioConfigCard';
 import { DurationInSeconds } from '../../types/Common';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceNetwork.tsx b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceNetwork.tsx
index 33157b21b..274a7ae61 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceNetwork.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/ServiceDetails/ServiceNetwork.tsx
@@ -20,7 +20,7 @@ import {
   Tooltip,
   Typography,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { ValidationList } from '../../components/Validations/ValidationList';
 import { KialiIcon } from '../../config/KialiIcon';
 import { cardsHeight, kialiStyle } from '../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/ServiceList/ServiceListPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/ServiceList/ServiceListPage.tsx
index aae4d5822..97afa1066 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/ServiceList/ServiceListPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/ServiceList/ServiceListPage.tsx
@@ -17,8 +17,7 @@ import { Entity } from '@backstage/catalog-model';
 import { Content, InfoCard } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
-import * as React from 'react';
-import { useRef } from 'react';
+import { default as React, useRef } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { DefaultSecondaryMasthead } from '../../components/DefaultSecondaryMasthead/DefaultSecondaryMasthead';
 import * as FilterHelper from '../../components/FilterList/FilterHelper';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/TrafficGraphCard.tsx b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/TrafficGraphCard.tsx
index 46e67f5bd..792820a6e 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/TrafficGraphCard.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/TrafficGraphCard.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
 import '@backstage/core-components';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Card, CardHeader } from '@material-ui/core';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiEdge.tsx b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiEdge.tsx
index ac03c3cfc..edce660b5 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiEdge.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiEdge.tsx
@@ -21,7 +21,7 @@ import {
   WithSelectionProps,
 } from '@patternfly/react-topology';
 import useDetailsLevel from '@patternfly/react-topology/dist/esm/hooks/useDetailsLevel';
-import * as React from 'react';
+import { default as React } from 'react';
 import { classes } from 'typestyle';
 import { PFColors } from '../../../components/Pf/PfColors';
 import { kialiStyle } from '../../../styles/StyleUtils';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiGroup.tsx b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiGroup.tsx
index 001f73729..5e1828d71 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiGroup.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiGroup.tsx
@@ -22,7 +22,7 @@ import {
   WithSelectionProps,
 } from '@patternfly/react-topology';
 import useDetailsLevel from '@patternfly/react-topology/dist/esm/hooks/useDetailsLevel';
-import React from 'react';
+import { default as React } from 'react';
 import { PFColors } from '../../../components/Pf/PfColors';
 
 const ICON_PADDING = 20;
diff --git a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiNode.tsx b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiNode.tsx
index 03cd174a5..13cce9d3e 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiNode.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/TrafficGraph/styles/KialiNode.tsx
@@ -25,7 +25,7 @@ import {
   WithSelectionProps,
 } from '@patternfly/react-topology';
 import useDetailsLevel from '@patternfly/react-topology/dist/esm/hooks/useDetailsLevel';
-import * as React from 'react';
+import { default as React } from 'react';
 import { PFColors } from '../../../components/Pf/PfColors';
 import { kialiStyle } from '../../../styles/StyleUtils';
 
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/PodStatus.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/PodStatus.tsx
index 2712f6d63..b01d7f0a2 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/PodStatus.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/PodStatus.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Tooltip } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { ValidationStack } from '../../components/Validations/ValidationStack';
 import { createIcon } from '../../config/KialiIcon';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/ProxyStatusList.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/ProxyStatusList.tsx
index c70059ace..f009c0739 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/ProxyStatusList.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/ProxyStatusList.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
+import { default as React } from 'react';
 import { PFColors } from '../../components/Pf/PfColors';
 import { kialiStyle } from '../../styles/StyleUtils';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx
index 79187f930..5f238c9a0 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx
@@ -16,7 +16,7 @@
 import { Content, EmptyState } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress, Tab, Tabs } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useAsyncFn, useDebounce } from 'react-use';
 import {
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadInfo.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadInfo.tsx
index b00188d92..a241dab54 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadInfo.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadInfo.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress, Grid } from '@material-ui/core';
-import React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { IstioConfigCard } from '../../components/IstioConfigCard/IstioConfigCard';
 import { isIstioNamespace, serverConfig } from '../../config';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPodLogs.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPodLogs.tsx
index 5fb311187..fda9654c0 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPodLogs.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPodLogs.tsx
@@ -32,7 +32,7 @@ import MenuItem from '@material-ui/core/MenuItem';
 import { Alert } from '@material-ui/lab';
 import memoize from 'micro-memoize';
 import moment from 'moment';
-import * as React from 'react';
+import { default as React } from 'react';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { useAsyncFn, useDebounce } from 'react-use';
 import screenfull, { Screenfull } from 'screenfull';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPods.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPods.tsx
index a18371559..19913027c 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPods.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadPods.tsx
@@ -21,7 +21,7 @@ import {
   Tooltip,
   Typography,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { Labels } from '../../components/Label/Labels';
 import { PFBadge, PFBadges } from '../../components/Pf/PfBadges';
 import { SimpleTable, tRow } from '../../components/SimpleTable';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadsDescription.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadsDescription.tsx
index e540023e4..0ed4eaec8 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadsDescription.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadDetails/WorkloadsDescription.tsx
@@ -20,7 +20,7 @@ import {
   Tooltip,
   Typography,
 } from '@material-ui/core';
-import * as React from 'react';
+import { default as React } from 'react';
 import { AmbientLabel } from '../../components/Ambient/AmbientLabel';
 import { DetailDescription } from '../../components/DetailDescription/DetailDescription';
 import { HealthIndicator } from '../../components/Health/HealthIndicator';
diff --git a/workspaces/kiali/plugins/kiali/src/pages/WorkloadList/WorkloadListPage.tsx b/workspaces/kiali/plugins/kiali/src/pages/WorkloadList/WorkloadListPage.tsx
index 8cafe2888..efef02bb5 100644
--- a/workspaces/kiali/plugins/kiali/src/pages/WorkloadList/WorkloadListPage.tsx
+++ b/workspaces/kiali/plugins/kiali/src/pages/WorkloadList/WorkloadListPage.tsx
@@ -17,8 +17,7 @@ import { Entity } from '@backstage/catalog-model';
 import { Content, InfoCard } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
-import * as React from 'react';
-import { useRef } from 'react';
+import { default as React, useRef } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import { DefaultSecondaryMasthead } from '../../components/DefaultSecondaryMasthead/DefaultSecondaryMasthead';
 import * as FilterHelper from '../../components/FilterList/FilterHelper';
diff --git a/workspaces/kiali/plugins/kiali/src/services/Api.ts b/workspaces/kiali/plugins/kiali/src/services/Api.ts
index 3e9d3783c..da6af63f3 100644
--- a/workspaces/kiali/plugins/kiali/src/services/Api.ts
+++ b/workspaces/kiali/plugins/kiali/src/services/Api.ts
@@ -50,17 +50,12 @@ import {
   IstioConfigsMapQuery,
 } from '../types/IstioConfigList';
 import {
-  CanaryUpgradeStatus,
   LogLevelQuery,
-  OutboundTrafficPolicy,
   PodLogs,
   PodLogsQuery,
   ValidationStatus,
 } from '../types/IstioObjects';
-import {
-  ComponentStatus,
-  IstiodResourceThresholds,
-} from '../types/IstioStatus';
+import { ComponentStatus } from '../types/IstioStatus';
 import { IstioMetricsMap } from '../types/Metrics';
 import { IstioMetricsOptions } from '../types/MetricsOptions';
 import { Namespace } from '../types/Namespace';
@@ -161,9 +156,6 @@ export interface KialiApi {
   ): Promise<AppList>;
   getMeshTls(cluster?: string): Promise<TLSStatus>;
   getNamespaceTls(namespace: string, cluster?: string): Promise<TLSStatus>;
-  getOutboundTrafficPolicyMode(): Promise<OutboundTrafficPolicy>;
-  getCanaryUpgradeStatus(): Promise<CanaryUpgradeStatus>;
-  getIstiodResourceThresholds(): Promise<IstiodResourceThresholds>;
   getConfigValidations(cluster?: string): Promise<ValidationStatus>;
   getAllIstioConfigs(
     objects: string[],
@@ -615,33 +607,6 @@ export class KialiApiClient implements KialiApi {
     ).then(resp => resp);
   };
 
-  getOutboundTrafficPolicyMode = (): Promise<OutboundTrafficPolicy> => {
-    return this.newRequest<OutboundTrafficPolicy>(
-      HTTP_VERBS.GET,
-      urls.outboundTrafficPolicyMode(),
-      {},
-      {},
-    ).then(resp => resp);
-  };
-
-  getCanaryUpgradeStatus = (): Promise<CanaryUpgradeStatus> => {
-    return this.newRequest<CanaryUpgradeStatus>(
-      HTTP_VERBS.GET,
-      urls.canaryUpgradeStatus(),
-      {},
-      {},
-    ).then(resp => resp);
-  };
-
-  getIstiodResourceThresholds = (): Promise<IstiodResourceThresholds> => {
-    return this.newRequest<IstiodResourceThresholds>(
-      HTTP_VERBS.GET,
-      urls.istiodResourceThresholds(),
-      {},
-      {},
-    ).then(resp => resp);
-  };
-
   getConfigValidations = (cluster?: string): Promise<ValidationStatus> => {
     const queryParams: any = {};
     if (cluster) {
@@ -750,6 +715,10 @@ export class KialiApiClient implements KialiApi {
     this.annotations = entity?.metadata.annotations || {};
   };
 
+  setProvider = (cluster: string) => {
+    this.setAnnotation(KIALI_PROVIDER, cluster);
+  };
+
   setAnnotation = (key: string, value: string) => {
     this.annotations[key] = value;
   };
diff --git a/workspaces/kiali/plugins/kiali/src/store/KialiProvider.tsx b/workspaces/kiali/plugins/kiali/src/store/KialiProvider.tsx
index aae6aa7e7..f4f521dd2 100644
--- a/workspaces/kiali/plugins/kiali/src/store/KialiProvider.tsx
+++ b/workspaces/kiali/plugins/kiali/src/store/KialiProvider.tsx
@@ -17,7 +17,7 @@ import { Entity } from '@backstage/catalog-model';
 import { useApi } from '@backstage/core-plugin-api';
 import { CircularProgress } from '@material-ui/core';
 import axios from 'axios';
-import React from 'react';
+import { default as React } from 'react';
 import { useAsyncFn, useDebounce } from 'react-use';
 import {
   HelpDropdownActions,
@@ -129,7 +129,7 @@ export const KialiProvider: React.FC<Props> = ({
   const kialiClient = useApi(kialiApiRef);
   kialiClient.setEntity(entity);
   const alertUtils = new AlertUtils(messageDispatch);
-  const fetchNamespaces = async () => {
+  const fetchNamespaces = async (provider: string) => {
     if (!namespaceState || !namespaceState.isFetching) {
       namespaceDispatch(NamespaceActions.requestStarted());
       return kialiClient
@@ -143,14 +143,21 @@ export const KialiProvider: React.FC<Props> = ({
           } else {
             setNotHaveResources(true);
           }
-          namespaceDispatch(NamespaceActions.setActiveNamespaces([...data]));
+          namespaceDispatch(
+            NamespaceActions.receiveList([...data], new Date()),
+          );
+          namespaceDispatch(
+            NamespaceActions.setActiveNamespaces([
+              ...data.filter(ns => ns.cluster === provider),
+            ]),
+          );
         })
         .catch(() => namespaceDispatch(NamespaceActions.requestFailed()));
     }
     return () => {};
   };
 
-  const fetchPostLogin = async () => {
+  const fetchPostLogin = async (provider: string) => {
     try {
       const getAuthpromise = promises
         .register('getAuth', kialiClient.getAuthInfo())
@@ -176,7 +183,7 @@ export const KialiProvider: React.FC<Props> = ({
       const getIstioStatus = promises
         .register('getIstiostatus', kialiClient.getIstioStatus())
         .then(resp => istioStatusDispatch(IstioStatusActions.setinfo(resp)));
-
+      await fetchNamespaces(provider);
       await Promise.all([
         getAuthpromise,
         getStatusPromise,
@@ -185,7 +192,6 @@ export const KialiProvider: React.FC<Props> = ({
         getIstioCerts,
         getIstioStatus,
       ]);
-      await fetchNamespaces();
     } catch (err) {
       let errDetails: string | undefined = undefined;
       if (axios.isAxiosError(err)) {
@@ -218,7 +224,7 @@ export const KialiProvider: React.FC<Props> = ({
           );
           kialiClient.setAnnotation(KIALI_PROVIDER, status.providers[0]);
         }
-        fetchPostLogin();
+        fetchPostLogin(status.providers[0]);
       }
     } catch (err) {
       let errDetails: string | undefined = undefined;
diff --git a/workspaces/kiali/plugins/kiali/src/utils/SafeRender.tsx b/workspaces/kiali/plugins/kiali/src/utils/SafeRender.tsx
index 8441eec73..dc24debc8 100644
--- a/workspaces/kiali/plugins/kiali/src/utils/SafeRender.tsx
+++ b/workspaces/kiali/plugins/kiali/src/utils/SafeRender.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { ErrorCircleOIcon } from '@patternfly/react-icons';
-import * as React from 'react';
 
 export const canRender = (value: any): boolean => {
   return typeof value !== 'object';
diff --git a/workspaces/kiali/plugins/kiali/src/utils/backstageLinks.tsx b/workspaces/kiali/plugins/kiali/src/utils/backstageLinks.tsx
index f0815cf81..5fcc4958b 100644
--- a/workspaces/kiali/plugins/kiali/src/utils/backstageLinks.tsx
+++ b/workspaces/kiali/plugins/kiali/src/utils/backstageLinks.tsx
@@ -15,7 +15,7 @@
  */
 import { Link } from '@backstage/core-components';
 import { SubRouteRef } from '@backstage/core-plugin-api';
-import * as React from 'react';
+import { default as React } from 'react';
 import { isMultiCluster } from '../config';
 import {
   appDetailRouteRef,
diff --git a/workspaces/kiali/tsconfig.json b/workspaces/kiali/tsconfig.json
index aed5129a4..2417af663 100644
--- a/workspaces/kiali/tsconfig.json
+++ b/workspaces/kiali/tsconfig.json
@@ -9,6 +9,7 @@
   "files": ["node_modules/@backstage/cli/asset-types/asset-types.d.ts"],
   "exclude": ["node_modules"],
   "compilerOptions": {
+    "jsx": "react-jsx",
     "outDir": "dist-types",
     "rootDir": ".",
     "lib": ["DOM", "DOM.Iterable", "ScriptHost", "ES2022"],