diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a74a8ad7..6a8a8d974 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -234,7 +234,6 @@ workflows:
                           ignore:
                               - master
                               - qa
-                              - profiles-app
 
             - build-qa:
                   context: org-global
@@ -242,7 +241,6 @@ workflows:
                       branches:
                           only:
                               - qa
-                              - profiles-app
 
             - build-prod:
                   context: org-global
@@ -261,7 +259,7 @@ workflows:
                               - dev
                               - justin_fixes
                               - talent_search_fixes
-                              - PROD-4398_integrate-userflow-remove-sprig
+                              - feature/standardized-skills
 
             - deployQa:
                   context: org-global
diff --git a/package.json b/package.json
index 2ef92fbc4..584a7f6a9 100644
--- a/package.json
+++ b/package.json
@@ -246,5 +246,9 @@
         }
       }
     ]
+  },
+  "volta": {
+    "node": "16.15.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/src/apps/accounts/src/lib/assets/security/credential.png b/src/apps/accounts/src/lib/assets/security/credential.png
new file mode 100644
index 000000000..914e8d04f
Binary files /dev/null and b/src/apps/accounts/src/lib/assets/security/credential.png differ
diff --git a/src/apps/accounts/src/lib/assets/security/index.ts b/src/apps/accounts/src/lib/assets/security/index.ts
index 8b87173a7..4559e27b4 100644
--- a/src/apps/accounts/src/lib/assets/security/index.ts
+++ b/src/apps/accounts/src/lib/assets/security/index.ts
@@ -1,6 +1,6 @@
 import { ReactComponent as MFAImage } from './mfa.svg'
 import { ReactComponent as AppleStore } from './apple-store.svg'
-import { ReactComponent as UnSuccessfullDiceVerificationIcon } from './unsuccessful.svg'
+import credentialImage from './credential.png'
 import diceIdLogo from './dicelogo.png'
 import diceIdLogoBig from './dicelogobig.png'
 import diceIdLogoSmall from './dicelogosmall.png'
@@ -8,10 +8,10 @@ import googlePlay from './google-play.png'
 
 export {
     AppleStore,
+    credentialImage,
     diceIdLogo,
     diceIdLogoBig,
     diceIdLogoSmall,
     googlePlay,
     MFAImage,
-    UnSuccessfullDiceVerificationIcon,
 }
diff --git a/src/apps/accounts/src/settings/tabs/account/security/Security.tsx b/src/apps/accounts/src/settings/tabs/account/security/Security.tsx
index f8a608d40..f521783bf 100644
--- a/src/apps/accounts/src/settings/tabs/account/security/Security.tsx
+++ b/src/apps/accounts/src/settings/tabs/account/security/Security.tsx
@@ -1,9 +1,8 @@
 import { Dispatch, FC, SetStateAction, useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import { KeyedMutator } from 'swr'
-import { noop } from 'lodash'
 
-import { Button, Collapsible, FormToggleSwitch, IconSolid, Tooltip } from '~/libs/ui'
+import { Button, Collapsible, FormToggleSwitch } from '~/libs/ui'
 import { diceIdLogo, MFAImage, SettingSection, triggerSurvey } from '~/apps/accounts/src/lib'
 import { MemberMFAStatus, updateMemberMFAStatusAsync, useMemberMFAStatus, UserProfile } from '~/libs/core'
 
@@ -23,10 +22,12 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
     } = useMemberMFAStatus(props.profile.userId)
 
     const [mfaEnabled, setMFAEnabled]: [boolean, Dispatch<SetStateAction<boolean>>] = useState(false)
+    const [diceEnabled, setDiceEnabled]: [boolean, Dispatch<SetStateAction<boolean>>] = useState(false)
 
     useEffect(() => {
         if (mfaStatusData) {
             setMFAEnabled(mfaStatusData.mfaEnabled)
+            setDiceEnabled(mfaStatusData.diceEnabled)
         }
     }, [mfaStatusData])
 
@@ -36,8 +37,9 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
                 mfaEnabled: !mfaEnabled,
             },
         })
-            .then(() => {
-                setMFAEnabled(!mfaEnabled)
+            .then(response => {
+                setMFAEnabled(response.result.content.mfaEnabled)
+                setDiceEnabled(response.result.content.diceEnabled)
                 toast.success('Your Multi Factor Authentication (MFA) status was updated.')
                 triggerSurvey()
             })
@@ -46,6 +48,27 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
             })
     }
 
+    function handleUserDiceChange(): void {
+        if (!diceEnabled) {
+            return
+        }
+
+        updateMemberMFAStatusAsync(props.profile.userId, {
+            param: {
+                diceEnabled: !diceEnabled,
+            },
+        })
+            .then(response => {
+                setMFAEnabled(response.result.content.mfaEnabled)
+                setDiceEnabled(response.result.content.diceEnabled)
+                toast.success('Your DICE credential was disabled.')
+                triggerSurvey()
+            })
+            .catch(() => {
+                toast.error('Something went wrong. Please try again later.')
+            })
+    }
+
     function handleDiceModalStatus(): void {
         setSetupDiceModalOpen(!setupDiceModalOpen)
     }
@@ -70,7 +93,6 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
                         name='mfaStatus'
                         onChange={handleUserMFAChange}
                         value={mfaEnabled}
-                        disabled={mfaStatusData?.diceEnabled}
                     />
                 )}
             />
