diff --git a/package-lock.json b/package-lock.json
index ba3c0ccfe..194e2de13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@hapi/joi-date": "^2.0.1",
         "@hookform/resolvers": "^2.8.8",
         "@monaco-editor/react": "^4.4.5",
-        "@scality/core-ui": "^0.138.0",
+        "@scality/core-ui": "^0.141.0",
         "@scality/module-federation": "^1.3.2",
         "@types/react-table": "^7.7.10",
         "@types/react-virtualized": "^9.21.20",
@@ -4183,9 +4183,9 @@
       }
     },
     "node_modules/@scality/core-ui": {
-      "version": "0.138.0",
-      "resolved": "https://registry.npmjs.org/@scality/core-ui/-/core-ui-0.138.0.tgz",
-      "integrity": "sha512-kjhLrmsd2jI+15FfaWRj0J01k7ZzfB8mMeAJKzQC1bM8Lm96s/vSY599MGCnDw5MKinzUjLuQ5svjKm5nXrdxg==",
+      "version": "0.141.0",
+      "resolved": "https://registry.npmjs.org/@scality/core-ui/-/core-ui-0.141.0.tgz",
+      "integrity": "sha512-wbWla/v+A4ApEn+UvjlAN/Ep8NCls+Ow1CDuY9Jun4v45a2LcxGtcUi+8kusbd1gvLJZHO0LXS7SosEaWQc44A==",
       "dependencies": {
         "@floating-ui/dom": "^1.6.3",
         "@fortawesome/fontawesome-free": "^5.10.2",
@@ -21223,9 +21223,9 @@
       }
     },
     "@scality/core-ui": {
-      "version": "0.138.0",
-      "resolved": "https://registry.npmjs.org/@scality/core-ui/-/core-ui-0.138.0.tgz",
-      "integrity": "sha512-kjhLrmsd2jI+15FfaWRj0J01k7ZzfB8mMeAJKzQC1bM8Lm96s/vSY599MGCnDw5MKinzUjLuQ5svjKm5nXrdxg==",
+      "version": "0.141.0",
+      "resolved": "https://registry.npmjs.org/@scality/core-ui/-/core-ui-0.141.0.tgz",
+      "integrity": "sha512-wbWla/v+A4ApEn+UvjlAN/Ep8NCls+Ow1CDuY9Jun4v45a2LcxGtcUi+8kusbd1gvLJZHO0LXS7SosEaWQc44A==",
       "requires": {
         "@floating-ui/dom": "^1.6.3",
         "@fortawesome/fontawesome-free": "^5.10.2",
diff --git a/package.json b/package.json
index ce578ec4e..3837c615b 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@hapi/joi-date": "^2.0.1",
     "@hookform/resolvers": "^2.8.8",
     "@monaco-editor/react": "^4.4.5",
-    "@scality/core-ui": "^0.138.0",
+    "@scality/core-ui": "^0.141.0",
     "@scality/module-federation": "^1.3.2",
     "@types/react-table": "^7.7.10",
     "@types/react-virtualized": "^9.21.20",
diff --git a/src/react/account/AccountDetails.tsx b/src/react/account/AccountDetails.tsx
index 3bc15fbd7..8522011f6 100644
--- a/src/react/account/AccountDetails.tsx
+++ b/src/react/account/AccountDetails.tsx
@@ -1,21 +1,23 @@
+import { Icon } from '@scality/core-ui';
+import { Tabs } from '@scality/core-ui/dist/next';
+import { useParams } from 'react-router-dom';
 import { useTheme } from 'styled-components';
 import { Account } from '../../types/account';
-import { Tabs } from '@scality/core-ui/dist/next';
-import Properties from './details/Properties';
 import { Warning } from '../ui-elements/Warning';
-import { useParams } from 'react-router-dom';
-import AccountUserList from './AccountUserList';
-import AccountPoliciesList from './AccountPoliciesList';
-import { AccountLocations } from './AccountLocations';
 import { useAuthGroups } from '../utils/hooks';
+import { AccountLocations } from './AccountLocations';
+import AccountPoliciesList from './AccountPoliciesList';
+import AccountUserList from './AccountUserList';
+import Properties from './details/Properties';
+
 type Props = {
   account: Account | null | undefined;
 };
 
 const NotFound = () => (
   <Warning
-    //@ts-expect-error fix this when you are working on it
-    iconClass="fas fa-3x fa-exclamation-triangle"
+    centered={true}
+    icon={<Icon name="Exclamation-triangle" size="3x" />}
     title="Account not found."
   />
 );
diff --git a/src/react/account/AccountUserAccessKeys.tsx b/src/react/account/AccountUserAccessKeys.tsx
index 330ca4129..9161d76f6 100644
--- a/src/react/account/AccountUserAccessKeys.tsx
+++ b/src/react/account/AccountUserAccessKeys.tsx
@@ -21,7 +21,7 @@ import {
   useRouteMatch,
 } from 'react-router-dom';
 import { Column } from 'react-table';
-import styled, { useTheme } from 'styled-components';
+import { useTheme } from 'styled-components';
 import { useIAMClient } from '../IAMProvider';
 import { getUserAccessKeysQuery } from '../queries';
 import { BreadcrumbAccount } from '../ui-elements/Breadcrumb';
@@ -34,15 +34,6 @@ import {
 import AccountUserSecretKeyModal from './AccountUserSecretKeyModal';
 import { TableHeaderWrapper } from '../ui-elements/Table';
 
-const CustomIcon = styled.i`
-  color: ${(props) => props.theme.textSecondary};
-  font-size: 32px;
-  cursor: pointer;
-  :hover {
-    color: ${(props) => props.theme.textPrimary};
-  }
-`;
-
 const CreatedOnCell = (rowValue) => {
   const outdatedAlert = useAccessKeyOutdatedStatus(rowValue);
   return (
@@ -286,8 +277,10 @@ const AccountUserAccessKeys = () => {
       <AppContainer.OverallSummary>
         <Stack withSeparators gap="r32">
           <>
-            <CustomIcon
-              className="fas fa-arrow-left"
+            <Icon
+              name="Arrow-left"
+              size="2x"
+              style={{ cursor: 'pointer' }}
               onClick={() => {
                 history.push('../');
               }}
diff --git a/src/react/databrowser/buckets/ObjectLockSetting.tsx b/src/react/databrowser/buckets/ObjectLockSetting.tsx
index 851651fe3..7411ad21f 100644
--- a/src/react/databrowser/buckets/ObjectLockSetting.tsx
+++ b/src/react/databrowser/buckets/ObjectLockSetting.tsx
@@ -133,7 +133,7 @@ export default function ObjectLockSetting() {
               type="submit"
               variant="primary"
               label="Save"
-              icon={<i className="fas fa-save"></i>}
+              icon={<Icon name="Save" />}
             />
           </Stack>
         }
diff --git a/src/react/databrowser/objects/MetadataSearch.tsx b/src/react/databrowser/objects/MetadataSearch.tsx
index 00d0981da..e506f01d5 100644
--- a/src/react/databrowser/objects/MetadataSearch.tsx
+++ b/src/react/databrowser/objects/MetadataSearch.tsx
@@ -1,20 +1,21 @@
 import { useRef, useState } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
+import styled from 'styled-components';
 
 import { Hint, Hints, HintsTitle } from '../../ui-elements/Input';
 import {
   SearchButton,
-  SearchInputIcon,
   SearchMetadataContainer,
-  SearchMetadataInput,
   SearchMetadataInputAndIcon,
   SearchValidationIcon,
 } from '../../ui-elements/Table';
 import {
   useOutsideClick,
-  useQueryParams,
   usePrefixWithSlash,
+  useQueryParams,
 } from '../../utils/hooks';
+import { Icon, spacing } from '@scality/core-ui';
+import { Input } from '@scality/core-ui/dist/next';
 
 export const METADATA_SEARCH_HINT_ITEMS = [
   {
@@ -50,6 +51,19 @@ export const METADATA_SEARCH_HINT_ITEMS = [
     q: 'replication-status="PENDING"',
   },
 ];
+
+const SearchMetadataInputContainer = styled.div`
+  width: 100%;
+  > div {
+    width: 100%;
+  }
+`;
+const SearchMetadataInput = styled(Input)`
+  background-color: ${(props) => props.theme.backgroundLevel1};
+  padding: 0px ${spacing.r32};
+  max-height: ${spacing.r32};
+  box-sizing: border-box;
+`;
 type Props = {
   isMetadataType: boolean;
   errorZenkoMsg: string | null | undefined;
@@ -110,6 +124,8 @@ const MetadataSearch = ({ isMetadataType, errorZenkoMsg }: Props) => {
     setHintsShown(true);
   };
 
+  const isHidden = !isMetadataType && !errorZenkoMsg;
+
   return (
     <SearchMetadataContainer
       //@ts-expect-error fix this when you are working on it
@@ -121,20 +137,27 @@ const MetadataSearch = ({ isMetadataType, errorZenkoMsg }: Props) => {
           isMetadataType={isMetadataType}
           isError={!!errorZenkoMsg}
         />
-        <SearchMetadataInput
-          //@ts-expect-error fix this when you are working on it
-          disableToggle={true}
-          ref={inputRef}
-          onChange={handleChange}
-          placeholder="Metadata Search"
-          value={inputText}
-          onClick={handleInputClicked}
-        />
-        <SearchInputIcon
-          className="fas fa-times-circle"
+        <SearchMetadataInputContainer>
+          <SearchMetadataInput
+            id="metadata-search-input"
+            ref={inputRef}
+            onChange={handleChange}
+            placeholder="Metadata Search"
+            value={inputText}
+            onClick={handleInputClicked}
+          />
+        </SearchMetadataInputContainer>
+
+        <Icon
+          name="Times-circle"
+          style={{
+            position: 'absolute',
+            visibility: isHidden ? 'hidden' : 'visible',
+            right: '10px',
+            cursor: 'pointer',
+          }}
+          //@ts-expect-error Need to improve typing on core-ui for including the event
           onClick={reset}
-          //@ts-expect-error fix this when you are working on it
-          isHidden={!isMetadataType && !errorZenkoMsg ? 1 : 0}
         />
       </SearchMetadataInputAndIcon>
       {hintsShown && !inputText && (
diff --git a/src/react/databrowser/objects/ObjectListTable.tsx b/src/react/databrowser/objects/ObjectListTable.tsx
index 47936ff49..72b7ab338 100644
--- a/src/react/databrowser/objects/ObjectListTable.tsx
+++ b/src/react/databrowser/objects/ObjectListTable.tsx
@@ -5,10 +5,9 @@ import { AutoSizer } from 'react-virtualized';
 import { FixedSizeList } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { List } from 'immutable';
-import { FormattedDateTime, PrettyBytes, Text } from '@scality/core-ui';
+import { FormattedDateTime, Icon, PrettyBytes, Text } from '@scality/core-ui';
 import { convertRemToPixels } from '@scality/core-ui/dist/utils';
 import { spacing } from '@scality/core-ui';
-import styled from 'styled-components';
 import { useHistory, useParams } from 'react-router-dom';
 import { useQuery } from 'react-query';
 
@@ -34,10 +33,6 @@ import { useAccountsLocationsAndEndpoints } from '../../next-architecture/domain
 import { useAccountsLocationsEndpointsAdapter } from '../../next-architecture/ui/AccountsLocationsEndpointsAdapterProvider';
 import { EmptyCell } from '@scality/core-ui/dist/components/tablev2/Tablev2.component';
 
-export const Icon = styled.i<{ isMargin?: boolean }>`
-  margin-right: ${spacing.r4};
-  margin-left: ${(props) => (props.isMargin ? spacing.r16 : '0px')};
-`;
 type CellProps = {
   row: {
     original: ObjectEntity;
@@ -195,7 +190,7 @@ export default function ObjectListTable({
           if (original.isFolder) {
             return (
               <span>
-                <Icon className="far fa-folder"></Icon>
+                <Icon name="Folder" />
                 <T.CellClick
                   onClick={handleCellClicked(bucketName, original.key)}
                 >
@@ -205,14 +200,16 @@ export default function ObjectListTable({
             );
           }
 
+          const iconStyle = {
+            marginRight: spacing.r4,
+            marginLeft: !original.isLatest ? spacing.r16 : 0,
+          };
+
           if (original.isDeleteMarker) {
             return (
               <span>
                 {' '}
-                <Icon
-                  isMargin={!original.isLatest}
-                  className="fas fa-ban"
-                ></Icon>
+                <Icon style={iconStyle} name="Deletion-marker" />
                 {original.name}
               </span>
             );
@@ -220,19 +217,14 @@ export default function ObjectListTable({
 
           return (
             <span>
-              <Icon
-                isMargin={!original.isLatest}
-                className="far fa-file"
-              ></Icon>
+              <Icon style={iconStyle} name="File" />
               {original.lockStatus === 'LOCKED' && (
-                <Icon className="fa fa-lock"></Icon>
+                <Icon style={iconStyle} name="Lock" />
               )}
               {original.lockStatus === 'RELEASED' && (
-                <Icon className="fa fa-lock-open"></Icon>
-              )}
-              {original.isLegalHoldEnabled && (
-                <Icon className="fas fa-balance-scale"></Icon>
+                <Icon style={iconStyle} name="Lock-open" />
               )}
+              {original.isLegalHoldEnabled && <Icon name="Rebalance" />}
               {isObjectInColdStorage &&
               (headObjectStatus === 'idle' ||
                 headObjectStatus === 'loading' ||
diff --git a/src/react/locations/LocationDetails/LocationDetails.tsx b/src/react/locations/LocationDetails/LocationDetails.tsx
index b67a58478..f90ad3fb2 100644
--- a/src/react/locations/LocationDetails/LocationDetails.tsx
+++ b/src/react/locations/LocationDetails/LocationDetails.tsx
@@ -4,7 +4,7 @@ import {
   LocationTypeKey,
 } from '../../../types/config';
 import React from 'react';
-import { Tooltip } from '@scality/core-ui';
+import { Tooltip, Icon } from '@scality/core-ui';
 import { storageOptions } from './storageOptions';
 
 type Props = {
@@ -66,7 +66,7 @@ export default class LocationDetails extends React.Component<Props> {
       } else if (this.props.repStatus === 'disabled') {
         msg = (
           <div>
-            <span className="mr-2 fa fa-exclamation-circle" />
+            <Icon name="Exclamation-triangle" />
             <span>
               Your instance failed to automatically resume this location. Please
               resume manually.
diff --git a/src/react/locations/LocationEditor.tsx b/src/react/locations/LocationEditor.tsx
index 1dbcb614d..cdd221a65 100644
--- a/src/react/locations/LocationEditor.tsx
+++ b/src/react/locations/LocationEditor.tsx
@@ -357,7 +357,7 @@ function LocationEditor() {
           content={
             <Select
               id="locationType"
-              placeholder="Select an option..."
+              placeholder="Select a location type..."
               onChange={onTypeChange}
               disabled={editingExisting}
               //@ts-expect-error fix this when you are working on it
diff --git a/src/react/locations/__tests__/LocationEditor.test.tsx b/src/react/locations/__tests__/LocationEditor.test.tsx
index d837c587f..a008ff1f0 100644
--- a/src/react/locations/__tests__/LocationEditor.test.tsx
+++ b/src/react/locations/__tests__/LocationEditor.test.tsx
@@ -22,6 +22,7 @@ import { INSTANCE_ID } from '../../actions/__tests__/utils/testUtil';
 import userEvent from '@testing-library/user-event';
 import { rest } from 'msw';
 
+jest.setTimeout(60_000);
 const server = setupServer(getConfigOverlay(TEST_API_BASE_URL, INSTANCE_ID));
 
 beforeAll(() => {
@@ -73,7 +74,11 @@ describe('LocationEditor', () => {
   });
   const selectors = {
     loadingLocation: () => screen.getByText('Loading location...'),
-    locationType: () => screen.getByLabelText(/location type \*/i),
+    selectLocationType: () => screen.getByLabelText(/location type \*/i),
+    inputLocationType: () =>
+      screen.getByRole('textbox', { name: /location type \*/i }),
+    optionLocationType: (locationName: string | RegExp) =>
+      screen.getByRole('option', { name: locationName }),
   };
 
   it('should hide the artesca storage service if it is already created', async () => {
@@ -104,10 +109,127 @@ describe('LocationEditor', () => {
     render(<LocationEditor />, { wrapper: Wrapper });
     await waitForElementToBeRemoved(() => selectors.loadingLocation());
     //E
-    selectClick(selectors.locationType());
+    selectClick(selectors.selectLocationType());
     //V
     await waitFor(() => {
       expect(screen.queryByText('Storage Service for ARTESCA')).toBeNull();
     });
   });
+
+  it(`test if each location display correctly`, async () => {
+    reduxRender(
+      <MemoryRouter>
+        <LocationEditor />
+      </MemoryRouter>,
+    );
+
+    await waitForElementToBeRemoved(() =>
+      screen.getByText('Loading location...'),
+    );
+
+    const locationsTests = [
+      {
+        name: 'Scality ARTESCA S3',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Scality ARTESCA S3/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: 'Scality RING with S3 Connector',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Scality RING with S3 Connector/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: 'Amazon S3',
+        optionToQuery: () => selectors.optionLocationType(/Amazon S3/i),
+        checkField: () => screen.getByText(/AWS Access Key \*/i),
+      },
+      {
+        name: 'Google Cloud Storage',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Google Cloud Storage/i),
+        checkField: () => screen.getByText(/GCP Access Key \*/i),
+      },
+      {
+        name: 'Microsoft Azure Blob Storage',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Microsoft Azure Blob Storage/i),
+        checkField: () => screen.getByText(/Blob endpoint \*/i),
+      },
+      {
+        name: 'Microsoft Azure Archive',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Microsoft Azure Archive/i),
+        checkField: () => screen.getByText(/Blob endpoint \*/i),
+      },
+      {
+        name: 'Atlas Object Storage (Free Pro)',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Atlas Object Storage \(Free Pro\)/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: '3DS Outscale OOS Public',
+        optionToQuery: () =>
+          selectors.optionLocationType(/3DS Outscale OOS Public/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: '3DS Outscale OOS SNC',
+        optionToQuery: () =>
+          selectors.optionLocationType(/3DS Outscale OOS SNC/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: 'Flexible Datastore',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Flexible Datastore/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: 'Tape DMF',
+        optionToQuery: () => selectors.optionLocationType(/Tape DMF/i),
+        checkField: () => screen.getByText(/Temperature/i),
+      },
+      {
+        name: 'Ceph RADOS Gateway',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Ceph RADOS Gateway/i),
+        checkField: () => screen.getByText(/access key \*/i),
+      },
+      {
+        name: 'Scality RING with Sproxyd Connector',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Scality RING with Sproxyd Connector/i),
+        checkField: () => screen.getByText(/Bootstrap List \*/i),
+      },
+      {
+        name: 'Wasabi',
+        optionToQuery: () => selectors.optionLocationType(/Wasabi/i),
+        checkField: () => screen.getByText(/Wasabi Access Key \*/i),
+      },
+      {
+        name: 'Oracle Cloud Object Storage',
+        optionToQuery: () =>
+          selectors.optionLocationType(/Oracle Cloud Object Storage/i),
+        checkField: () => screen.getByText(/Namespace \*/i),
+      },
+    ];
+
+    for await (const location of locationsTests) {
+      await userEvent.click(screen.getByLabelText(/select a location type/i));
+
+      await userEvent.clear(
+        screen.getByRole('textbox', { name: /location type \*/i }),
+      );
+      await userEvent.type(
+        screen.getByRole('textbox', { name: /location type \*/i }),
+        location.name,
+      );
+
+      await userEvent.click(location.optionToQuery());
+      expect(location.checkField()).toBeInTheDocument();
+    }
+  });
 });
diff --git a/src/react/ui-elements/Table.tsx b/src/react/ui-elements/Table.tsx
index df8bf5ba7..6da3da2ef 100644
--- a/src/react/ui-elements/Table.tsx
+++ b/src/react/ui-elements/Table.tsx
@@ -1,6 +1,6 @@
 import { fontSize } from '@scality/core-ui/dist/style/theme';
 
-import { spacing, SecondaryText, Wrap } from '@scality/core-ui';
+import { spacing, SecondaryText, Wrap, Icon } from '@scality/core-ui';
 import { Box, Button, Input } from '@scality/core-ui/dist/next';
 import { Link } from 'react-router-dom';
 
@@ -68,9 +68,7 @@ export const HeadCell = styled.th`
   text-align: left;
   padding: ${spacing.r16};
 `;
-export const Icon = styled.i`
-  margin-left: ${spacing.r4};
-`;
+
 // * table body
 export const Body = styled.tbody`
   // following is needed to display scroll bar onto the table
@@ -192,46 +190,30 @@ const Table = styled.table`
   border-collapse: collapse;
 `;
 // specific to listobject/md search
-export const SearchMetadataInput = styled(Input)`
-  background-color: ${(props) => props.theme.backgroundLevel1};
-  padding: 0px ${spacing.r32};
-  max-height: ${spacing.r32};
-  box-sizing: border-box;
-`;
 export const ContainerWithSubHeader = styled(Container)`
   height: 100%;
   margin-top: 0px;
 `;
-export const SearchInputIcon = styled.i<{ isHidden?: boolean }>`
-  position: absolute;
-  visibility: ${(props) => (props.isHidden ? 'hidden' : 'visible')};
-  right: 10px;
-  cursor: pointer;
-  &:hover {
-    color: ${(props) => props.theme.infoPrimary};
-  }
-`;
-const ValidationIcon = styled.i`
-  position: absolute;
-  left: 10px;
-  color: ${(props) =>
-    props.className === 'fa fa-times'
-      ? props.theme.statusCritical
-      : props.className === 'fas fa-check'
-      ? props.theme.statusHealthy
-      : props.theme.infoSecondary};
-`;
+
 type Props = {
   isMetadataType: boolean;
   isError: boolean;
 };
 export const SearchValidationIcon = ({ isMetadataType, isError }: Props) => {
-  const className = isError
-    ? 'fa fa-times'
-    : isMetadataType
-    ? 'fas fa-check'
-    : 'fas fa-search';
-  return <ValidationIcon className={className} />;
+  const style = {
+    position: 'absolute' as const,
+    left: '10px',
+    marginLeft: `${spacing.r4}`,
+  };
+  if (isError) {
+    return <Icon name="Close" color="statusCritical" style={style} />;
+  }
+
+  if (isMetadataType) {
+    return <Icon name="Check" color="statusHealthy" style={style} />;
+  }
+
+  return <Icon name="Search" color="infoPrimary" style={style} />;
 };
 export const SearchButton = styled(Button)`
   flex: 0 0 auto;
diff --git a/src/react/utils/storageOptions.ts b/src/react/utils/storageOptions.ts
index e59e051bf..9aff3637a 100644
--- a/src/react/utils/storageOptions.ts
+++ b/src/react/utils/storageOptions.ts
@@ -66,7 +66,7 @@ export const getLocationTypeKey = (
         return OUTSCALE_PUBLIC_S3_LOCATION_KEY;
       } else if (location.details.endpoint === OUTSCALE_SNC_S3_ENDPOINT) {
         return OUTSCALE_SNC_S3_LOCATION_KEY;
-      } else if (location.details.endpoint.endsWith('oraclecloud.com')) {
+      } else if (location.details.endpoint?.endsWith('oraclecloud.com')) {
         return ORACLE_CLOUD_LOCATION_KEY;
       } else {
         return 'locationType' in location
diff --git a/tsconfig.json b/tsconfig.json
index 38de1f0b3..7c09d7c6f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
 
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "target": "es2021" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     "lib": [
       "es2021",