diff --git a/config/default.js b/config/default.js
index 52923d7f..8a5a7cf1 100644
--- a/config/default.js
+++ b/config/default.js
@@ -35,8 +35,8 @@ module.exports = {
   TC_API: process.env.TC_API || 'https://api.topcoder-dev.com/v5',
   // the organization id
   ORG_ID: process.env.ORG_ID || '36ed815b-3da1-49f1-a043-aaed0a4e81ad',
-  // the referenced skill provider id
-  TOPCODER_SKILL_PROVIDER_ID: process.env.TOPCODER_SKILL_PROVIDER_ID || '9cc0795a-6e12-4c84-9744-15858dba1861',
+  // the referenced taxonomy id
+  TOPCODER_TAXONOMY_ID: process.env.TOPCODER_TAXONOMY_ID || '7637ae1a-3b7c-44eb-a5ed-10ea02f1885d',
 
   TOPCODER_USERS_API: process.env.TOPCODER_USERS_API || 'https://api.topcoder-dev.com/v3/users',
   // the api to find topcoder members
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index bfcf3abd..29e5872a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3157,7 +3157,7 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: "#/components/schemas/UbahnSkill"
+                  $ref: "#/components/schemas/SkillInSkillsAPI"
           headers:
             X-Next-Page:
               schema:
@@ -5467,17 +5467,25 @@ components:
           type: string
           example: "React"
           description: The skill name.
-    UbahnSkill:
-      type: object
+    SkillInSkillsAPI:
+      required:
+        - "id"
+        - "name"
+        - "taxonomyId"
+        - "taxonomyName"
+        - "metadata"
       properties:
         id:
           type: "string"
           format: "UUID"
           description: "The skill id"
-        skillProviderId:
+        taxonomyId:
           type: "string"
           format: "UUID"
-          description: "The referenced skill provider id"
+          description: "The referenced taxonomy id"
+        taxonomyName:
+          type: "string"
+          description: "The referenced taxonomy name"
         name:
           type: "string"
           description: "The name of the skill"
@@ -5487,22 +5495,20 @@ components:
         uri:
           type: "string"
           description: "The uri for the skill"
-        created:
-          type: "string"
-          format: "date-time"
-          description: "When the entity was created."
-        updated:
-          type: "string"
-          format: "date-time"
-          description: "When the entity was updated."
-        createdBy:
-          type: "string"
-          format: "UUID"
-          description: "Creator of the entity."
-        updatedBy:
-          type: "string"
-          format: "UUID"
-          description: "User that last updated the entity."
+        metadata:
+          type: "object"
+          description: "The metadata for the skill"
+          properties:
+            updated:
+              type: "string"
+              format: "date-time"
+              description: "The last updated timestamp of the skill"
+            challengeProminence:
+              type: "string"
+              description: "The challenge prominence ranging from [0, 1]"
+            memberProminence:
+              type: "string"
+              description: "The member prominence ranging from [0, 1]"
     JobForTeam:
       properties:
         id:
diff --git a/src/common/helper.js b/src/common/helper.js
index 1fd28f60..f6180164 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -1211,21 +1211,21 @@ async function getProjectById (currentUser, id) {
 
 /**
  * Function to search skills from v5/skills
- * - only returns skills from Topcoder Skills Provider defined by `TOPCODER_SKILL_PROVIDER_ID`
+ * - only returns skills from Topcoder Skills API defined by `TOPCODER_TAXONOMY_ID`
  *
  * @param {Object} criteria the search criteria
  * @returns the request result
  */
 async function getTopcoderSkills (criteria) {
-  const token = await getM2MUbahnToken()
+  const token = await getM2MToken()
   try {
     const res = await request
       .get(`${config.TC_API}/skills`)
+      .set('Authorization', `Bearer ${token}`)
       .query({
-        skillProviderId: config.TOPCODER_SKILL_PROVIDER_ID,
+        taxonomyId: config.TOPCODER_TAXONOMY_ID,
         ...criteria
       })
-      .set('Authorization', `Bearer ${token}`)
       .set('Content-Type', 'application/json')
       .set('Accept', 'application/json')
     localLogger.debug({
@@ -1248,7 +1248,7 @@ async function getTopcoderSkills (criteria) {
 
 /**
  * Function to search and retrive all skills from v5/skills
- * - only returns skills from Topcoder Skills Provider defined by `TOPCODER_SKILL_PROVIDER_ID`
+ * - only returns skills from Topcoder Skills API defined by `TOPCODER_TAXONOMY_ID`
  *
  * @param {Object} criteria the search criteria
  * @returns the request result
@@ -1270,7 +1270,7 @@ async function getAllTopcoderSkills (criteria) {
  * @returns the request result
  */
 async function getSkillById (skillId) {
-  const token = await getM2MUbahnToken()
+  const token = await getM2MToken()
   const res = await request
     .get(`${config.TC_API}/skills/${skillId}`)
     .set('Authorization', `Bearer ${token}`)