@@ -86,12 +108,11 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
                 actionElement={(
                     <div className={styles.diceBtnWrap}>
                         {
-                            mfaStatusData?.diceEnabled ? (
+                            diceEnabled ? (
                                 <FormToggleSwitch
                                     name='diceEnabled'
-                                    onChange={noop}
+                                    onChange={handleUserDiceChange}
                                     value={mfaStatusData?.diceEnabled as boolean}
-                                    disabled={mfaStatusData?.diceEnabled}
                                 />
                             ) : (
                                 <Button
@@ -104,15 +125,6 @@ const Security: FC<SecurityProps> = (props: SecurityProps) => {
                                 />
                             )
                         }
-                        {
-                            mfaStatusData?.diceEnabled && (
-                                <Tooltip
-                                    content='Please reach out to support@topcoder.com for deactivating Dice ID.'
-                                >
-                                    <IconSolid.InformationCircleIcon />
-                                </Tooltip>
-                            )
-                        }
                     </div>
                 )}
             />
diff --git a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/ConnectionHandler/index.tsx b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/ConnectionHandler/index.tsx
new file mode 100644
index 000000000..07e3f7075
--- /dev/null
+++ b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/ConnectionHandler/index.tsx
@@ -0,0 +1,24 @@
+import { FC, useEffect } from 'react'
+
+import { DiceConnectionStatus, useDiceIdConnection } from '~/libs/core'
+
+interface ConnectionHandlerProps {
+    onChange: (newStatus: DiceConnectionStatus) => void;
+    userId: number;
+}
+
+export const ConnectionHandler: FC<ConnectionHandlerProps> = (
+    props: ConnectionHandlerProps,
+) => {
+    const diceConnection: DiceConnectionStatus | undefined = useDiceIdConnection(props.userId)
+
+    useEffect(() => {
+        if (diceConnection) {
+            props.onChange(diceConnection)
+        }
+    }, [diceConnection, props])
+
+    return (
+        <></>
+    )
+}
diff --git a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.module.scss b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.module.scss
index dd1329b65..0fe6f3dec 100644
--- a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.module.scss
+++ b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.module.scss
@@ -34,6 +34,12 @@
         margin: auto;
     }
 
+    .credentialImage {
+        height: 280px;
+        width: 400px;
+        align-self: center;
+    }
+
     .diceBigLogo {
         margin: $sp-4 0;
     }
diff --git a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.tsx b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.tsx
index 6f3d6a2e9..1b03bce41 100644
--- a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.tsx
+++ b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/DiceSetupModal.tsx
@@ -1,25 +1,24 @@
-import { Dispatch, FC, SetStateAction, useEffect, useState } from 'react'
+/* eslint-disable complexity */
+import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { QRCodeSVG } from 'qrcode.react'
-import { get, isUndefined, lowerCase } from 'lodash'
 import { toast } from 'react-toastify'
 import { KeyedMutator } from 'swr'
 
 import { BaseModal, Button } from '~/libs/ui'
 import {
     AppleStore,
+    credentialImage,
     diceIdLogoBig,
     diceIdLogoSmall,
     googlePlay,
-    UnSuccessfullDiceVerificationIcon,
 } from '~/apps/accounts/src/lib'
-import { DiceConnectionStatus, updateMemberMFAStatusAsync, useDiceIdConnection, UserProfile } from '~/libs/core'
-import { EnvironmentConfig } from '~/config'
+import { DiceConnectionStatus, UserProfile } from '~/libs/core'
 
-import { VerificationListener } from './VerificationListener'
+import { ConnectionHandler } from './ConnectionHandler'
 import styles from './DiceSetupModal.module.scss'
 
 const GooglePlayLink: string = 'https://play.google.com/store/apps/details?id=com.diwallet1'
-const AppleStoreLink: string = 'https://apps.apple.com/us/app/dice-id/id1548148979'
+const AppleStoreLink: string = 'https://apps.apple.com/us/app/dice-id/id1624858853'
 interface DiceSetupModalProps {
     mutateMFAData: KeyedMutator<any>
     onClose: () => void
@@ -29,24 +28,7 @@ interface DiceSetupModalProps {
 const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) => {
     const [step, setStep]: [number, Dispatch<SetStateAction<number>>] = useState(1)
 
-    const [diceConnectionId, setDiceConnectionId]: [
-        number | undefined,
-        Dispatch<SetStateAction<number | undefined>>
-    ] = useState()
-
-    const diceConnection: DiceConnectionStatus | undefined = useDiceIdConnection(props.profile.userId, diceConnectionId)
-
-    const [isVerificationProcessing, setIsVerificationProcessing]: [boolean, Dispatch<SetStateAction<boolean>>]
-        = useState(false)
-
-    useEffect(() => {
-        if (diceConnection && !diceConnectionId) {
-            setDiceConnectionId(diceConnection.id)
-        }
-    }, [
-        diceConnection,
-        diceConnectionId,
-    ])
+    const [diceConnectionUrl, setDiceConnectionUrl] = useState<string>()
 
     function handleSecondaryButtonClick(): void {
         switch (step) {
@@ -58,42 +40,25 @@ const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) =>
     function handlePrimaryButtonClick(): void {
         switch (step) {
             case 1:
-            case 2:
                 return setStep(step + 1)
             default: return props.onClose()
         }
     }
 
-    function verificationCallback(data: any): void {
-        if (data.success) {
-            const userEmail: string = get(data, 'user.profile.Email')
-            if (!isUndefined(userEmail) && lowerCase(userEmail) === lowerCase(props.profile.email)) {
-                updateMemberMFAStatusAsync(props.profile.userId, {
-                    param: {
-                        diceEnabled: true,
-                    },
-                })
-                    .then(() => {
-                        props.mutateMFAData()
-                        setStep(4)
-                        // eslint-disable-next-line max-len
-                        toast.success('Your credentials have been verified and you are all set for MFA using your decentralized identity (DICE ID).')
-                    })
-                    .catch(() => {
-                        toast.error('Something went wrong. Please try again later.')
-                    })
-            } else {
-                setStep(5)
-            }
-        } else {
-            setStep(5)
+    function handleDiceConnectionStatusChange(newStatus: DiceConnectionStatus): void {
+        if (newStatus.diceEnabled) {
+            setStep(4)
+            toast.success('Your credentials have been verified and you are all set for'
+             + ' MFA using your decentralized identity (DICE ID).')
+            props.mutateMFAData()
+        } else if (newStatus.accepted) {
+            setStep(3)
+        } else if (newStatus.connection) {
+            setDiceConnectionUrl(newStatus.connection)
+            setStep(2)
         }
     }
 
-    function onStartProcessing(): void {
-        setIsVerificationProcessing(true)
-    }
-
     return (
         <BaseModal
             open
@@ -117,12 +82,11 @@ const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) =>
                         onClick={handleSecondaryButtonClick}
                     />
                     {
-                        step !== 3 && (
+                        (step === 1 || step === 4) && (
                             <Button
                                 primary
-                                label={(step === 4 || step === 5) ? 'Finish' : 'Next'}
+                                label={step === 4 ? 'Finish' : 'Next'}
                                 onClick={handlePrimaryButtonClick}
-                                disabled={step === 2 && !diceConnection?.accepted}
                             />
                         )
                     }
@@ -187,26 +151,32 @@ const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) =>
             {
                 step === 2 && (
                     <>
-                        <p>Scan the following DICE ID QR Code in your DICE ID mobile application.</p>
-                        {
-                            diceConnection ? (
-                                <QRCodeSVG
-                                    value={diceConnection.connection as string}
-                                    size={300}
-                                    className={styles.qrCode}
-                                    includeMargin
-                                />
-                            ) : (
-                                <p>Loading...</p>
-                            )
-                        }
+                        <ConnectionHandler
+                            onChange={handleDiceConnectionStatusChange}
+                            userId={props.profile.userId}
+                        />
                         <p>
-                            Once the connection is established, the service will offer you
-                            a Verifiable Credential.
+                            Scan the following DICE ID QR Code in your DICE ID
+                            mobile application.
+                        </p>
+                        {diceConnectionUrl ? (
+                            <QRCodeSVG
+                                value={diceConnectionUrl}
+                                size={300}
+                                className={styles.qrCode}
+                                includeMargin
+                            />
+                        ) : (
+                            <p>Loading...</p>
+                        )}
+                        <p>
+                            Once the connection is established, the service will
+                            offer you a Verifiable Credential.
                             <br />
                             Press the ACCEPT button in your DICE ID App.
                             <br />
-                            If you DECLINE the invitation, please try again after 5 minutes.
+                            If you DECLINE the invitation, please try again after 5
+                            minutes.
                         </p>
                     </>
                 )
@@ -214,29 +184,22 @@ const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) =>
             {
                 step === 3 && (
                     <>
+                        <ConnectionHandler
+                            onChange={handleDiceConnectionStatusChange}
+                            userId={props.profile.userId}
+                        />
                         <p>
-                            Scan the following DICE ID QR Code in your DICE ID
-                            mobile application to confirm your credential.
+                            You will receive the credential offer from Topcoder in the DICE ID wallet home page.
+                            <br />
+                            Your credentials should get automatically processed in few seconds.
+                            <br />
+                            If you have disabled the auto-accept feature,
+                            please review the credential offer and manually accept it.
+                            <br />
+                            <br />
+                            Example credential offer:
                         </p>
-                        <iframe
-                            src={`${EnvironmentConfig.DICE_VERIFY_URL}/dice-verifier.html`}
-                            title='dice verifier'
-                            width='100%'
-                            height='350px'
-                        />
-                        {isVerificationProcessing && (
-                            <div className='body-small'>
-                                Powered by DICE ID
-                            </div>
-                        )}
-                        <VerificationListener
-                            event='message'
-                            callback={verificationCallback}
-                            origin={EnvironmentConfig.DICE_VERIFY_URL}
-                            type='DICE_VERIFICATION'
-                            onProcessing={onStartProcessing}
-                            startType='DICE_VERIFICATION_START'
-                        />
+                        <img src={credentialImage} className={styles.credentialImage} alt='Example Credential Offer' />
                     </>
                 )
             }
@@ -270,33 +233,6 @@ const DiceSetupModal: FC<DiceSetupModalProps> = (props: DiceSetupModalProps) =>
                     </>
                 )
             }
-            {
-                step === 5 && (
-                    <>
-                        <div className={styles.errorWrap}>
-                            <UnSuccessfullDiceVerificationIcon />
-                            <h3 className={styles.errorText}>Unsuccessful Verification!</h3>
-                        </div>
-                        <p>
-                            Hello
-                            {' '}
-                            {props.profile.handle}
-                            ,
-                            <br />
-                            <br />
-                            Your credentials could not be verified,
-                            you won&apos;t be able to connect to MFA using your decentralized identity (DICE ID).
-                        </p>
-                        <img src={diceIdLogoBig} className={styles.diceBigLogo} alt='DICE ID Logo' />
-                        <p>
-                            Please try again your process after few minutes.
-                            <br />
-                            <br />
-                        </p>
-                        <p>Please click Finish below.</p>
-                    </>
-                )
-            }
         </BaseModal>
     )
 }
diff --git a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/VerificationListener/index.tsx b/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/VerificationListener/index.tsx
deleted file mode 100644
index c884852d7..000000000
--- a/src/apps/accounts/src/settings/tabs/account/security/dice-setup-modal/VerificationListener/index.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { FC, useCallback, useEffect } from 'react'
-
-interface VerificationListenerProps {
-    event: string
-    callback: (data: object) => void
-    origin: string
-    type: string
-    onProcessing: () => void
-    startType: string
-}
-
-export const VerificationListener: FC<VerificationListenerProps> = (props: VerificationListenerProps) => {
-    const messageHandler: (e: any) => void = useCallback(e => {
-        if (e.origin === props.origin && e.data && e.data.type) {
-            if (e.data.type === props.startType) {
-                props.onProcessing()
-            } else if (e.data.type === props.type) {
-                props.callback(e.data)
-            }
-        }
-    }, [props])
-
-    useEffect(() => {
-        window.addEventListener(props.event, messageHandler)
-        return () => window.removeEventListener(props.event, messageHandler)
-    }, [props.event, messageHandler])
-
-    return <></>
-}
diff --git a/src/apps/learn/src/lib/components/skill-tags/SkillTags.tsx b/src/apps/learn/src/lib/components/skill-tags/SkillTags.tsx
index a869762f1..cbc54de95 100644
--- a/src/apps/learn/src/lib/components/skill-tags/SkillTags.tsx
+++ b/src/apps/learn/src/lib/components/skill-tags/SkillTags.tsx
@@ -5,7 +5,7 @@ import { Tooltip } from '~/libs/ui'
 import { EnvironmentConfig } from '~/config'
 
 import { SkillLabel } from '..'
-import { TCAEMSISkillType } from '../../data-providers'
+import { TCASkillType } from '../../data-providers'
 
 import styles from './SkillTags.module.scss'
 
@@ -15,7 +15,7 @@ interface SkillTagsProps {
     label?: string
     theme?: 'white' | 'gray' | undefined
     skills?: Array<string> | null | undefined
-    emsiSkills?: TCAEMSISkillType[]
+    emsiSkills?: TCASkillType[]
 }
 
 const SkillTags: FC<SkillTagsProps> = (props: SkillTagsProps) => {
@@ -24,7 +24,7 @@ const SkillTags: FC<SkillTagsProps> = (props: SkillTagsProps) => {
     const label: string = props.label ?? 'skills taught'
     const tcaEMSIEnabled: boolean = EnvironmentConfig.ENABLE_EMSI_SKILLS || false
 
-    const skills: string[] | TCAEMSISkillType[] = tcaEMSIEnabled ? (props.emsiSkills || []) : (props.skills || [])
+    const skills: string[] | TCASkillType[] = tcaEMSIEnabled ? (props.emsiSkills || []) : (props.skills || [])
 
     return (
         <div className={styles.skills}>
@@ -32,7 +32,7 @@ const SkillTags: FC<SkillTagsProps> = (props: SkillTagsProps) => {
                 <span className={classNames('body-small', styles.infoText)}>{label}</span>
             )}
             {skills?.slice(0, expandCount)
-                .map((skill: string | TCAEMSISkillType) => (
+                .map((skill: string | TCASkillType) => (
                     <SkillLabel
                         skill={skill}
                         theme={theme}
diff --git a/src/apps/learn/src/lib/components/skill/SkillLabel.tsx b/src/apps/learn/src/lib/components/skill/SkillLabel.tsx
index 2294cf6fd..5be84cf25 100644
--- a/src/apps/learn/src/lib/components/skill/SkillLabel.tsx
+++ b/src/apps/learn/src/lib/components/skill/SkillLabel.tsx
@@ -1,11 +1,11 @@
 import { FC } from 'react'
 
-import { TCAEMSISkillType } from '../../data-providers'
+import { TCASkillType } from '../../data-providers'
 
 import styles from './SkillLabel.module.scss'
 
 interface SkillLabelProps {
-    skill: string | TCAEMSISkillType
+    skill: string | TCASkillType
     theme: 'white' | 'gray' | undefined
 }
 
diff --git a/src/apps/learn/src/lib/data-providers/courses-provider/learn-course.model.ts b/src/apps/learn/src/lib/data-providers/courses-provider/learn-course.model.ts
index 44ab0966b..3c538e4c1 100644
--- a/src/apps/learn/src/lib/data-providers/courses-provider/learn-course.model.ts
+++ b/src/apps/learn/src/lib/data-providers/courses-provider/learn-course.model.ts
@@ -2,12 +2,12 @@ import { LearnModelBase } from '../../functions'
 import { CertificationLearnLevel, LearnCertification } from '../all-certifications-provider'
 import { LearnModule } from '../lesson-provider'
 import { ResourceProvider } from '../resource-provider-provider'
-import { TCAEMSISkillType } from '../tca-certifications-provider/tca-emsi-skill-type'
+import { TCASkillType } from '../tca-certifications-provider/tca-skill-type'
 
 export interface LearnCourse extends LearnModelBase {
     certificationId: string
     completionSuggestions: Array<string>
-    emsiSkills: Array<TCAEMSISkillType>
+    emsiSkills: Array<TCASkillType>
     estimatedCompletionTimeValue: number
     estimatedCompletionTimeUnits: string
     fccCourseUuid: string
diff --git a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/index.ts b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/index.ts
index 13e3b668f..db94899b4 100644
--- a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/index.ts
+++ b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/index.ts
@@ -17,4 +17,4 @@ export * from './tca-certification-progress'
 export * from './tca-certification-enrollment-base.model'
 export * from './tca-certification-validation'
 export * from './tca-certification-enrollment'
-export * from './tca-emsi-skill-type'
+export * from './tca-skill-type'
diff --git a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-certification.model.ts b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-certification.model.ts
index 0661d69f6..ef6e9d0ae 100644
--- a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-certification.model.ts
+++ b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-certification.model.ts
@@ -5,7 +5,7 @@ import { TCACertificationCompletionTimeRange } from './tca-certification-complet
 import { TCACertificationProvider } from './tca-certification-provider.model'
 import { TCACertificationProviderBase } from './tca-certification-provider.model-base'
 import { TCACertificationResource } from './tca-certification-resource.model'
-import { TCAEMSISkillType } from './tca-emsi-skill-type'
+import { TCASkillType } from './tca-skill-type'
 
 export interface TCACertification {
     certificationCategory: TCACertificationCategory
@@ -16,7 +16,7 @@ export interface TCACertification {
     createdAt: Date
     dashedName: string
     description: string
-    emsiSkills: Array<TCAEMSISkillType>
+    emsiSkills: Array<TCASkillType>
     id: number
     introText: string
     learnerLevel: TCACertificationLearnLevel
diff --git a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-emsi-skill-type.ts b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-skill-type.ts
similarity index 75%
rename from src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-emsi-skill-type.ts
rename to src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-skill-type.ts
index 12b67f1c3..4f331194a 100644
--- a/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-emsi-skill-type.ts
+++ b/src/apps/learn/src/lib/data-providers/tca-certifications-provider/tca-skill-type.ts
@@ -1,4 +1,4 @@
-export type TCAEMSISkillType = {
+export type TCASkillType = {
     assessed: boolean
     confidence: number
     emsiId: string
diff --git a/src/apps/learn/src/welcome/tc-certifications/cert-card/TCCertCard.tsx b/src/apps/learn/src/welcome/tc-certifications/cert-card/TCCertCard.tsx
index 014058619..e2b38ecd9 100644
--- a/src/apps/learn/src/welcome/tc-certifications/cert-card/TCCertCard.tsx
+++ b/src/apps/learn/src/welcome/tc-certifications/cert-card/TCCertCard.tsx
@@ -19,7 +19,7 @@ import {
     TCACertification,
     TCACertificationProgress,
     TCACertificationProviderBase,
-    TCAEMSISkillType,
+    TCASkillType,
 } from '../../../lib'
 
 import styles from './TCCertCard.module.scss'
@@ -43,7 +43,7 @@ const TCCertCard: FC<TCCertCardProps> = (props: TCCertCardProps) => {
         skills: string[],
         providers: Array<TCACertificationProviderBase>,
         dashedName: string
-        emsiSkills: TCAEMSISkillType[]
+        emsiSkills: TCASkillType[]
     } = props.certification
 
     const isEnrolled: boolean = props.progress?.status === 'enrolled'
diff --git a/src/apps/onboarding/src/models/MemberInfo.ts b/src/apps/onboarding/src/models/MemberInfo.ts
index 8de57ff6d..34181f86b 100644
--- a/src/apps/onboarding/src/models/MemberInfo.ts
+++ b/src/apps/onboarding/src/models/MemberInfo.ts
@@ -1,5 +1,5 @@
-import { MemberEmsiSkill, MemberMaxRating } from '~/apps/talent-search/src/lib/models'
-import { MemberStats } from '~/libs/core'
+import { MemberMaxRating } from '~/apps/talent-search/src/lib/models'
+import { MemberStats, UserSkill } from '~/libs/core'
 
 import MemberAddress from './MemberAddress'
 
@@ -13,7 +13,7 @@ export default interface MemberInfo {
     email: string
     accountAge: number
     maxRating: MemberMaxRating
-    emsiSkills: Array<MemberEmsiSkill>
+    skills: Array<UserSkill>
     stats: Array<MemberStats>
     addresses?: MemberAddress[]
     country: string
diff --git a/src/apps/onboarding/src/pages/skills/index.tsx b/src/apps/onboarding/src/pages/skills/index.tsx
index 8d931d7b3..064e02cc7 100644
--- a/src/apps/onboarding/src/pages/skills/index.tsx
+++ b/src/apps/onboarding/src/pages/skills/index.tsx
@@ -16,12 +16,12 @@ export const PageSkillsContent: FC<{
 }> = props => {
     const navigate: any = useNavigate()
     const [loading, setLoading] = useState(false)
-    const { formInput: emsiFormInput, saveSkills: saveEmsiSkills }: MemberSkillEditor = useMemberSkillEditor()
+    const editor: MemberSkillEditor = useMemberSkillEditor()
 
     async function saveSkills(): Promise<void> {
         setLoading(true)
         try {
-            await saveEmsiSkills()
+            await editor.saveSkills()
         } catch (error) {
         }
 
@@ -46,7 +46,7 @@ export const PageSkillsContent: FC<{
                         Understanding your skills will allow us to connect you to the right opportunities.
                     </span>
                     <div className='mt-16 full-width color-black-80'>
-                        {emsiFormInput}
+                        {editor.formInput}
                     </div>
                 </div>
             </div>
diff --git a/src/apps/profiles/src/member-profile/MemberProfile.context.tsx b/src/apps/profiles/src/member-profile/MemberProfile.context.tsx
index 052f3562b..19bcd1325 100644
--- a/src/apps/profiles/src/member-profile/MemberProfile.context.tsx
+++ b/src/apps/profiles/src/member-profile/MemberProfile.context.tsx
@@ -1,11 +1,11 @@
 import { createContext, FC, ReactNode, useContext, useMemo } from 'react'
 
-import { UserEMSISkill } from '~/libs/core'
+import { UserSkill } from '~/libs/core'
 
 export interface MemberProfileContextValue {
     isTalentSearch?: boolean
     skillsRenderer?: (
-        skills: Pick<UserEMSISkill, 'name'|'skillId'|'skillSources'>[]
+        skills: Pick<UserSkill, 'name'|'id'|'levels'>[]
     ) => ReactNode
 }
 
diff --git a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.module.scss b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.module.scss
index 761f7b188..f07d5098f 100644
--- a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.module.scss
+++ b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.module.scss
@@ -3,7 +3,6 @@
 .container {
     display: flex;
     flex-direction: column;
-    margin-bottom: $sp-6;
 
     .headerWrap {
         display: flex;
@@ -22,35 +21,14 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
-        margin-bottom: $sp-4;
+        margin-bottom: $sp-6;
     }
 
     .skillsWrap {
-        display: flex;
-        flex-wrap: wrap;
-        column-gap: $sp-1;
-        row-gap: $sp-2;
-
-        .skillItem {
-            border: 1px solid $black-20;
-            font-size: 14px;
-            line-height: 16px;
-            white-space: nowrap;
-            padding: $sp-2 $sp-3;
-            border-radius: 24px;
-            display: flex;
-            align-items: center;
-
-            &.verifiedSkillItem {
-                border: 2px solid $turq-120;
+        padding-bottom: $sp-8;
 
-                svg {
-                    margin-left: $sp-1;
-                    width: 16px;
-                    height: 16px;
-                    color: $turq-120;
-                }
-            }
+        @include ltemd {
+            padding-bottom: $sp-4;
         }
     }
 }
diff --git a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx
index 015f2feec..622574f0d 100644
--- a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx
+++ b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx
@@ -2,8 +2,8 @@ import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'reac
 import { useSearchParams } from 'react-router-dom'
 import { orderBy } from 'lodash'
 
-import { UserEMSISkill, UserProfile } from '~/libs/core'
-import { ExpandableList, HowSkillsWorkModal, isSkillVerified, Skill, SkillPill } from '~/libs/shared'
+import { UserProfile, UserSkill } from '~/libs/core'
+import { GroupedSkillsUI, HowSkillsWorkModal, isSkillVerified } from '~/libs/shared'
 import { Button } from '~/libs/ui'
 
 import { AddButton, EditMemberPropertyBtn, EmptySection } from '../../components'
@@ -27,11 +27,32 @@ const MemberSkillsInfo: FC<MemberSkillsInfoProps> = (props: MemberSkillsInfoProp
 
     const { skillsRenderer, isTalentSearch }: MemberProfileContextValue = useMemberProfileContext()
 
-    const memberEMSISkills: UserEMSISkill[] = useMemo(() => orderBy(
-        props.profile.emsiSkills ?? [],
+    const memberSkills: UserSkill[] = useMemo(() => orderBy(
+        props.profile.skills ?? [],
         [isSkillVerified, 'name'],
         ['desc', 'asc'],
-    ) as UserEMSISkill[], [props.profile.emsiSkills])
+    ) as UserSkill[], [props.profile.skills])
+
+    const groupedSkillsByCategory: { [key: string]: UserSkill[] } = useMemo(() => {
+        const grouped: { [key: string]: UserSkill[] } = {}
+        const sortedGroupedSkillsByCategory: { [key: string]: UserSkill[] } = {}
+
+        memberSkills.forEach((skill: UserSkill) => {
+            if (grouped[skill.category.name]) {
+                grouped[skill.category.name].push(skill)
+            } else {
+                grouped[skill.category.name] = [skill]
+            }
+        })
+
+        Object.keys(grouped)
+            .sort()
+            .forEach(key => {
+                sortedGroupedSkillsByCategory[key] = grouped[key]
+            })
+
+        return sortedGroupedSkillsByCategory
+    }, [memberSkills])
 
     const [isEditMode, setIsEditMode]: [boolean, Dispatch<SetStateAction<boolean>>]
         = useState<boolean>(false)
@@ -72,42 +93,42 @@ const MemberSkillsInfo: FC<MemberSkillsInfoProps> = (props: MemberSkillsInfoProp
 
     return (
         <div className={styles.container}>
+            {
+                skillsRenderer && memberSkills.length > 0 && (
+                    <div className={styles.skillsWrap}>
+                        {skillsRenderer(memberSkills)}
+                    </div>
+                )
+            }
+
             <div className={styles.titleWrap}>
                 <div className={styles.headerWrap}>
                     <h3>Skills</h3>
                     {
-                        canEdit && memberEMSISkills.length > 0 && (
+                        canEdit && memberSkills.length > 0 && (
                             <EditMemberPropertyBtn
                                 onClick={handleEditSkillsClick}
                             />
                         )
                     }
                 </div>
-                <Button
-                    link
-                    label='How skills work'
-                    onClick={handleHowSkillsWorkClick}
-                    variant='linkblue'
-                />
+                <div className={styles.skillActions}>
+                    <Button
+                        link
+                        label='How skills work'
+                        onClick={handleHowSkillsWorkClick}
+                        variant='linkblue'
+                    />
+                </div>
             </div>
 
             <div className={styles.skillsWrap}>
-                {skillsRenderer && memberEMSISkills.length > 0 && skillsRenderer(memberEMSISkills)}
-                {!skillsRenderer && memberEMSISkills.length > 0 && (
-                    <ExpandableList visible={10} itemLabel='skill'>
-                        {
-                            memberEMSISkills
-                                .map(memberEMSISkill => (
-                                    <SkillPill
-                                        skill={memberEMSISkill as unknown as Skill}
-                                        key={memberEMSISkill.id}
-                                        theme='dark'
-                                    />
-                                ))
-                        }
-                    </ExpandableList>
+                {memberSkills.length > 0 && (
+                    <GroupedSkillsUI
+                        groupedSkillsByCategory={groupedSkillsByCategory}
+                    />
                 )}
-                {!memberEMSISkills.length && (
+                {!memberSkills.length && (
                     <EmptySection
                         title='Topcoder verifies and tracks skills as our members complete projects and challenges.'
                         wide
@@ -119,12 +140,14 @@ const MemberSkillsInfo: FC<MemberSkillsInfoProps> = (props: MemberSkillsInfoProp
                     </EmptySection>
                 )}
             </div>
-            {canEdit && !memberEMSISkills.length && (
-                <AddButton
-                    label='Add skills'
-                    onClick={handleEditSkillsClick}
-                />
-            )}
+            {
+                canEdit && !memberSkills.length && (
+                    <AddButton
+                        label='Add skills'
+                        onClick={handleEditSkillsClick}
+                    />
+                )
+            }
 
             {
                 isEditMode && (
diff --git a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx
index 8ff38b1f1..68a9204ec 100644
--- a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx
+++ b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx
@@ -15,12 +15,12 @@ const ModifySkillsModal: FC<ModifySkillsModalProps> = (props: ModifySkillsModalP
     const [isSaving, setIsSaving]: [boolean, Dispatch<SetStateAction<boolean>>]
         = useState<boolean>(false)
 
-    const { formInput: emsiFormInput, saveSkills: saveEmsiSkills }: MemberSkillEditor = useMemberSkillEditor()
+    const editor: MemberSkillEditor = useMemberSkillEditor()
 
     function handleModifySkillsSave(): void {
         setIsSaving(true)
 
-        saveEmsiSkills()
+        editor.saveSkills()
             .then(() => {
                 toast.success('Skills updated successfully.', { position: toast.POSITION.BOTTOM_RIGHT })
                 props.onSave()
@@ -63,7 +63,7 @@ const ModifySkillsModal: FC<ModifySkillsModalProps> = (props: ModifySkillsModalP
                     Understanding your skills will allow us to connect you to the right opportunities.
                 </p>
                 <div className={styles.skillPicker}>
-                    {emsiFormInput}
+                    {editor.formInput}
                 </div>
             </div>
         </BaseModal>
diff --git a/src/apps/talent-search/src/components/popular-skills/PopularSkills.tsx b/src/apps/talent-search/src/components/popular-skills/PopularSkills.tsx
index fdd256287..1b3dc6f82 100644
--- a/src/apps/talent-search/src/components/popular-skills/PopularSkills.tsx
+++ b/src/apps/talent-search/src/components/popular-skills/PopularSkills.tsx
@@ -1,6 +1,7 @@
 import { FC, useCallback } from 'react'
 
-import { Skill, SkillPill } from '~/libs/shared'
+import { SkillPill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { SKILL_SEARCH_LIMIT } from '../../config'
 
@@ -8,40 +9,169 @@ import styles from './PopularSkills.module.scss'
 
 // TODO: Make this configurable, or read from a service.  We need to discuss
 // how we want to handle this.
-const popularSkills: Skill[] = [
-    { emsiId: 'KS120076FGP5WGWYMP0F', name: 'Java (Programming Language)' },
-    { emsiId: 'KS126QY605N7YVHFYCTW', name: 'MySQL' },
-    { emsiId: 'KS127296VDYS7ZFWVC46', name: 'Node.js' },
-    { emsiId: 'KS121F45VPV8C9W3QFYH', name: 'Cascading Style Sheets (CSS)' },
-    { emsiId: 'KS1200771D9CR9LB4MWW', name: 'JavaScript (Programming Language)' },
-    { emsiId: 'KS1261Z68KSKR1X31KS3', name: 'Machine Learning' },
-    { emsiId: 'KS120SX72T8B5VLXS1VN', name: 'Unit Testing' },
-    { emsiId: 'KS120H6772VQ0MQ5RLVD', name: 'Angular (Web Framework)' },
-    { emsiId: 'KS1200B62W5ZF38RJ7TD', name: '.NET Framework' },
-    { emsiId: 'KS125LS6N7WP4S6SFTCK', name: 'Python (Programming Language)' },
-    { emsiId: 'KS120GZ5YXC6YVM1NGPR', name: 'Android (Operating System)' },
-    { emsiId: 'ES5269FD2583B0B9875C', name: 'Figma (Design Software)' },
-    { emsiId: 'KS120V86MZWV9Z9LKQY3', name: 'Microsoft Azure' },
-    { emsiId: 'KS1206V6K46N1SDVJGBD', name: 'Adobe Illustrator' },
-    { emsiId: 'KSY4WFI1S164RQUBSPCC', name: 'Docker (Software)' },
-    { emsiId: 'KSDJCA4E89LB98JAZ7LZ', name: 'React.js' },
+// TODO: update this with the real list of popular skills
+const popularSkills: UserSkill[] = [
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '63bb7cfc-b0d4-4584-820a-18c503b4b0fe',
+        levels: [],
+        name: 'Java',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '0d86f8cb-e509-4ca8-b9f8-e65d909cc6eb',
+        levels: [],
+        name: 'MySQL',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '32899253-5989-4c33-9948-cad29c9e0ab0',
+        levels: [],
+        name: 'Node.js',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '9c42c728-47ff-4b20-916c-560739bad1ee',
+        levels: [],
+        name: 'Cascading Style Sheets (CSS)',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '16ee1403-8e73-497d-a766-623eefd3c806',
+        levels: [],
+        name: 'JavaScript',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '99e5fc45-5fc0-4794-a578-f42dfabcbf74',
+        levels: [],
+        name: 'Machine Learning',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'a0da6acf-2cf8-48f0-ba4a-30d18bc75052',
+        levels: [],
+        name: 'Unit Testing',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '7e8641e5-e5c1-4ab6-a8f4-1fd6a8686dbe',
+        levels: [],
+        name: 'Angular',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'f0597e53-9a6d-40d6-8639-4d5a9ead190f',
+        levels: [],
+        name: '.NET Framework',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'fcbac194-35ab-4a31-aa7c-a2867fff9c4b',
+        levels: [],
+        name: 'Python',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'adf9d7b9-d639-4a73-8772-673b3d4f41b0',
+        levels: [],
+        name: 'Android',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '130323ce-7d88-4141-9e2b-904994f026a1',
+        levels: [],
+        name: 'Figma (Design Software)',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '9eaf6049-402a-481c-ac82-87a0826128c7',
+        levels: [],
+        name: 'Microsoft Azure',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'ced0b36c-6057-48e1-a263-2588fb91296b',
+        levels: [],
+        name: 'Adobe Illustrator',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: 'be85b096-b841-45b4-a5cb-1d3ee7ce1126',
+        levels: [],
+        name: 'Docker',
+    },
+    {
+        category: {
+            id: '481b5ebc-2fe6-45ed-a90c-736936d458d7',
+            name: 'Programming and Development',
+        },
+        id: '4458454c-9a97-4332-a545-6546e240dab6',
+        levels: [],
+        name: 'React.js',
+    },
 ]
 
 interface PopularSkillsProps {
-    onChange: (skills: Skill[]) => void
-    selectedSkills: Skill[]
+    onChange: (skills: UserSkill[]) => void
+    selectedSkills: UserSkill[]
 }
 
 const PopularSkills: FC<PopularSkillsProps> = props => {
 
-    const toggleSkill = useCallback((skill: Skill) => {
-        let newFilter: Array<Skill> = []
+    const toggleSkill = useCallback((skill: UserSkill) => {
+        let newFilter: Array<UserSkill> = []
         let deleted: boolean = false
 
         // Either delete the value from the list, if we're toggling one that's already in the list
         // Or add the new item to the list
         props.selectedSkills.forEach(filterSkill => {
-            if (filterSkill.emsiId === skill.emsiId) {
+            if (filterSkill.id === skill.id) {
                 deleted = true
             } else {
                 newFilter.push(filterSkill)
@@ -58,8 +188,8 @@ const PopularSkills: FC<PopularSkillsProps> = props => {
         props.onChange.call(undefined, newFilter)
     }, [props.onChange, props.selectedSkills])
 
-    function isSelected(skill: Skill): boolean {
-        return !!props.selectedSkills.find(s => s.emsiId === skill.emsiId)
+    function isSelected(skill: UserSkill): boolean {
+        return !!props.selectedSkills.find(s => s.id === skill.id)
     }
 
     return (
@@ -69,7 +199,7 @@ const PopularSkills: FC<PopularSkillsProps> = props => {
             <div className={styles.pills}>
                 {popularSkills.map(skill => (
                     <SkillPill
-                        key={skill.emsiId}
+                        key={skill.id}
                         skill={skill}
                         selected={isSelected(skill)}
                         onClick={toggleSkill}
diff --git a/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.module.scss b/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.module.scss
index eaefc285a..d24a1726f 100644
--- a/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.module.scss
+++ b/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.module.scss
@@ -2,6 +2,11 @@
 
 .wrap {
     width: 100%;
+    margin-bottom: $sp-6;
+
+    @include ltemd {
+        margin-bottom: $sp-2;
+    }
 }
 
 .highlightWrap {
diff --git a/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.tsx b/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.tsx
index c58bd3724..642b099da 100644
--- a/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.tsx
+++ b/src/apps/talent-search/src/components/profile-skills-match/ProfileSkillsMatch.tsx
@@ -1,8 +1,8 @@
 import { FC } from 'react'
 import classNames from 'classnames'
 
-import { UserEMSISkill } from '~/libs/core'
-import { EmsiSkill, ExpandableList, isSkillVerified, Skill, SkillPill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
+import { isSkillVerified, SkillPill } from '~/libs/shared'
 
 import { useIsMatchingSkill } from '../../lib/utils'
 
@@ -10,17 +10,16 @@ import styles from './ProfileSkillsMatch.module.scss'
 
 interface ProfileSkillsMatchProps {
     matchValue: number
-    profileSkills: Pick<UserEMSISkill, 'name'|'skillId'|'skillSources'>[]
-    queriedSkills: Skill[]
+    profileSkills: Pick<UserSkill, 'name'|'id'|'levels'>[]
+    queriedSkills: UserSkill[]
 }
 
 const ProfileSkillsMatch: FC<ProfileSkillsMatchProps> = props => {
     const isMatchingSkill = useIsMatchingSkill(props.queriedSkills)
-    const matchedSkills = (props.profileSkills as unknown as EmsiSkill[]).filter(isMatchingSkill)
-    const unMatchedSkills = (props.profileSkills as unknown as EmsiSkill[]).filter(s => !isMatchingSkill(s))
+    const matchedSkills = props.profileSkills.filter(isMatchingSkill)
     const provenMatched = matchedSkills.filter(isSkillVerified)
     const selfSkillmatched = matchedSkills.filter(s => !isSkillVerified(s))
-    const missingSkills = props.queriedSkills.filter(qs => !matchedSkills.find(ms => ms.skillId === qs.emsiId))
+    const missingSkills = props.queriedSkills.filter(qs => !matchedSkills.find(ms => ms.id === qs.id))
 
     return (
         <div className={styles.wrap}>
@@ -41,7 +40,7 @@ const ProfileSkillsMatch: FC<ProfileSkillsMatchProps> = props => {
                             </div>
                             <div className={styles.skillsList}>
                                 {provenMatched.map(skill => (
-                                    <SkillPill skill={skill} theme='verified' key={skill.skillId} />
+                                    <SkillPill skill={skill} theme='verified' key={skill.id} />
                                 ))}
                             </div>
                         </>
@@ -50,11 +49,11 @@ const ProfileSkillsMatch: FC<ProfileSkillsMatchProps> = props => {
                         <>
                             <div className='body-main'>
                                 {selfSkillmatched.length}
-                                {` matched self selected skill${selfSkillmatched.length > 1 ? 's' : ''}`}
+                                {` matched self proclaimed skill${selfSkillmatched.length > 1 ? 's' : ''}`}
                             </div>
                             <div className={styles.skillsList}>
                                 {selfSkillmatched.map(skill => (
-                                    <SkillPill skill={skill} theme='dark' key={skill.skillId} />
+                                    <SkillPill skill={skill} theme='dark' key={skill.id} />
                                 ))}
                             </div>
                         </>
@@ -73,21 +72,6 @@ const ProfileSkillsMatch: FC<ProfileSkillsMatchProps> = props => {
                     )}
                 </div>
             </div>
-            {unMatchedSkills.length > 0 && (
-                <div className={styles.additionalSkills}>
-                    <div className='body-main-bold'>
-                        Additional Skills
-                    </div>
-
-                    <div className={styles.skillsList}>
-                        <ExpandableList visible={10} itemLabel='skill'>
-                            {unMatchedSkills.map(skill => (
-                                <SkillPill skill={skill} theme='dark' key={skill.skillId} />
-                            ))}
-                        </ExpandableList>
-                    </div>
-                </div>
-            )}
         </div>
     )
 }
diff --git a/src/apps/talent-search/src/components/search-input/SearchInput.tsx b/src/apps/talent-search/src/components/search-input/SearchInput.tsx
index 6dd084542..a44747def 100644
--- a/src/apps/talent-search/src/components/search-input/SearchInput.tsx
+++ b/src/apps/talent-search/src/components/search-input/SearchInput.tsx
@@ -2,7 +2,8 @@ import { FC, MouseEvent, Ref, useMemo } from 'react'
 import classNames from 'classnames'
 
 import { IconOutline, InputMultiselectOption } from '~/libs/ui'
-import { EmsiSkill, EmsiSkillSources, InputSkillSelector, Skill } from '~/libs/shared'
+import { InputSkillSelector } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { SKILL_SEARCH_LIMIT } from '../../config'
 
@@ -11,23 +12,24 @@ import styles from './SearchInput.module.scss'
 interface SearchInputProps {
     className?: string
     readonly autoFocus?: boolean
-    onChange: (skills: Skill[]) => void
-    skills: Skill[]
+    onChange: (skills: Pick<UserSkill, 'id' | 'name'>[]) => void
+    skills: UserSkill[]
     onSearch?: () => void
     inputRef?: Ref<any>
 }
 
 const SearchInput: FC<SearchInputProps> = props => {
-    const emsiSkills: EmsiSkill[] = useMemo(() => props.skills.map(s => ({
+    const skills = useMemo(() => props.skills.map(s => ({
+        category: s.category,
+        id: s.id,
+        levels: [],
         name: s.name,
-        skillId: s.emsiId,
-        skillSources: [EmsiSkillSources.selfPicked],
     })), [props.skills])
 
     function onChange(ev: any): void {
         const options = (ev.target.value as unknown) as InputMultiselectOption[]
         props.onChange(options.map(v => ({
-            emsiId: v.value,
+            id: v.value,
             name: v.label as string,
         })))
     }
@@ -41,13 +43,13 @@ const SearchInput: FC<SearchInputProps> = props => {
 
     const searchIcon = useMemo(() => (
         <div
-            className={classNames(styles.searchIcon, !emsiSkills.length && styles.disabled)}
+            className={classNames(styles.searchIcon, !skills.length && styles.disabled)}
             onClick={handleSearchClick}
             onTouchStart={handleSearchClick as any}
         >
             <IconOutline.SearchIcon />
         </div>
-    ), [props.onSearch, emsiSkills])
+    ), [props.onSearch, skills])
 
     return (
         <div className={styles.wrap}>
@@ -58,13 +60,13 @@ const SearchInput: FC<SearchInputProps> = props => {
                 useWrapper={false}
                 theme='clear'
                 dropdownIcon={searchIcon}
-                value={emsiSkills}
+                value={skills}
                 onChange={onChange}
                 onSubmit={props.onSearch}
                 inputRef={props.inputRef}
                 limit={SKILL_SEARCH_LIMIT}
             />
-            {emsiSkills.length >= SKILL_SEARCH_LIMIT && (
+            {skills.length >= SKILL_SEARCH_LIMIT && (
                 <div className={styles.maxLimit}>
                     {`You can only search up to ${SKILL_SEARCH_LIMIT} skills at one time`}
                 </div>
diff --git a/src/apps/talent-search/src/components/talent-card/TalentCard.tsx b/src/apps/talent-search/src/components/talent-card/TalentCard.tsx
index f5feac5bb..bf0df7e12 100644
--- a/src/apps/talent-search/src/components/talent-card/TalentCard.tsx
+++ b/src/apps/talent-search/src/components/talent-card/TalentCard.tsx
@@ -5,7 +5,8 @@ import classNames from 'classnames'
 import codes from 'country-calling-code'
 
 import { IconSolid } from '~/libs/ui'
-import { isSkillVerified, ProfilePicture, Skill, SkillPill } from '~/libs/shared'
+import { isSkillVerified, ProfilePicture, SkillPill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { ProfileMatch } from '../profile-match'
 import { Member, MemberDisplayName } from '../../lib/models'
@@ -30,7 +31,7 @@ function isOverflow(el: HTMLElement): boolean {
 }
 
 interface TalentCardProps {
-    queriedSkills: Skill[]
+    queriedSkills: UserSkill[]
     member: Member
     match?: number
 }
@@ -44,12 +45,12 @@ const TalentCard: FC<TalentCardProps> = props => {
 
     const matchedSkills = useMemo(() => (
         orderBy(
-            props.member.emsiSkills,
+            props.member.skills,
             [isSkillVerified, a => a.name],
             ['desc', 'asc'],
         )
             .filter(isMatchingSkill)
-    ), [isMatchingSkill, props.member.emsiSkills])
+    ), [isMatchingSkill, props.member.skills])
 
     const matchState = useMemo(() => ({
         matchValue: props.match,
@@ -129,7 +130,7 @@ const TalentCard: FC<TalentCardProps> = props => {
                     <div ref={restLabelRef} className={styles.unmatchedSkills}>+0 more matched skill</div>
                     {matchedSkills.length > 0 && matchedSkills.map(skill => (
                         <SkillPill
-                            key={skill.skillId}
+                            key={skill.id}
                             theme='dark'
                             skill={skill}
                         />
diff --git a/src/apps/talent-search/src/lib/models/Member.ts b/src/apps/talent-search/src/lib/models/Member.ts
index 793e5e1a6..f1aab22d8 100644
--- a/src/apps/talent-search/src/lib/models/Member.ts
+++ b/src/apps/talent-search/src/lib/models/Member.ts
@@ -1,6 +1,7 @@
+import { UserSkill } from '~/libs/core'
+
 import { MemberDisplayName } from './MemberDisplayName'
 import MemberAddress from './MemberAddress'
-import MemberEmsiSkill from './MemberEmsiSkill'
 import MemberMaxRating from './MemberMaxRating'
 import MemberStats from './MemberStats'
 
@@ -12,7 +13,7 @@ export default interface Member {
     createdAt: number;
     description: string;
     email: string;
-    emsiSkills: Array <MemberEmsiSkill>;
+    skills: Array<UserSkill>;
     firstName: string;
     handle: string;
     homeCountryCode: string;
@@ -23,7 +24,7 @@ export default interface Member {
     numberOfChallengesWon: number;
     photoURL: string;
     skillScore: number;
-    stats: Array <MemberStats>;
+    stats: Array<MemberStats>;
     status: string;
     userId: number;
     verified: string;
diff --git a/src/apps/talent-search/src/lib/models/MemberEmsiSkill.ts b/src/apps/talent-search/src/lib/models/MemberEmsiSkill.ts
deleted file mode 100644
index df133b182..000000000
--- a/src/apps/talent-search/src/lib/models/MemberEmsiSkill.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { EmsiSkillSources } from '~/libs/shared'
-
-export default interface MemberEmsiSkill {
-    skillSources: EmsiSkillSources[];
-    skillSubcategory: EmsiSkillSources;
-    skillId: string
-    name: string;
-    category: string;
-}
diff --git a/src/apps/talent-search/src/lib/models/index.ts b/src/apps/talent-search/src/lib/models/index.ts
index f244db5b4..4179a1aca 100644
--- a/src/apps/talent-search/src/lib/models/index.ts
+++ b/src/apps/talent-search/src/lib/models/index.ts
@@ -1,5 +1,4 @@
 export type { default as Member } from './Member'
-export type { default as MemberEmsiSkill } from './MemberEmsiSkill'
 export type { default as MemberMaxRating } from './MemberMaxRating'
 export type { default as MemberStats } from './MemberStats'
 export { MemberDisplayName } from './MemberDisplayName'
diff --git a/src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts b/src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts
index a91ed3a8e..348505f4e 100644
--- a/src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts
+++ b/src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts
@@ -3,8 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import useSWR, { SWRResponse } from 'swr'
 
 import { EnvironmentConfig } from '~/config'
-import { PaginatedResponse, xhrGetPaginatedAsync } from '~/libs/core'
-import { Skill } from '~/libs/shared'
+import { PaginatedResponse, UserSkill, xhrGetPaginatedAsync } from '~/libs/core'
 import Member from '@talentSearch/lib/models/Member'
 
 export interface TalentMatchesResponse {
@@ -18,12 +17,12 @@ export interface TalentMatchesResponse {
 }
 
 export function useFetchTalentMatches(
-    skills: ReadonlyArray<Skill>,
+    skills: ReadonlyArray<UserSkill>,
     page: number,
     pageSize: number,
 ): TalentMatchesResponse {
     const searchParams = [
-        ...skills.map(s => `skillId=${s.emsiId}`),
+        ...skills.map(s => `id=${s.id}`),
         'sortBy=skillScore',
         'includeStats=false',
         `page=${page}`,
@@ -61,7 +60,7 @@ export interface InfiniteTalentMatchesResposne {
 }
 
 export function useInfiniteTalentMatches(
-    skills: ReadonlyArray<Skill>,
+    skills: ReadonlyArray<UserSkill>,
     pageSize: number = 10,
 ): InfiniteTalentMatchesResposne {
     const [matches, setMatches] = useState([] as Member[])
diff --git a/src/apps/talent-search/src/lib/utils/search-query.tsx b/src/apps/talent-search/src/lib/utils/search-query.tsx
index 237d9b0f1..406cafcf9 100644
--- a/src/apps/talent-search/src/lib/utils/search-query.tsx
+++ b/src/apps/talent-search/src/lib/utils/search-query.tsx
@@ -1,30 +1,32 @@
 import { useCallback, useEffect, useState } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
-import { Skill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
-export const encodeUrlQuerySearch = (skills: Skill[]): string => (
+type PartialUserSkill = Pick<UserSkill, 'id'|'name'>
+
+export const encodeUrlQuerySearch = (skills: PartialUserSkill[]): string => (
     skills
-        .map(s => `q=${encodeURIComponent(`${s.name}::${s.emsiId}`)}`)
+        .map(s => `q=${encodeURIComponent(`${s.name}::${s.id}`)}`)
         .join('&')
 )
 
-export const parseUrlQuerySearch = (params: string[]): Skill[] => (
+export const parseUrlQuerySearch = (params: string[]): UserSkill[] => (
     params.map(p => {
-        const [name, emsiId] = p.split('::')
-        return { emsiId, name }
+        const [name, id] = p.split('::')
+        return { category: { id: '', name: '' }, id, levels: [], name }
     })
 )
 
 export const useUrlQuerySearchParms = (paramName: string): [
-    Skill[],
-    (s: Skill[]) => void
+    UserSkill[],
+    (s: PartialUserSkill[]) => void
 ] => {
     const [params, updateParams] = useSearchParams()
 
-    const [skills, setSkills] = useState<Skill[]>([])
+    const [skills, setSkills] = useState<UserSkill[]>([])
 
-    const handleUpdateSearch = useCallback((newSkills: Skill[]) => {
+    const handleUpdateSearch = useCallback((newSkills: PartialUserSkill[]) => {
         const searchParams = encodeUrlQuerySearch(newSkills)
         updateParams(`${searchParams}`)
     }, [updateParams])
diff --git a/src/apps/talent-search/src/lib/utils/skills.utils.tsx b/src/apps/talent-search/src/lib/utils/skills.utils.tsx
index 25b373f46..8ad98a9c7 100644
--- a/src/apps/talent-search/src/lib/utils/skills.utils.tsx
+++ b/src/apps/talent-search/src/lib/utils/skills.utils.tsx
@@ -1,12 +1,12 @@
 import { useCallback } from 'react'
 
-import { EmsiSkill, Skill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
-export type IsMatchingSkillFn = (skill: EmsiSkill) => boolean
+export type IsMatchingSkillFn = (skill: Pick<UserSkill, 'id'>) => boolean
 
-export const useIsMatchingSkill = (skills: Skill[]): IsMatchingSkillFn => {
-    const isMatchingSkill = useCallback((skill: EmsiSkill) => (
-        !!skills.find(s => skill.skillId === s.emsiId)
+export const useIsMatchingSkill = (skills: UserSkill[]): IsMatchingSkillFn => {
+    const isMatchingSkill = useCallback((skill: Pick<UserSkill, 'id'>) => (
+        !!skills.find(s => skill.id === s.id)
     ), [skills])
 
     return isMatchingSkill
diff --git a/src/apps/talent-search/src/routes/search-page/SearchPage.tsx b/src/apps/talent-search/src/routes/search-page/SearchPage.tsx
index 501a1e4a6..ba8c8c4e9 100644
--- a/src/apps/talent-search/src/routes/search-page/SearchPage.tsx
+++ b/src/apps/talent-search/src/routes/search-page/SearchPage.tsx
@@ -2,7 +2,7 @@ import { FC, useEffect, useRef, useState } from 'react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
 
 import { ContentLayout, IconOutline } from '~/libs/ui'
-import { Skill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { SearchInput } from '../../components/search-input'
 import { PopularSkills } from '../../components/popular-skills'
@@ -20,15 +20,15 @@ export const SearchPage: FC = () => {
 
     const searchInputRef = useRef<HTMLInputElement>()
     const navigate = useNavigate()
-    const [skillsFilter, setSkillsFilter] = useState<Skill[]>([])
+    const [skillsFilter, setSkillsFilter] = useState<UserSkill[]>([])
 
     function navigateToResults(): void {
         const searchParams = encodeUrlQuerySearch(skillsFilter)
         navigate(`${TALENT_SEARCH_PATHS.results}?${searchParams}`)
     }
 
-    function handleSelectSkillFilter(filter: Skill[]): void {
-        setSkillsFilter(filter)
+    function handleSelectSkillFilter(filter: Pick<UserSkill, 'id'|'name'>[]): void {
+        setSkillsFilter(filter as UserSkill[])
         searchInputRef.current?.focus()
     }
 
@@ -81,7 +81,7 @@ export const SearchPage: FC = () => {
                 <SearchInput
                     autoFocus
                     skills={skillsFilter}
-                    onChange={setSkillsFilter}
+                    onChange={handleSelectSkillFilter}
                     onSearch={navigateToResults}
                     inputRef={searchInputRef}
                 />
diff --git a/src/apps/talent-search/src/routes/talent-page/TalentPage.tsx b/src/apps/talent-search/src/routes/talent-page/TalentPage.tsx
index b077a0bfe..d93dae09f 100644
--- a/src/apps/talent-search/src/routes/talent-page/TalentPage.tsx
+++ b/src/apps/talent-search/src/routes/talent-page/TalentPage.tsx
@@ -2,14 +2,14 @@ import { FC, ReactNode } from 'react'
 import { Location, useLocation } from 'react-router-dom'
 
 import { MemberProfileContext, MemberProfilePage } from '@profiles/member-profile'
-import { UserEMSISkill } from '~/libs/core'
+import { UserSkill } from '~/libs/core'
 
 import { ProfileSkillsMatch } from '../../components/profile-skills-match'
 
 const TalentPage: FC = () => {
     const { state }: Location = useLocation()
 
-    function skillsRenderer(profileSkills: Pick<UserEMSISkill, 'name'|'skillId'|'skillSources'>[]): ReactNode {
+    function skillsRenderer(profileSkills: Pick<UserSkill, 'name'|'id'|'levels'>[]): ReactNode {
         return (
             <ProfileSkillsMatch
                 matchValue={state.matchValue}
diff --git a/src/config/environments/default.env.ts b/src/config/environments/default.env.ts
index cd4d469e4..81f5a103f 100644
--- a/src/config/environments/default.env.ts
+++ b/src/config/environments/default.env.ts
@@ -64,13 +64,9 @@ export const SUBDOMAIN = window.location.hostname.split('.')[0]
 
 export const GAMIFICATION_ORG_ID = getReactEnv<string>('GAMIFICATION_ORG_ID', undefined)
 
-export const DICE_VERIFY_URL = get({
-    dev: 'https://accounts-auth0.topcoder-dev.com',
-    prod: 'https://accounts-auth0.topcoder.com',
-    qa: 'https://accounts-auth0.topcoder-qa.com',
-}, ENV, 'https://accounts-auth0.topcoder.com')
-
-export const RESTRICT_TALENT_SEARCH = getReactEnv<boolean>('RESTRICT_TALENT_SEARCH', false)
+// TODO: Revert this.  This was done because prod was restricting this and no one was available to fix the config
+// export const RESTRICT_TALENT_SEARCH = getReactEnv<boolean>('RESTRICT_TALENT_SEARCH', false)
+export const RESTRICT_TALENT_SEARCH = false
 export const SEGMENT_ANALYTICS_KEY = getReactEnv<string>('SEGMENT_ANALYTICS_KEY', undefined)
 
 export const USERFLOW_SURVEYS = {
diff --git a/src/config/environments/global-config.model.ts b/src/config/environments/global-config.model.ts
index 8e6f23699..f2f16ba4b 100644
--- a/src/config/environments/global-config.model.ts
+++ b/src/config/environments/global-config.model.ts
@@ -36,7 +36,6 @@ export interface GlobalConfig {
     },
     SUBDOMAIN: string,
     GAMIFICATION_ORG_ID: string
-    DICE_VERIFY_URL: string
     RESTRICT_TALENT_SEARCH: boolean
     SEGMENT_ANALYTICS_KEY: string
     USERFLOW_SURVEYS: {
diff --git a/src/libs/core/lib/profile/data-providers/index.ts b/src/libs/core/lib/profile/data-providers/index.ts
index 01b1aa71a..57c56fcfa 100644
--- a/src/libs/core/lib/profile/data-providers/index.ts
+++ b/src/libs/core/lib/profile/data-providers/index.ts
@@ -1,5 +1,4 @@
 export * from './useCountry'
-export * from './useMemberSkills'
 export * from './useMemberStats'
 export * from './useMemberBadges'
 export * from './useUserCompletedCertifications'
diff --git a/src/libs/core/lib/profile/data-providers/useDiceIdConnection.ts b/src/libs/core/lib/profile/data-providers/useDiceIdConnection.ts
index 484bfa1b2..d86e3c30c 100644
--- a/src/libs/core/lib/profile/data-providers/useDiceIdConnection.ts
+++ b/src/libs/core/lib/profile/data-providers/useDiceIdConnection.ts
@@ -4,20 +4,15 @@ import { diceIDURL } from '~/libs/core'
 
 export interface DiceConnectionStatus {
     accepted: boolean
-    connection: string
-    createdAt: Date
-    id: number
+    connection: string | null
+    diceEnabled: boolean
 }
 
-export function useDiceIdConnection(userId: number, connectionId?: number): DiceConnectionStatus | undefined {
-    const options: SWRConfiguration = {}
-
-    if (connectionId) {
-        options.refreshInterval = 5000 // pooling interval 5s if connection is active
-    }
+export function useDiceIdConnection(userId: number): DiceConnectionStatus | undefined {
+    const options: SWRConfiguration = { refreshInterval: 5000 } // pooling interval 5s
 
     const { data }: SWRResponse
-        = useSWR(`${diceIDURL(userId)}/diceConnection${connectionId ? `/${connectionId}` : ''}`, options)
+        = useSWR(`${diceIDURL(userId)}/diceConnection`, options)
 
     return data ? data.result.content : undefined
 }
diff --git a/src/libs/core/lib/profile/data-providers/useMemberSkills.ts b/src/libs/core/lib/profile/data-providers/useMemberSkills.ts
deleted file mode 100644
index 717978ac6..000000000
--- a/src/libs/core/lib/profile/data-providers/useMemberSkills.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { keys } from 'lodash'
-import useSWR, { SWRResponse } from 'swr'
-
-import { UserSkill } from '../user-skill.model'
-import { getProfileUrl } from '../profile-functions'
-
-// This is currently providing legacy TC skills, not EMSI!
-export function useMemberSkills(handle?: string): UserSkill[] | undefined {
-    const { data }: SWRResponse = useSWR(handle ? `${getProfileUrl(handle)}/skills` : undefined)
-
-    const skills: UserSkill[] | undefined
-        = data?.skills ? keys(data.skills)
-            .map(skillKey => ({ id: skillKey, ...data.skills[skillKey] }))
-            // sort by challenge verified first
-            .sort((a, b) => b.sources.indexOf('CHALLENGE') - a.sources.indexOf('CHALLENGE')) : undefined
-
-    return skills
-}
diff --git a/src/libs/core/lib/profile/modify-user-mfa.model.ts b/src/libs/core/lib/profile/modify-user-mfa.model.ts
index a21bcdf40..1fda94156 100644
--- a/src/libs/core/lib/profile/modify-user-mfa.model.ts
+++ b/src/libs/core/lib/profile/modify-user-mfa.model.ts
@@ -8,7 +8,10 @@ export interface ModifyUserMFARequest {
 export interface ModifyUserMFAResponse {
     id: string
     result: {
-        content: string
+        content: {
+            mfaEnabled: boolean
+            diceEnabled: boolean
+        },
         success: boolean
     }
 }
diff --git a/src/libs/core/lib/profile/profile-functions/rating.functions.ts b/src/libs/core/lib/profile/profile-functions/rating.functions.ts
index 4ee00920f..05d1c6620 100644
--- a/src/libs/core/lib/profile/profile-functions/rating.functions.ts
+++ b/src/libs/core/lib/profile/profile-functions/rating.functions.ts
@@ -1,7 +1,5 @@
 import { CSSProperties } from 'react'
 
-import { EMSISkillSources } from '../user-skill.model'
-
 export const TC_RATING_COLORS: Array<{ color: string, limit: number }> = [{
     color: '#555555' /* Grey */,
     limit: 900,
@@ -32,7 +30,3 @@ export function ratingToCSScolor(rating: number): CSSProperties {
         color,
     }
 }
-
-export function isVerifiedSkill(skillOriginSources: EMSISkillSources[]): boolean {
-    return skillOriginSources.includes('TCACertified') || skillOriginSources.includes('ChallengeWin')
-}
diff --git a/src/libs/core/lib/profile/user-profile.model.ts b/src/libs/core/lib/profile/user-profile.model.ts
index 63db0e186..7b22bca31 100644
--- a/src/libs/core/lib/profile/user-profile.model.ts
+++ b/src/libs/core/lib/profile/user-profile.model.ts
@@ -1,4 +1,4 @@
-import { UserEMSISkill } from './user-skill.model'
+import { UserSkill } from './user-skill.model'
 
 export type TC_TRACKS = 'DEVELOP' | 'DESIGN' | 'DATA_SCIENCE'
 
@@ -15,7 +15,6 @@ export interface UserProfile {
     description: string
     diceEnabled: boolean
     email: string
-    emsiSkills: Array<UserEMSISkill>
     firstName: string
     handle: string
     handleLower: string
@@ -29,6 +28,7 @@ export interface UserProfile {
     }
     photoURL?: string
     roles: Array<string>
+    skills: Array<UserSkill>
     status: string
     tracks?: Array<TC_TRACKS>
     updatedAt: number
diff --git a/src/libs/core/lib/profile/user-skill.model.ts b/src/libs/core/lib/profile/user-skill.model.ts
index 2ad685542..0fa5f6e67 100644
--- a/src/libs/core/lib/profile/user-skill.model.ts
+++ b/src/libs/core/lib/profile/user-skill.model.ts
@@ -1,26 +1,24 @@
-export type skillSources = 'USER_ENTERED' | 'CHALLENGE'
+export type UserSkillCategory = {
+    id: string
+    name: string
+}
 
-export type UserSkill = {
-    id: number
-    hidden: boolean
-    score: number
-    sources: skillSources[]
-    tagName: string
+// keep this in sync with the backend
+// https://github.com/topcoder-platform/standardized-skills-api/blob/develop/src/config/constants.ts#L23
+export enum UserSkillLevelTypes {
+    selfDeclared = 'self-declared',
+    verified = 'verified',
 }
 
-export type EMSISkillSources = 'TCACertified' | 'SelfPicked' | 'ChallengeWin'
+export type UserSkillLevel = {
+    id: string
+    name: UserSkillLevelTypes
+    description: string
+}
 
-export type UserEMSISkill = {
+export type UserSkill = {
     id: string
     name: string
-    skillCategory: {
-        name: string
-        id: number
-    }
-    skillId: string
-    skillSources: Array<EMSISkillSources>
-    skillSubcategory: {
-        name: string
-        id: number
-    }
+    category: UserSkillCategory
+    levels: Array<UserSkillLevel>
 }
diff --git a/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.module.scss b/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.module.scss
new file mode 100644
index 000000000..dbb5d26c3
--- /dev/null
+++ b/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.module.scss
@@ -0,0 +1,14 @@
+@import '@libs/ui/styles/includes';
+
+.skillsCategories {
+    flex: 1;
+    columns: 3 auto;
+
+    @include xl {
+        columns: 2 auto;
+    }
+
+    @include ltelg {
+        columns: 1 auto;
+    }
+}
\ No newline at end of file
diff --git a/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.tsx b/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.tsx
new file mode 100644
index 000000000..39b2a07bb
--- /dev/null
+++ b/src/libs/shared/lib/components/grouped-skills-ui/GroupedSkillsUI.tsx
@@ -0,0 +1,41 @@
+import { FC } from 'react'
+
+import { UserSkill } from '~/libs/core'
+import { SkillPill } from '~/libs/shared'
+
+import { SkillsList } from '../skills-list'
+
+import styles from './GroupedSkillsUI.module.scss'
+
+interface GroupedSkillsUIProps {
+    groupedSkillsByCategory: { [key: string]: UserSkill[] }
+}
+const GroupedSkillsUI: FC<GroupedSkillsUIProps> = (props: GroupedSkillsUIProps) => (
+    <div
+        className={styles.skillsCategories}
+    >
+        {
+            Object.keys(props.groupedSkillsByCategory)
+                .map((categoryName: string) => (
+
+                    <SkillsList
+                        key={categoryName}
+                        header={categoryName}
+                    >
+                        {
+                            props.groupedSkillsByCategory[categoryName]
+                                .map((skill: UserSkill) => (
+                                    <SkillPill
+                                        skill={skill}
+                                        key={skill.id}
+                                        theme='catList'
+                                    />
+                                ))
+                        }
+                    </SkillsList>
+                ))
+        }
+    </div>
+)
+
+export default GroupedSkillsUI
diff --git a/src/libs/shared/lib/components/grouped-skills-ui/index.ts b/src/libs/shared/lib/components/grouped-skills-ui/index.ts
new file mode 100644
index 000000000..700ccb085
--- /dev/null
+++ b/src/libs/shared/lib/components/grouped-skills-ui/index.ts
@@ -0,0 +1 @@
+export { default as GroupedSkillsUI } from './GroupedSkillsUI'
diff --git a/src/libs/shared/lib/components/index.ts b/src/libs/shared/lib/components/index.ts
index 82cde8c0f..ac827849a 100644
--- a/src/libs/shared/lib/components/index.ts
+++ b/src/libs/shared/lib/components/index.ts
@@ -5,3 +5,5 @@ export * from './input-skill-selector'
 export * from './member-skill-editor'
 export * from './skill-pill'
 export * from './expandable-list'
+export * from './grouped-skills-ui'
+export * from './skills-list'
diff --git a/src/libs/shared/lib/components/input-skill-selector/InputSkillSelector.tsx b/src/libs/shared/lib/components/input-skill-selector/InputSkillSelector.tsx
index 20f539681..6883ab2b9 100644
--- a/src/libs/shared/lib/components/input-skill-selector/InputSkillSelector.tsx
+++ b/src/libs/shared/lib/components/input-skill-selector/InputSkillSelector.tsx
@@ -2,13 +2,14 @@ import { ChangeEvent, FC, ReactNode, Ref } from 'react'
 import { noop } from 'lodash'
 
 import { InputMultiselect, InputMultiselectOption, InputMultiselectThemes } from '~/libs/ui'
+import { UserSkill } from '~/libs/core'
 
-import { autoCompleteSkills, EmsiSkill, isSkillVerified } from '../../services/emsi-skills'
+import { autoCompleteSkills, isSkillVerified } from '../../services/standard-skills'
 
-const mapEmsiSkillToInputOption = (skill: EmsiSkill): InputMultiselectOption => ({
+const mapSkillToInputOption = (skill: UserSkill): InputMultiselectOption => ({
     ...skill,
     label: skill.name,
-    value: skill.skillId,
+    value: skill.id,
     verified: isSkillVerified(skill),
 })
 
@@ -22,7 +23,7 @@ const fetchSkills = (queryTerm: string): Promise<Option[]> => (
         .then(skills => (
             skills.map(skill => ({
                 label: skill.name,
-                value: skill.emsiId,
+                value: skill.id,
             }))
         ))
 )
@@ -35,7 +36,7 @@ interface InputSkillSelectorProps {
     readonly loading?: boolean
     readonly onChange?: (event: ChangeEvent<HTMLInputElement>) => void
     readonly placeholder?: string
-    readonly value?: EmsiSkill[]
+    readonly value?: UserSkill[]
     readonly theme?: InputMultiselectThemes
     readonly useWrapper?: boolean
     readonly dropdownIcon?: ReactNode
@@ -54,7 +55,7 @@ const InputSkillSelector: FC<InputSkillSelectorProps> = props => (
         onFetchOptions={fetchSkills}
         name='skills'
         onChange={props.onChange ?? noop}
-        value={props.value?.map(mapEmsiSkillToInputOption)}
+        value={props.value?.map(mapSkillToInputOption)}
         loading={props.loading}
         theme={props.theme}
         useWrapper={props.useWrapper}
diff --git a/src/libs/shared/lib/components/member-skill-editor/use-member-skill-editor.tsx b/src/libs/shared/lib/components/member-skill-editor/use-member-skill-editor.tsx
index 22279a336..87e2ceda2 100644
--- a/src/libs/shared/lib/components/member-skill-editor/use-member-skill-editor.tsx
+++ b/src/libs/shared/lib/components/member-skill-editor/use-member-skill-editor.tsx
@@ -1,16 +1,14 @@
 import { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react'
-import { differenceWith } from 'lodash'
+import { differenceWith, pick } from 'lodash'
 
-import { profileContext, ProfileContextData } from '~/libs/core'
+import { profileContext, ProfileContextData, UserSkill } from '~/libs/core'
 
 import {
-    createMemberEmsiSkills,
-    EmsiSkill,
-    EmsiSkillSources,
+    createMemberSkills,
     fetchMemberSkills,
     isSkillVerified,
-    updateMemberEmsiSkills,
-} from '../../services/emsi-skills'
+    updateMemberSkills,
+} from '../../services/standard-skills'
 import { InputSkillSelector } from '../input-skill-selector'
 
 export interface MemberSkillEditor {
@@ -22,11 +20,11 @@ export interface MemberSkillEditor {
  * Hook to provide functionality for using the member skill editor
  * Usage example:
  * ```
- *   const { formInput: emsiFormInput, saveSkills: saveEmsiSkills }: MemberSkillEditor = useMemberSkillEditor()
+ *   const editor: MemberSkillEditor = useMemberSkillEditor()
  *   ...
  *   <>
- *     {emsiFormInput}
- *     <Button primary onClick={saveEmsiSkills}>Save Skills</Button>
+ *     {editor.formInput}
+ *     <Button primary onClick={editor.saveSkills}>Save Skills</Button>
  *   </>
  * ```
  * @returns
@@ -36,31 +34,32 @@ export const useMemberSkillEditor = ({
     limit,
 }: {limit?: number} = {}): MemberSkillEditor => {
     const { profile }: ProfileContextData = useContext(profileContext)
-    const [isEmsiInitialized, setIsEmsiInitialized] = useState<boolean>(false)
-    const [skills, setSkills] = useState<EmsiSkill[]>([])
+    const [isInitialized, setIsInitialized] = useState<boolean>(false)
+    const [skills, setSkills] = useState<UserSkill[]>([])
     const [loading, setLoading] = useState<boolean>(true)
     const [, setError] = useState<string>()
 
-    // Function that saves the updated emsi skills, will be called from outside
+    // Function that saves the updated skills, will be called from outside
     const saveSkills = useCallback(async () => {
         if (!profile?.userId) {
             return
         }
 
-        const emsiSkills = skills.map(s => ({ emsiId: s.skillId, name: s.name, sources: s.skillSources }))
-        if (!isEmsiInitialized) {
-            await createMemberEmsiSkills(profile.userId, emsiSkills)
-            setIsEmsiInitialized(true)
+        const skillIds = skills.map(skill => pick(skill, 'id'))
+
+        if (!isInitialized) {
+            await createMemberSkills(profile.userId, skillIds)
+            setIsInitialized(true)
             return
         }
 
-        await updateMemberEmsiSkills(profile.userId, emsiSkills)
-    }, [isEmsiInitialized, profile?.userId, skills])
+        await updateMemberSkills(profile.userId, skillIds)
+    }, [isInitialized, profile?.userId, skills])
 
     // Handle user changes
 
     const handleRemoveSkill = useCallback((skillId: string): void => {
-        const skill = skills.find(s => s.skillId === skillId)
+        const skill = skills.find(s => s.id === skillId)
         if (!skill) {
             return
         }
@@ -69,25 +68,26 @@ export const useMemberSkillEditor = ({
             return
         }
 
-        setSkills(skills.filter(s => s.skillId !== skillId))
+        setSkills(skills.filter(s => s.id !== skillId))
     }, [skills])
 
     const handleAddSkill = useCallback((skillData: any): void => {
-        if (skills.find(s => s.skillId === skillData.value)) {
+        if (skills.find(s => s.id === skillData.value)) {
             return
         }
 
         setSkills([...skills, {
+            category: skillData.category,
+            id: skillData.value,
+            levels: [],
             name: skillData.label,
-            skillId: skillData.value,
-            skillSources: [EmsiSkillSources.selfPicked],
         }])
     }, [skills])
 
     const handleOnChange = useCallback(({ target: { value } }: any): void => {
-        const removed = differenceWith(skills, value, (s, v: any) => s.skillId === v.value)
+        const removed = differenceWith(skills, value, (s, v: any) => s.id === v.value)
         if (removed.length) {
-            removed.map(s => handleRemoveSkill(s.skillId))
+            removed.map(s => handleRemoveSkill(s.id))
         }
 
         const added = differenceWith(value, skills, (v: any, s: any) => v.value === s.skillId)
@@ -96,7 +96,7 @@ export const useMemberSkillEditor = ({
         }
     }, [handleAddSkill, handleRemoveSkill, skills])
 
-    // Load member's emsi skills, set loading state & isEmsiInitialized
+    // Load member's skills, set loading state & isInitialized
     useEffect(() => {
         if (!profile?.userId) {
             return undefined
@@ -108,13 +108,13 @@ export const useMemberSkillEditor = ({
                 setError(e?.message ?? e)
                 return []
             })
-            .then(emsiSkills => {
+            .then(savedSkills => {
                 if (!mounted) {
                     return
                 }
 
-                setIsEmsiInitialized(emsiSkills?.length > 0)
-                setSkills(emsiSkills)
+                setIsInitialized(savedSkills?.length > 0)
+                setSkills(savedSkills)
                 setLoading(false)
             })
 
diff --git a/src/libs/shared/lib/components/skill-pill/SkillPill.module.scss b/src/libs/shared/lib/components/skill-pill/SkillPill.module.scss
index 6e38e1c8c..9740c7b27 100644
--- a/src/libs/shared/lib/components/skill-pill/SkillPill.module.scss
+++ b/src/libs/shared/lib/components/skill-pill/SkillPill.module.scss
@@ -61,4 +61,11 @@
         border-color: $black-20;
         color: $black-60;
     }
+
+    &-catList {
+        border: none;
+        color: $black-100;
+        padding: $sp-2 0;
+        align-items: flex-start;
+    }
 }
diff --git a/src/libs/shared/lib/components/skill-pill/SkillPill.tsx b/src/libs/shared/lib/components/skill-pill/SkillPill.tsx
index 495e2a0dd..2800850f9 100644
--- a/src/libs/shared/lib/components/skill-pill/SkillPill.tsx
+++ b/src/libs/shared/lib/components/skill-pill/SkillPill.tsx
@@ -2,32 +2,34 @@ import { FC, ReactNode, useCallback, useMemo } from 'react'
 import classNames from 'classnames'
 
 import { IconOutline } from '~/libs/ui'
+import { UserSkill } from '~/libs/core'
 
-import { isSkillVerified, Skill } from '../../services'
+import { isSkillVerified } from '../../services/standard-skills'
 
 import styles from './SkillPill.module.scss'
 
 export interface SkillPillProps {
     children?: ReactNode
-    onClick?: (skill: Skill) => void
+    onClick?: (skill: UserSkill) => void
     selected?: boolean
-    skill: Pick<Skill, 'name'|'skillSources'>
-    theme?: 'dark' | 'verified' | 'presentation' | 'etc'
+    skill: Pick<UserSkill, 'name'|'levels'>
+    theme?: 'dark' | 'verified' | 'presentation' | 'etc' | 'catList'
 }
 
 const SkillPill: FC<SkillPillProps> = props => {
     const isVerified = useMemo(() => (
-        isSkillVerified({ skillSources: props.skill.skillSources ?? [] })
+        isSkillVerified({ levels: props.skill.levels ?? [] })
     ), [props.skill])
 
     const className = classNames(
         styles.pill,
         props.onClick && styles.interactive,
         props.selected && styles.selected,
-        styles[`theme-${isVerified ? 'verified' : (props.theme ?? 'presentation')}`],
+        styles[`theme-${isVerified ? 'verified' : ''}`],
+        styles[`theme-${props.theme ?? ''}`],
     )
 
-    const handleClick = useCallback(() => props.onClick?.call(undefined, props.skill as Skill), [
+    const handleClick = useCallback(() => props.onClick?.call(undefined, props.skill as UserSkill), [
         props.onClick, props.skill,
     ])
 
diff --git a/src/libs/shared/lib/components/skills-list/SkillsList.module.scss b/src/libs/shared/lib/components/skills-list/SkillsList.module.scss
new file mode 100644
index 000000000..251cafd2e
--- /dev/null
+++ b/src/libs/shared/lib/components/skills-list/SkillsList.module.scss
@@ -0,0 +1,55 @@
+@import '@libs/ui/styles/includes';
+
+.container {
+    display: flex;
+    flex-direction: column;
+    background-color: $tc-white;
+    border-radius: 8px;
+    margin-bottom: $sp-4;
+
+    &.collapsed {
+        .title {
+            font-weight: 400 !important;
+        }
+
+        .content {
+            max-height: 0;
+            overflow: hidden;
+            padding: 0;
+            margin-top: 0;
+            opacity: 0;
+        }
+    }
+
+    .header {
+        display: flex;
+        justify-content: flex-start;
+        align-items: flex-start;
+
+        .title {
+            font-weight: 700;
+            font-size: 14px;
+        }
+
+        .badgeCount {
+            background-color: $black-10;
+            border-radius: 50%;
+            padding: 0 $sp-2;
+            font-weight: 700;
+            font-size: 14px;
+            margin-left: $sp-2;
+        }
+    }
+
+    .content {
+        transition: opacity 0.3s ease-in-out;
+        max-height: auto;
+        opacity: 1;
+        padding-left: $sp-4;
+        margin-top: $sp-1;
+
+        @include ltemd {
+            padding-left: $sp-2;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/libs/shared/lib/components/skills-list/SkillsList.tsx b/src/libs/shared/lib/components/skills-list/SkillsList.tsx
new file mode 100644
index 000000000..2a2f13971
--- /dev/null
+++ b/src/libs/shared/lib/components/skills-list/SkillsList.tsx
@@ -0,0 +1,29 @@
+import { FC, ReactNode } from 'react'
+import classNames from 'classnames'
+
+import styles from './SkillsList.module.scss'
+
+interface SkillsListProps {
+    children?: ReactNode[]
+    header?: ReactNode
+    containerClass?: string
+    headerClass?: string
+    contentClass?: string
+}
+
+const SkillsList: FC<SkillsListProps> = (props: SkillsListProps) => (
+    <div className={classNames(styles.container, props.containerClass)}>
+        <div className={classNames(styles.header, props.headerClass)}>
+            <div className={styles.title}>{props.header}</div>
+            <div className={styles.badgeCount}>
+                {props.children && props.children.length}
+            </div>
+        </div>
+
+        <div className={classNames(styles.content, props.contentClass)}>
+            {props.children}
+        </div>
+    </div>
+)
+
+export default SkillsList
diff --git a/src/libs/shared/lib/components/skills-list/index.ts b/src/libs/shared/lib/components/skills-list/index.ts
new file mode 100644
index 000000000..ee1dfc41d
--- /dev/null
+++ b/src/libs/shared/lib/components/skills-list/index.ts
@@ -0,0 +1 @@
+export { default as SkillsList } from './SkillsList'
diff --git a/src/libs/shared/lib/services/emsi-skills/emsi-skills.service.ts b/src/libs/shared/lib/services/emsi-skills/emsi-skills.service.ts
deleted file mode 100644
index 067cab1c4..000000000
--- a/src/libs/shared/lib/services/emsi-skills/emsi-skills.service.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { EnvironmentConfig } from '~/config'
-import { xhrGetAsync, xhrPostAsync, xhrPutAsync } from '~/libs/core'
-
-import { EmsiSkill, Skill } from './skill.model'
-
-const baseUrl = `${EnvironmentConfig.API.V5}/emsi-skills/member-emsi-skills`
-
-export async function autoCompleteSkills(queryTerm: string): Promise<Skill[]> {
-    if (!queryTerm) {
-        return Promise.resolve([])
-    }
-
-    const encodedQuery = encodeURIComponent(queryTerm)
-    return xhrGetAsync(`${EnvironmentConfig.API.V5}/emsi-skills/skills/auto-complete?term=${encodedQuery}`)
-}
-
-export type FetchMemberSkillsConfig = {
-    skipPagination: boolean
-}
-export async function fetchMemberSkills(
-    userId: string | number | undefined,
-    config: FetchMemberSkillsConfig,
-): Promise<EmsiSkill[]> {
-    const url = `${baseUrl}/${userId}?pageFlag=${!config.skipPagination}`
-    return xhrGetAsync(url)
-}
-
-export async function createMemberEmsiSkills(userId: number, skills: Skill[]): Promise<void> {
-    return xhrPostAsync(baseUrl, {
-        emsiSkills: skills,
-        userId,
-    })
-}
-
-export async function updateMemberEmsiSkills(userId: string | number, skills: Skill[]): Promise<void> {
-    return xhrPutAsync(`${baseUrl}/${userId}`, {
-        emsiSkills: skills,
-    })
-}
diff --git a/src/libs/shared/lib/services/emsi-skills/index.ts b/src/libs/shared/lib/services/emsi-skills/index.ts
deleted file mode 100644
index a80550778..000000000
--- a/src/libs/shared/lib/services/emsi-skills/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './skill.model'
-export * from './emsi-skills.service'
-export * from './skills.utils'
diff --git a/src/libs/shared/lib/services/emsi-skills/skill.model.ts b/src/libs/shared/lib/services/emsi-skills/skill.model.ts
deleted file mode 100644
index c221cb8b0..000000000
--- a/src/libs/shared/lib/services/emsi-skills/skill.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export enum EmsiSkillSources {
-    selfPicked = 'SelfPicked',
-    challengeWin = 'ChallengeWin',
-}
-
-export interface Skill {
-    name: string;
-    emsiId: string;
-    skillSources?: EmsiSkillSources[];
-}
-
-export interface EmsiSkill {
-    name: string;
-    skillId: string;
-    skillSources: EmsiSkillSources[]
-}
diff --git a/src/libs/shared/lib/services/emsi-skills/skills.utils.ts b/src/libs/shared/lib/services/emsi-skills/skills.utils.ts
deleted file mode 100644
index 8a54ee068..000000000
--- a/src/libs/shared/lib/services/emsi-skills/skills.utils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { EmsiSkill, EmsiSkillSources } from './skill.model'
-
-export const isSkillVerified = (skill: Pick<EmsiSkill, 'skillSources'>): boolean => (
-    !!skill.skillSources?.includes(EmsiSkillSources.challengeWin)
-)
diff --git a/src/libs/shared/lib/services/index.ts b/src/libs/shared/lib/services/index.ts
index ef94db4f5..b7999a344 100644
--- a/src/libs/shared/lib/services/index.ts
+++ b/src/libs/shared/lib/services/index.ts
@@ -1 +1 @@
-export * from './emsi-skills'
+export * from './standard-skills'
diff --git a/src/libs/shared/lib/services/standard-skills/index.ts b/src/libs/shared/lib/services/standard-skills/index.ts
new file mode 100644
index 000000000..95a09a932
--- /dev/null
+++ b/src/libs/shared/lib/services/standard-skills/index.ts
@@ -0,0 +1,2 @@
+export * from './standard-skills.service'
+export * from './skills.utils'
diff --git a/src/libs/shared/lib/services/standard-skills/skills.utils.ts b/src/libs/shared/lib/services/standard-skills/skills.utils.ts
new file mode 100644
index 000000000..97d518f1b
--- /dev/null
+++ b/src/libs/shared/lib/services/standard-skills/skills.utils.ts
@@ -0,0 +1,7 @@
+import { find } from 'lodash'
+
+import { UserSkill, UserSkillLevelTypes } from '~/libs/core'
+
+export const isSkillVerified = (skill: Pick<UserSkill, 'levels'>): boolean => (
+    !!find(skill.levels, { name: UserSkillLevelTypes.verified })
+)
diff --git a/src/libs/shared/lib/services/standard-skills/standard-skills.service.ts b/src/libs/shared/lib/services/standard-skills/standard-skills.service.ts
new file mode 100644
index 000000000..1eb55874a
--- /dev/null
+++ b/src/libs/shared/lib/services/standard-skills/standard-skills.service.ts
@@ -0,0 +1,44 @@
+import { EnvironmentConfig } from '~/config'
+import { UserSkill, xhrGetAsync, xhrPostAsync, xhrPutAsync } from '~/libs/core'
+
+const baseUrl = `${EnvironmentConfig.API.V5}/standardized-skills`
+
+export interface UpdateUserSkillDTO {
+    id: string
+    levelId?: string
+}
+
+export async function autoCompleteSkills(queryTerm: string): Promise<UserSkill[]> {
+    if (!queryTerm) {
+        return Promise.resolve([])
+    }
+
+    const encodedQuery = encodeURIComponent(queryTerm)
+    return xhrGetAsync(`${baseUrl}/skills/autocomplete?term=${encodedQuery}`)
+}
+
+export type FetchMemberSkillsConfig = {
+    skipPagination: boolean
+}
+export async function fetchMemberSkills(
+    userId: string | number | undefined,
+    config: FetchMemberSkillsConfig,
+): Promise<UserSkill[]> {
+    const url = `${baseUrl}/user-skills/${userId}?disablePagination=${config.skipPagination}`
+    return xhrGetAsync(url)
+}
+
+export async function createMemberSkills(userId: number, skills: UpdateUserSkillDTO[]): Promise<void> {
+    return xhrPostAsync(`${baseUrl}/user-skills/${userId}`, {
+        skills,
+    })
+}
+
+export async function updateMemberSkills(
+    userId: string | number,
+    skills: UpdateUserSkillDTO[],
+): Promise<void> {
+    return xhrPutAsync(`${baseUrl}/user-skills/${userId}`, {
+        skills,
+    })
+}