diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..d3337c5373
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,24 @@
+# Common file for apps that rely on root context
+.git
+.github
+.husky
+audits
+docs
+scripts
+**/node_modules
+**/build
+**/dist
+
+# Core package artifacts
+# Hardhat files
+**/abis
+**/artifacts
+**/cache
+**/.deps
+# TypeScript bindings output directory
+**/typechain-types
+
+# Docker-related
+.dockerignore
+**/Dockerfile*
+**/docker-compose*
diff --git a/.github/workflows/cd-cvat-exchange-oracle.yaml b/.github/workflows/cd-cvat-exchange-oracle.yaml
index a1f2679eec..894e01d50f 100644
--- a/.github/workflows/cd-cvat-exchange-oracle.yaml
+++ b/.github/workflows/cd-cvat-exchange-oracle.yaml
@@ -14,6 +14,9 @@ on:
 permissions:
   id-token: write
   contents: read
+concurrency:
+  group: docker-compose-oracles-${{ github.ref }}
+  cancel-in-progress: false  # Ensure the workflow waits instead of canceling others
 
 jobs:
   pull-request-check:
diff --git a/.github/workflows/cd-cvat-recording-oracle.yaml b/.github/workflows/cd-cvat-recording-oracle.yaml
index 487c51876b..f2e64bd8c6 100644
--- a/.github/workflows/cd-cvat-recording-oracle.yaml
+++ b/.github/workflows/cd-cvat-recording-oracle.yaml
@@ -15,6 +15,10 @@ permissions:
   id-token: write
   contents: read
 
+concurrency:
+  group: docker-compose-oracles-${{ github.ref }}
+  cancel-in-progress: false  # Ensure the workflow waits instead of canceling others
+
 jobs:
   pull-request-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/cd-subgraph.yaml b/.github/workflows/cd-subgraph.yaml
index 8e1be41306..d8858b1e56 100644
--- a/.github/workflows/cd-subgraph.yaml
+++ b/.github/workflows/cd-subgraph.yaml
@@ -6,6 +6,9 @@ on:
       label:
         description: 'New version label'
         required: true
+      networks:
+        description: 'Comma-separated list of networks to deploy'
+        required: true
 
 jobs:
   subgraph:
@@ -15,41 +18,59 @@ jobs:
       matrix:
         network:
           - name: amoy
-          - name: avalanche
           - name: bsc-testnet
           - name: bsc
-          - name: celo-alfajores
-          - name: celo
           - name: ethereum
-          - name: fuji
-          - name: moonbase-alpha
-          - name: moonbeam
           - name: polygon
           - name: sepolia
-          - name: xlayer-testnet
-          - name: xlayer
       fail-fast: true
       max-parallel: 3
     steps:
       - uses: actions/checkout@v4
-      - run: npm install --global yarn && yarn --ignore-scripts
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.20.1'
+      - name: Filter Networks
+        id: filter_networks
+        run: |
+          INPUT_NETWORKS="${{ github.event.inputs.networks }}"
+          IFS=',' read -ra NETWORK_LIST <<< "$INPUT_NETWORKS"
+          echo "Input networks: $INPUT_NETWORKS"
+          echo "Current matrix network: ${{ matrix.network.name }}"
+          MATCH=false
+          for network in "${NETWORK_LIST[@]}"; do
+            if [[ "${network}" == "${{ matrix.network.name }}" ]]; then
+              MATCH=true
+              break
+            fi
+          done
+          echo "Match found: $MATCH"
+          echo "::set-output name=continue::$MATCH"
+      - run: npm install --global yarn && yarn
         name: Install dependencies
+        if: steps.filter_networks.outputs.continue == 'true'
       - run: yarn build
         name: Build core package
         working-directory: ./packages/core
-      - run: yarn global add @graphprotocol/graph-cli
+        if: steps.filter_networks.outputs.continue == 'true'
+      - run: yarn global add @graphprotocol/graph-cli@0.71.2
         name: Install Graph CLI
+        if: steps.filter_networks.outputs.continue == 'true'
       - run: graph auth --studio ${API_KEY}
         name: Authenticate Graph CLI
         env:
           API_KEY: ${{ secrets.HP_GRAPH_API_KEY }}
+        if: steps.filter_networks.outputs.continue == 'true'
       - run: yarn generate && yarn build
         name: Generate and build Subgraph
         working-directory: ./packages/sdk/typescript/subgraph
         env:
           NETWORK: ${{ matrix.network.name }}
+        if: steps.filter_networks.outputs.continue == 'true'
       - run: graph deploy --studio ${NETWORK} -l ${{ github.event.inputs.label }}
         name: Deploy Subgraph
         working-directory: ./packages/sdk/typescript/subgraph
         env:
           NETWORK: ${{ matrix.network.name }}
+        if: steps.filter_networks.outputs.continue == 'true'
diff --git a/.github/workflows/ci-test-subgraph.yaml b/.github/workflows/ci-test-subgraph.yaml
index c3146e96d4..a48cba94a0 100644
--- a/.github/workflows/ci-test-subgraph.yaml
+++ b/.github/workflows/ci-test-subgraph.yaml
@@ -13,7 +13,8 @@ on:
 jobs:
   subgraph-test:
     name: Subgraph Test
-    runs-on: ubuntu-latest
+    # TODO: Use ubuntu-latest when graph binary is not failing on ubuntu 24.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: npm install --global yarn && yarn
diff --git a/.gitignore b/.gitignore
index 03a667ba70..0fb820a136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,8 @@ node_modules
 
 # dotenv environment variable files
 .env
-.env.development.local
-.env.test.local
-.env.production.local
 .env.local
+.env.*.local
 
 # Log files
 npm-debug.log*
diff --git a/docs/sdk/python/human_protocol_sdk.constants.md b/docs/sdk/python/human_protocol_sdk.constants.md
index 8184f41422..d60606cca3 100644
--- a/docs/sdk/python/human_protocol_sdk.constants.md
+++ b/docs/sdk/python/human_protocol_sdk.constants.md
@@ -6,54 +6,36 @@ Bases: `Enum`
 
 Enum for chain IDs.
 
-#### AVALANCHE *= 43114*
-
-#### AVALANCHE_TESTNET *= 43113*
-
 #### BSC_MAINNET *= 56*
 
 #### BSC_TESTNET *= 97*
 
-#### CELO *= 42220*
-
-#### CELO_ALFAJORES *= 44787*
-
-#### GOERLI *= 5*
-
 #### LOCALHOST *= 1338*
 
 #### MAINNET *= 1*
 
-#### MOONBASE_ALPHA *= 1287*
-
-#### MOONBEAM *= 1284*
-
 #### POLYGON *= 137*
 
 #### POLYGON_AMOY *= 80002*
 
-#### POLYGON_MUMBAI *= 80001*
-
-#### RINKEBY *= 4*
-
 #### SEPOLIA *= 11155111*
 
-#### XLAYER *= 196*
-
-#### XLAYER_TESTNET *= 195*
-
 ### *class* human_protocol_sdk.constants.KVStoreKeys(value)
 
 Bases: `Enum`
 
 Enum for KVStore keys
 
+#### category *= 'category'*
+
 #### fee *= 'fee'*
 
 #### job_types *= 'job_types'*
-
+#### name *= 'name'*
 #### public_key *= 'public_key'*
 
+#### public_key_hash *= 'public_key_hash'*
+
 #### registration_instructions *= 'registration_instructions'*
 
 #### registration_needed *= 'registration_needed'*
@@ -64,6 +46,18 @@ Enum for KVStore keys
 
 #### webhook_url *= 'webhook_url'*
 
+#### website *= 'website'*
+
+### *class* human_protocol_sdk.constants.LeaderCategory(value)
+
+Bases: `Enum`
+
+Enum for leader categories
+
+#### MACHINE_LEARNING *= 'machine_learning'*
+
+#### MARKET_MAKING *= 'market_making'*
+
 ### *class* human_protocol_sdk.constants.OrderDirection(value)
 
 Bases: `Enum`
@@ -88,8 +82,6 @@ Enum for roles.
 
 #### reputation_oracle *= 'Reputation Oracle'*
 
-#### validator *= 'Validator'*
-
 ### *class* human_protocol_sdk.constants.Status(value)
 
 Bases: `Enum`
diff --git a/docs/sdk/python/human_protocol_sdk.md b/docs/sdk/python/human_protocol_sdk.md
index 6e9d0c4f79..79b69427ef 100644
--- a/docs/sdk/python/human_protocol_sdk.md
+++ b/docs/sdk/python/human_protocol_sdk.md
@@ -59,16 +59,6 @@
       * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
       * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
       * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
-* [human_protocol_sdk.kvstore.kvstore_utils module](human_protocol_sdk.kvstore.kvstore_utils.md)
-  * [Code Example](human_protocol_sdk.kvstore.kvstore_utils.md#code-example)
-  * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
-  * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
-    * [`KVStoreData.__init__()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData.__init__)
-  * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
-    * [`KVStoreUtils.get()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get)
-    * [`KVStoreUtils.get_file_url_and_verify_hash()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_file_url_and_verify_hash)
-    * [`KVStoreUtils.get_kvstore_data()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_kvstore_data)
-    * [`KVStoreUtils.get_public_key()`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils.get_public_key)
 * [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
   * [Submodules](human_protocol_sdk.operator.md#submodules)
     * [human_protocol_sdk.operator.operator_utils module](human_protocol_sdk.operator.operator_utils.md)
@@ -129,33 +119,28 @@
 
 * [human_protocol_sdk.constants module](human_protocol_sdk.constants.md)
   * [`ChainId`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId)
-    * [`ChainId.AVALANCHE`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.AVALANCHE)
-    * [`ChainId.AVALANCHE_TESTNET`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.AVALANCHE_TESTNET)
     * [`ChainId.BSC_MAINNET`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.BSC_MAINNET)
     * [`ChainId.BSC_TESTNET`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.BSC_TESTNET)
-    * [`ChainId.CELO`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.CELO)
-    * [`ChainId.CELO_ALFAJORES`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.CELO_ALFAJORES)
-    * [`ChainId.GOERLI`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.GOERLI)
     * [`ChainId.LOCALHOST`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.LOCALHOST)
     * [`ChainId.MAINNET`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.MAINNET)
-    * [`ChainId.MOONBASE_ALPHA`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.MOONBASE_ALPHA)
-    * [`ChainId.MOONBEAM`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.MOONBEAM)
     * [`ChainId.POLYGON`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.POLYGON)
     * [`ChainId.POLYGON_AMOY`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.POLYGON_AMOY)
-    * [`ChainId.POLYGON_MUMBAI`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.POLYGON_MUMBAI)
-    * [`ChainId.RINKEBY`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.RINKEBY)
     * [`ChainId.SEPOLIA`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.SEPOLIA)
-    * [`ChainId.XLAYER`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.XLAYER)
-    * [`ChainId.XLAYER_TESTNET`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.XLAYER_TESTNET)
   * [`KVStoreKeys`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys)
+    * [`KVStoreKeys.category`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.category)
     * [`KVStoreKeys.fee`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.fee)
     * [`KVStoreKeys.job_types`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.job_types)
     * [`KVStoreKeys.public_key`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.public_key)
+    * [`KVStoreKeys.public_key_hash`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.public_key_hash)
     * [`KVStoreKeys.registration_instructions`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.registration_instructions)
     * [`KVStoreKeys.registration_needed`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.registration_needed)
     * [`KVStoreKeys.role`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.role)
     * [`KVStoreKeys.url`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.url)
     * [`KVStoreKeys.webhook_url`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.webhook_url)
+    * [`KVStoreKeys.website`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.website)
+  * [`LeaderCategory`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.LeaderCategory)
+    * [`LeaderCategory.MACHINE_LEARNING`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.LeaderCategory.MACHINE_LEARNING)
+    * [`LeaderCategory.MARKET_MAKING`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.LeaderCategory.MARKET_MAKING)
   * [`OrderDirection`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.OrderDirection)
     * [`OrderDirection.ASC`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.OrderDirection.ASC)
     * [`OrderDirection.DESC`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.OrderDirection.DESC)
@@ -164,7 +149,6 @@
     * [`Role.job_launcher`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Role.job_launcher)
     * [`Role.recording_oracle`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Role.recording_oracle)
     * [`Role.reputation_oracle`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Role.reputation_oracle)
-    * [`Role.validator`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Role.validator)
   * [`Status`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Status)
     * [`Status.Cancelled`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Status.Cancelled)
     * [`Status.Complete`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Status.Complete)
diff --git a/docs/sdk/python/human_protocol_sdk.operator.operator_utils.md b/docs/sdk/python/human_protocol_sdk.operator.operator_utils.md
index 2b0ba2b266..1200f47d0d 100644
--- a/docs/sdk/python/human_protocol_sdk.operator.operator_utils.md
+++ b/docs/sdk/python/human_protocol_sdk.operator.operator_utils.md
@@ -17,11 +17,11 @@ print(
 
 ## Module
 
-### *class* human_protocol_sdk.operator.operator_utils.LeaderData(chain_id, id, address, amount_staked, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, website=None, url=None, job_types=None, registration_needed=None, registration_instructions=None, reputation_networks=None)
+### *class* human_protocol_sdk.operator.operator_utils.LeaderData(chain_id, id, address, amount_staked, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, website=None, url=None, job_types=None, registration_needed=None, registration_instructions=None, reputation_networks=None, name=None, category=None)
 
 Bases: `object`
 
-#### \_\_init_\_(chain_id, id, address, amount_staked, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, website=None, url=None, job_types=None, registration_needed=None, registration_instructions=None, reputation_networks=None)
+#### \_\_init_\_(chain_id, id, address, amount_staked, amount_locked, locked_until_timestamp, amount_withdrawn, amount_slashed, reward, amount_jobs_processed, role=None, fee=None, public_key=None, webhook_url=None, website=None, url=None, job_types=None, registration_needed=None, registration_instructions=None, reputation_networks=None, name=None, category=None)
 
 Initializes a LeaderData instance.
 
@@ -46,6 +46,8 @@ Initializes a LeaderData instance.
   * **registration_needed** (`Optional`[`bool`]) – Whether registration is needed
   * **registration_instructions** (`Optional`[`str`]) – Registration instructions
   * **reputation_networks** (`Optional`[`List`[`str`]]) – List of reputation networks
+  * **name** (`Optional`[`str`]) – Name
+  * **category** (`Optional`[`str`]) – Category
 
 ### *class* human_protocol_sdk.operator.operator_utils.LeaderFilter(chain_id, roles=[], min_amount_staked=None, order_by=None, order_direction=OrderDirection.DESC, first=10, skip=0)
 
diff --git a/docs/sdk/python/index.md b/docs/sdk/python/index.md
index b0c6143ea2..08dc3fd4e2 100644
--- a/docs/sdk/python/index.md
+++ b/docs/sdk/python/index.md
@@ -32,11 +32,6 @@ pip install human-protocol-sdk[agreement]
       * [Submodules](human_protocol_sdk.escrow.md#submodules)
     * [human_protocol_sdk.kvstore package](human_protocol_sdk.kvstore.md)
       * [Submodules](human_protocol_sdk.kvstore.md#submodules)
-    * [human_protocol_sdk.kvstore.kvstore_utils module](human_protocol_sdk.kvstore.kvstore_utils.md)
-      * [Code Example](human_protocol_sdk.kvstore.kvstore_utils.md#code-example)
-      * [Module](human_protocol_sdk.kvstore.kvstore_utils.md#module)
-      * [`KVStoreData`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreData)
-      * [`KVStoreUtils`](human_protocol_sdk.kvstore.kvstore_utils.md#human_protocol_sdk.kvstore.kvstore_utils.KVStoreUtils)
     * [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
       * [Submodules](human_protocol_sdk.operator.md#submodules)
     * [human_protocol_sdk.staking package](human_protocol_sdk.staking.md)
@@ -51,6 +46,7 @@ pip install human-protocol-sdk[agreement]
     * [human_protocol_sdk.constants module](human_protocol_sdk.constants.md)
       * [`ChainId`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId)
       * [`KVStoreKeys`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys)
+      * [`LeaderCategory`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.LeaderCategory)
       * [`OrderDirection`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.OrderDirection)
       * [`Role`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Role)
       * [`Status`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.Status)
diff --git a/docs/sdk/typescript/base/classes/BaseEthersClient.md b/docs/sdk/typescript/base/classes/BaseEthersClient.md
index aab302b3c0..15729642ca 100644
--- a/docs/sdk/typescript/base/classes/BaseEthersClient.md
+++ b/docs/sdk/typescript/base/classes/BaseEthersClient.md
@@ -44,7 +44,7 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
+[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
 
 ## Properties
 
@@ -54,7 +54,7 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -64,4 +64,4 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
diff --git a/docs/sdk/typescript/encryption/classes/Encryption.md b/docs/sdk/typescript/encryption/classes/Encryption.md
index 9eb33287cc..45f40e0fe9 100644
--- a/docs/sdk/typescript/encryption/classes/Encryption.md
+++ b/docs/sdk/typescript/encryption/classes/Encryption.md
@@ -67,7 +67,7 @@ The private key.
 
 #### Defined in
 
-[encryption.ts:66](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L66)
+[encryption.ts:66](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L66)
 
 ## Methods
 
@@ -123,7 +123,7 @@ const resultMessage = await encryption.decrypt('message');
 
 #### Defined in
 
-[encryption.ts:194](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L194)
+[encryption.ts:194](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L194)
 
 ***
 
@@ -161,7 +161,7 @@ const resultMessage = await encryption.sign('message');
 
 #### Defined in
 
-[encryption.ts:251](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L251)
+[encryption.ts:251](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L251)
 
 ***
 
@@ -230,7 +230,7 @@ const resultMessage = await encryption.signAndEncrypt('message', publicKeys);
 
 #### Defined in
 
-[encryption.ts:142](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L142)
+[encryption.ts:142](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L142)
 
 ***
 
@@ -262,4 +262,4 @@ Optional: The passphrase for the private key.
 
 #### Defined in
 
-[encryption.ts:77](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L77)
+[encryption.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L77)
diff --git a/docs/sdk/typescript/encryption/classes/EncryptionUtils.md b/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
index 639f450450..8c6e538cfa 100644
--- a/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
+++ b/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
@@ -103,7 +103,7 @@ const result = await EncryptionUtils.encrypt('message', publicKeys);
 
 #### Defined in
 
-[encryption.ts:444](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L444)
+[encryption.ts:444](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L444)
 
 ***
 
@@ -152,7 +152,7 @@ const result = await EncryptionUtils.generateKeyPair(name, email, passphrase);
 
 #### Defined in
 
-[encryption.ts:382](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L382)
+[encryption.ts:382](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L382)
 
 ***
 
@@ -186,7 +186,7 @@ const signedData = await EncryptionUtils.getSignedData('message');
 
 #### Defined in
 
-[encryption.ts:351](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L351)
+[encryption.ts:351](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L351)
 
 ***
 
@@ -236,7 +236,7 @@ if (isEncrypted) {
 
 #### Defined in
 
-[encryption.ts:494](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L494)
+[encryption.ts:494](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L494)
 
 ***
 
@@ -288,4 +288,4 @@ const result = await EncryptionUtils.verify('message', publicKey);
 
 #### Defined in
 
-[encryption.ts:318](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L318)
+[encryption.ts:318](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L318)
diff --git a/docs/sdk/typescript/enums/README.md b/docs/sdk/typescript/enums/README.md
index ea796f9dd0..a24fdec353 100644
--- a/docs/sdk/typescript/enums/README.md
+++ b/docs/sdk/typescript/enums/README.md
@@ -11,4 +11,5 @@
 ### Enumerations
 
 - [ChainId](enumerations/ChainId.md)
+- [LeaderCategory](enumerations/LeaderCategory.md)
 - [OrderDirection](enumerations/OrderDirection.md)
diff --git a/docs/sdk/typescript/enums/enumerations/ChainId.md b/docs/sdk/typescript/enums/enumerations/ChainId.md
index 1126047e1a..b24542d6e3 100644
--- a/docs/sdk/typescript/enums/enumerations/ChainId.md
+++ b/docs/sdk/typescript/enums/enumerations/ChainId.md
@@ -14,27 +14,7 @@
 
 #### Defined in
 
-[enums.ts:2](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L2)
-
-***
-
-### AVALANCHE
-
-> **AVALANCHE**: `43114`
-
-#### Defined in
-
-[enums.ts:15](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L15)
-
-***
-
-### AVALANCHE\_TESTNET
-
-> **AVALANCHE\_TESTNET**: `43113`
-
-#### Defined in
-
-[enums.ts:14](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L14)
+[enums.ts:2](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L2)
 
 ***
 
@@ -44,7 +24,7 @@
 
 #### Defined in
 
-[enums.ts:7](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L7)
+[enums.ts:5](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L5)
 
 ***
 
@@ -54,37 +34,7 @@
 
 #### Defined in
 
-[enums.ts:8](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L8)
-
-***
-
-### CELO
-
-> **CELO**: `42220`
-
-#### Defined in
-
-[enums.ts:16](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L16)
-
-***
-
-### CELO\_ALFAJORES
-
-> **CELO\_ALFAJORES**: `44787`
-
-#### Defined in
-
-[enums.ts:17](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L17)
-
-***
-
-### GOERLI
-
-> **GOERLI**: `5`
-
-#### Defined in
-
-[enums.ts:5](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L5)
+[enums.ts:6](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L6)
 
 ***
 
@@ -94,7 +44,7 @@
 
 #### Defined in
 
-[enums.ts:19](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L19)
+[enums.ts:9](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L9)
 
 ***
 
@@ -104,27 +54,7 @@
 
 #### Defined in
 
-[enums.ts:3](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L3)
-
-***
-
-### MOONBASE\_ALPHA
-
-> **MOONBASE\_ALPHA**: `1287`
-
-#### Defined in
-
-[enums.ts:13](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L13)
-
-***
-
-### MOONBEAM
-
-> **MOONBEAM**: `1284`
-
-#### Defined in
-
-[enums.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L12)
+[enums.ts:3](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L3)
 
 ***
 
@@ -134,7 +64,7 @@
 
 #### Defined in
 
-[enums.ts:9](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L9)
+[enums.ts:7](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L7)
 
 ***
 
@@ -144,27 +74,7 @@
 
 #### Defined in
 
-[enums.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L11)
-
-***
-
-### POLYGON\_MUMBAI
-
-> **POLYGON\_MUMBAI**: `80001`
-
-#### Defined in
-
-[enums.ts:10](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L10)
-
-***
-
-### RINKEBY
-
-> **RINKEBY**: `4`
-
-#### Defined in
-
-[enums.ts:4](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L4)
+[enums.ts:8](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L8)
 
 ***
 
@@ -174,24 +84,4 @@
 
 #### Defined in
 
-[enums.ts:6](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L6)
-
-***
-
-### XLAYER
-
-> **XLAYER**: `196`
-
-#### Defined in
-
-[enums.ts:20](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L20)
-
-***
-
-### XLAYER\_TESTNET
-
-> **XLAYER\_TESTNET**: `195`
-
-#### Defined in
-
-[enums.ts:18](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L18)
+[enums.ts:4](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L4)
diff --git a/docs/sdk/typescript/enums/enumerations/LeaderCategory.md b/docs/sdk/typescript/enums/enumerations/LeaderCategory.md
new file mode 100644
index 0000000000..e5c2652381
--- /dev/null
+++ b/docs/sdk/typescript/enums/enumerations/LeaderCategory.md
@@ -0,0 +1,27 @@
+[**@human-protocol/sdk**](../../README.md)
+
+***
+
+[@human-protocol/sdk](../../modules.md) / [enums](../README.md) / LeaderCategory
+
+# Enumeration: LeaderCategory
+
+## Enumeration Members
+
+### MACHINE\_LEARNING
+
+> **MACHINE\_LEARNING**: `"machine_learning"`
+
+#### Defined in
+
+[enums.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L18)
+
+***
+
+### MARKET\_MAKING
+
+> **MARKET\_MAKING**: `"market_making"`
+
+#### Defined in
+
+[enums.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L19)
diff --git a/docs/sdk/typescript/enums/enumerations/OrderDirection.md b/docs/sdk/typescript/enums/enumerations/OrderDirection.md
index bf0533ffbf..38f2242b3d 100644
--- a/docs/sdk/typescript/enums/enumerations/OrderDirection.md
+++ b/docs/sdk/typescript/enums/enumerations/OrderDirection.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[enums.ts:24](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L24)
+[enums.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L13)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[enums.ts:25](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L25)
+[enums.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L14)
diff --git a/docs/sdk/typescript/escrow/classes/EscrowClient.md b/docs/sdk/typescript/escrow/classes/EscrowClient.md
index 68e862ef62..cbc0f8e30a 100644
--- a/docs/sdk/typescript/escrow/classes/EscrowClient.md
+++ b/docs/sdk/typescript/escrow/classes/EscrowClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[escrow.ts:138](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L138)
+[escrow.ts:143](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L143)
 
 ## Properties
 
@@ -124,7 +124,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -138,7 +138,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ## Methods
 
@@ -195,7 +195,7 @@ await escrowClient.addTrustedHandlers('0x62dD51230A30401C455c8398d06F85e4EaB6309
 
 #### Defined in
 
-[escrow.ts:766](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L766)
+[escrow.ts:771](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L771)
 
 ***
 
@@ -287,7 +287,7 @@ await escrowClient.bulkPayOut('0x62dD51230A30401C455c8398d06F85e4EaB6309f', reci
 
 #### Defined in
 
-[escrow.ts:599](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L599)
+[escrow.ts:604](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L604)
 
 ***
 
@@ -337,7 +337,7 @@ await escrowClient.cancel('0x62dD51230A30401C455c8398d06F85e4EaB6309f');
 
 #### Defined in
 
-[escrow.ts:680](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L680)
+[escrow.ts:685](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L685)
 
 ***
 
@@ -387,7 +387,7 @@ await escrowClient.complete('0x62dD51230A30401C455c8398d06F85e4EaB6309f');
 
 #### Defined in
 
-[escrow.ts:538](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L538)
+[escrow.ts:543](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L543)
 
 ***
 
@@ -483,7 +483,7 @@ console.log('Tx hash:', ethers.keccak256(signedTransaction));
 
 #### Defined in
 
-[escrow.ts:935](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L935)
+[escrow.ts:940](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L940)
 
 ***
 
@@ -548,7 +548,7 @@ const escrowAddress = await escrowClient.createEscrow(tokenAddress, trustedHandl
 
 #### Defined in
 
-[escrow.ts:218](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L218)
+[escrow.ts:223](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L223)
 
 ***
 
@@ -603,7 +603,7 @@ await escrowClient.fund('0x62dD51230A30401C455c8398d06F85e4EaB6309f', amount);
 
 #### Defined in
 
-[escrow.ts:409](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L409)
+[escrow.ts:414](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L414)
 
 ***
 
@@ -643,7 +643,7 @@ const balance = await escrowClient.getBalance('0x62dD51230A30401C455c8398d06F85e
 
 #### Defined in
 
-[escrow.ts:1080](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1080)
+[escrow.ts:1085](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1085)
 
 ***
 
@@ -683,7 +683,7 @@ const oracleAddress = await escrowClient.getExchangeOracleAddress('0x62dD51230A3
 
 #### Defined in
 
-[escrow.ts:1466](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1466)
+[escrow.ts:1471](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1471)
 
 ***
 
@@ -723,7 +723,7 @@ const factoryAddress = await escrowClient.getFactoryAddress('0x62dD51230A30401C4
 
 #### Defined in
 
-[escrow.ts:1504](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1504)
+[escrow.ts:1509](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1509)
 
 ***
 
@@ -763,7 +763,7 @@ const intermediateResultsUrl = await escrowClient.getIntermediateResultsUrl('0x6
 
 #### Defined in
 
-[escrow.ts:1238](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1238)
+[escrow.ts:1243](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1243)
 
 ***
 
@@ -803,7 +803,7 @@ const jobLauncherAddress = await escrowClient.getJobLauncherAddress('0x62dD51230
 
 #### Defined in
 
-[escrow.ts:1390](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1390)
+[escrow.ts:1395](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1395)
 
 ***
 
@@ -843,7 +843,7 @@ const manifestHash = await escrowClient.getManifestHash('0x62dD51230A30401C455c8
 
 #### Defined in
 
-[escrow.ts:1124](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1124)
+[escrow.ts:1129](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1129)
 
 ***
 
@@ -883,7 +883,7 @@ const manifestUrl = await escrowClient.getManifestUrl('0x62dD51230A30401C455c839
 
 #### Defined in
 
-[escrow.ts:1162](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1162)
+[escrow.ts:1167](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1167)
 
 ***
 
@@ -923,7 +923,7 @@ const oracleAddress = await escrowClient.getRecordingOracleAddress('0x62dD51230A
 
 #### Defined in
 
-[escrow.ts:1352](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1352)
+[escrow.ts:1357](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1357)
 
 ***
 
@@ -963,7 +963,7 @@ const oracleAddress = await escrowClient.getReputationOracleAddress('0x62dD51230
 
 #### Defined in
 
-[escrow.ts:1428](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1428)
+[escrow.ts:1433](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1433)
 
 ***
 
@@ -1003,7 +1003,7 @@ const resultsUrl = await escrowClient.getResultsUrl('0x62dD51230A30401C455c8398d
 
 #### Defined in
 
-[escrow.ts:1200](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1200)
+[escrow.ts:1205](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1205)
 
 ***
 
@@ -1043,7 +1043,7 @@ const status = await escrowClient.getStatus('0x62dD51230A30401C455c8398d06F85e4E
 
 #### Defined in
 
-[escrow.ts:1314](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1314)
+[escrow.ts:1319](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1319)
 
 ***
 
@@ -1083,7 +1083,7 @@ const tokenAddress = await escrowClient.getTokenAddress('0x62dD51230A30401C455c8
 
 #### Defined in
 
-[escrow.ts:1276](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1276)
+[escrow.ts:1281](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1281)
 
 ***
 
@@ -1150,7 +1150,7 @@ await escrowClient.setup(escrowAddress, escrowConfig);
 
 #### Defined in
 
-[escrow.ts:299](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L299)
+[escrow.ts:304](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L304)
 
 ***
 
@@ -1212,7 +1212,7 @@ await escrowClient.storeResults('0x62dD51230A30401C455c8398d06F85e4EaB6309f', 'h
 
 #### Defined in
 
-[escrow.ts:474](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L474)
+[escrow.ts:479](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L479)
 
 ***
 
@@ -1271,7 +1271,7 @@ await escrowClient.withdraw(
 
 #### Defined in
 
-[escrow.ts:832](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L832)
+[escrow.ts:837](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L837)
 
 ***
 
@@ -1305,4 +1305,4 @@ Thrown if the network's chainId is not supported
 
 #### Defined in
 
-[escrow.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L156)
+[escrow.ts:161](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L161)
diff --git a/docs/sdk/typescript/escrow/classes/EscrowUtils.md b/docs/sdk/typescript/escrow/classes/EscrowUtils.md
index c61c8d723a..5fdb6dca3d 100644
--- a/docs/sdk/typescript/escrow/classes/EscrowUtils.md
+++ b/docs/sdk/typescript/escrow/classes/EscrowUtils.md
@@ -62,19 +62,11 @@ This function returns the escrow data for a given address.
 enum ChainId {
   ALL = -1,
   MAINNET = 1,
-  RINKEBY = 4,
-  GOERLI = 5,
+  SEPOLIA = 11155111,
   BSC_MAINNET = 56,
   BSC_TESTNET = 97,
   POLYGON = 137,
-  POLYGON_MUMBAI = 80001,
   POLYGON_AMOY = 80002,
-  MOONBEAM = 1284,
-  MOONBASE_ALPHA = 1287,
-  AVALANCHE = 43114,
-  AVALANCHE_TESTNET = 43113,
-  CELO = 42220,
-  CELO_ALFAJORES = 44787,
   LOCALHOST = 1338,
 }
 ```
@@ -133,7 +125,7 @@ const escrowData = new EscrowUtils.getEscrow(ChainId.POLYGON_AMOY, "0x1234567890
 
 #### Defined in
 
-[escrow.ts:1784](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1784)
+[escrow.ts:1773](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1773)
 
 ***
 
@@ -166,19 +158,11 @@ interface IEscrowsFilter {
 enum ChainId {
   ALL = -1,
   MAINNET = 1,
-  RINKEBY = 4,
-  GOERLI = 5,
+  SEPOLIA = 11155111,
   BSC_MAINNET = 56,
   BSC_TESTNET = 97,
   POLYGON = 137,
-  POLYGON_MUMBAI = 80001,
   POLYGON_AMOY=80002,
-  MOONBEAM = 1284,
-  MOONBASE_ALPHA = 1287,
-  AVALANCHE = 43114,
-  AVALANCHE_TESTNET = 43113,
-  CELO = 42220,
-  CELO_ALFAJORES = 44787,
   LOCALHOST = 1338,
 }
 ```
@@ -255,7 +239,7 @@ const escrowDatas = await EscrowUtils.getEscrows(filters);
 
 #### Defined in
 
-[escrow.ts:1658](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1658)
+[escrow.ts:1655](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1655)
 
 ***
 
@@ -273,23 +257,12 @@ This function returns the status events for a given set of networks within an op
 enum ChainId {
   ALL = -1,
   MAINNET = 1,
-  RINKEBY = 4,
-  GOERLI = 5,
   SEPOLIA = 11155111,
   BSC_MAINNET = 56,
   BSC_TESTNET = 97,
   POLYGON = 137,
-  POLYGON_MUMBAI = 80001,
   POLYGON_AMOY = 80002,
-  MOONBEAM = 1284,
-  MOONBASE_ALPHA = 1287,
-  AVALANCHE = 43114,
-  AVALANCHE_TESTNET = 43113,
-  CELO = 42220,
-  CELO_ALFAJORES = 44787,
   LOCALHOST = 1338,
-  XLAYER_TESTNET = 195,
-  XLAYER = 196,
 }
 ```
 
@@ -384,4 +357,4 @@ import { ChainId, EscrowUtils, EscrowStatus } from '@human-protocol/sdk';
 
 #### Defined in
 
-[escrow.ts:1882](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1882)
+[escrow.ts:1860](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1860)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
index 6939c17073..1bee222dcb 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:83](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L83)
+[graphql/types.ts:83](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L83)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
index 631a1136f5..2e24513369 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
@@ -32,4 +32,4 @@
 
 ## Defined in
 
-[graphql/types.ts:127](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L127)
+[graphql/types.ts:127](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L127)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
index c00cd71a39..62188f64ba 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:106](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L106)
+[graphql/types.ts:106](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L106)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
index 6dad88e163..dd55e33f88 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
@@ -24,4 +24,4 @@
 
 ## Defined in
 
-[graphql/types.ts:148](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L148)
+[graphql/types.ts:148](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L148)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
index 9db6c7728c..90200e4136 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:97](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L97)
+[graphql/types.ts:97](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L97)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
index 5016e99053..79fd7ec883 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
@@ -88,4 +88,4 @@
 
 ## Defined in
 
-[graphql/types.ts:3](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L3)
+[graphql/types.ts:3](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L3)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
index 6f053e052a..720304b7f5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:92](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L92)
+[graphql/types.ts:92](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L92)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
index 2217dcc069..ba97638549 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
@@ -52,4 +52,4 @@
 
 ## Defined in
 
-[graphql/types.ts:42](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L42)
+[graphql/types.ts:42](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L42)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md b/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
index 75aebe52f0..97b39ca723 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
@@ -84,4 +84,4 @@
 
 ## Defined in
 
-[graphql/types.ts:55](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L55)
+[graphql/types.ts:55](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L55)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
index 705bf707dd..6e48e613f5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:122](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L122)
+[graphql/types.ts:122](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L122)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
index e556d5c3ac..7f25b4adcb 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:117](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L117)
+[graphql/types.ts:117](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L117)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
index e9bf2db822..33ce898338 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
@@ -24,4 +24,4 @@
 
 ## Defined in
 
-[graphql/types.ts:135](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L135)
+[graphql/types.ts:135](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L135)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
index 5f6cd95556..b46e10d969 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:33](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L33)
+[graphql/types.ts:33](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L33)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/IMData.md b/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
index 55e5b90f48..b9433eca18 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
@@ -10,4 +10,4 @@
 
 ## Defined in
 
-[graphql/types.ts:146](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L146)
+[graphql/types.ts:146](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L146)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md b/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
index 6a2393c1d7..328d47a8e1 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:141](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L141)
+[graphql/types.ts:141](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L141)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md b/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
index 0766b090c1..609bef90c1 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:165](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L165)
+[graphql/types.ts:165](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L165)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
index 4537a6a134..1f726ff2f9 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:113](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L113)
+[graphql/types.ts:113](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L113)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md b/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
index 23eafd31c1..4138004eef 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
@@ -32,4 +32,4 @@
 
 ## Defined in
 
-[graphql/types.ts:25](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L25)
+[graphql/types.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L25)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md b/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
index d647adb306..f6da861c19 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:76](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L76)
+[graphql/types.ts:76](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L76)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md b/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
index 062aa352a2..b871873bd5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:158](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L158)
+[graphql/types.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L158)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
index 519f786bbc..0dcca95e06 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:154](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L154)
+[graphql/types.ts:154](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L154)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
index 17b8ea44cd..905799afb5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:102](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L102)
+[graphql/types.ts:102](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L102)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md b/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
index bbba2181bd..5c9c7dbd44 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:84](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L84)
+[interfaces.ts:86](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L86)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:87](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L87)
+[interfaces.ts:89](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L89)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:89](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L89)
+[interfaces.ts:91](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L91)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:88](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L88)
+[interfaces.ts:90](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L90)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:82](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L82)
+[interfaces.ts:84](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L84)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:85](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L85)
+[interfaces.ts:87](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L87)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:83](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L83)
+[interfaces.ts:85](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L85)
 
 ***
 
@@ -84,4 +84,4 @@
 
 #### Defined in
 
-[interfaces.ts:86](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L86)
+[interfaces.ts:88](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L88)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md b/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
index 953c6c0683..7bc0dcd8f8 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:78](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L78)
+[interfaces.ts:80](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L80)
 
 ***
 
@@ -28,7 +28,7 @@
 
 #### Defined in
 
-[interfaces.ts:73](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L73)
+[interfaces.ts:75](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L75)
 
 ***
 
@@ -42,7 +42,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:76](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L76)
+[interfaces.ts:78](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L78)
 
 ***
 
@@ -62,7 +62,7 @@
 
 #### Defined in
 
-[interfaces.ts:74](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L74)
+[interfaces.ts:76](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L76)
 
 ***
 
@@ -72,7 +72,7 @@
 
 #### Defined in
 
-[interfaces.ts:70](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L70)
+[interfaces.ts:72](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L72)
 
 ***
 
@@ -86,7 +86,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -96,7 +96,7 @@
 
 #### Defined in
 
-[interfaces.ts:72](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L72)
+[interfaces.ts:74](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L74)
 
 ***
 
@@ -106,7 +106,7 @@
 
 #### Defined in
 
-[interfaces.ts:71](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L71)
+[interfaces.ts:73](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L73)
 
 ***
 
@@ -120,7 +120,7 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -130,7 +130,7 @@
 
 #### Defined in
 
-[interfaces.ts:75](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L75)
+[interfaces.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L77)
 
 ***
 
@@ -140,4 +140,4 @@
 
 #### Defined in
 
-[interfaces.ts:77](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L77)
+[interfaces.ts:79](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L79)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md b/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
index 765f1fbcb4..d1ddb2de19 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:105](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L105)
+[interfaces.ts:107](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L107)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -60,4 +60,4 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IKVStore.md b/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
index 095f7bf67a..e61f6e8db1 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:116](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L116)
+[interfaces.ts:118](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L118)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[interfaces.ts:117](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L117)
+[interfaces.ts:119](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L119)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md b/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
index 4617446a23..1bec3a4542 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:95](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L95)
+[interfaces.ts:97](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L97)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:93](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L93)
+[interfaces.ts:95](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L95)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:94](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L94)
+[interfaces.ts:96](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L96)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:96](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L96)
+[interfaces.ts:98](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L98)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeader.md b/docs/sdk/typescript/interfaces/interfaces/ILeader.md
index d6294e29e9..0e5a493122 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeader.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeader.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
+[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
+[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
+[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
+[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
+[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
 
 ***
 
@@ -64,7 +64,17 @@
 
 #### Defined in
 
-[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+
+***
+
+### category?
+
+> `optional` **category**: `string`
+
+#### Defined in
+
+[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
 
 ***
 
@@ -74,7 +84,7 @@
 
 #### Defined in
 
-[interfaces.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L11)
+[interfaces.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L11)
 
 ***
 
@@ -84,7 +94,7 @@
 
 #### Defined in
 
-[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
+[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
 
 ***
 
@@ -94,7 +104,7 @@
 
 #### Defined in
 
-[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
+[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
 
 ***
 
@@ -104,7 +114,7 @@
 
 #### Defined in
 
-[interfaces.ts:26](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L26)
+[interfaces.ts:26](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L26)
 
 ***
 
@@ -114,7 +124,17 @@
 
 #### Defined in
 
-[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+
+***
+
+### name?
+
+> `optional` **name**: `string`
+
+#### Defined in
+
+[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
 
 ***
 
@@ -124,7 +144,7 @@
 
 #### Defined in
 
-[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
+[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
 
 ***
 
@@ -134,7 +154,7 @@
 
 #### Defined in
 
-[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
+[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
 
 ***
 
@@ -144,7 +164,7 @@
 
 #### Defined in
 
-[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
+[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
 
 ***
 
@@ -154,7 +174,7 @@
 
 #### Defined in
 
-[interfaces.ts:29](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L29)
+[interfaces.ts:29](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L29)
 
 ***
 
@@ -164,7 +184,7 @@
 
 #### Defined in
 
-[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
+[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
 
 ***
 
@@ -174,7 +194,7 @@
 
 #### Defined in
 
-[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
+[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
 
 ***
 
@@ -184,7 +204,7 @@
 
 #### Defined in
 
-[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
+[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
 
 ***
 
@@ -194,7 +214,7 @@
 
 #### Defined in
 
-[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
+[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
 
 ***
 
@@ -204,4 +224,4 @@
 
 #### Defined in
 
-[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
+[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
index b63dc1076a..c26b7dd7ef 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
+[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
 
 ***
 
@@ -36,7 +36,7 @@
 
 #### Defined in
 
-[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
+[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
 
 ***
 
@@ -50,7 +50,7 @@
 
 #### Defined in
 
-[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
+[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
+[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
 
 ***
 
@@ -78,7 +78,7 @@
 
 #### Defined in
 
-[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
+[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
 
 ***
 
@@ -92,7 +92,21 @@
 
 #### Defined in
 
-[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+
+***
+
+### category?
+
+> `optional` **category**: `string`
+
+#### Inherited from
+
+`Omit.category`
+
+#### Defined in
+
+[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
 
 ***
 
@@ -106,7 +120,7 @@
 
 #### Defined in
 
-[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
+[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
 
 ***
 
@@ -120,7 +134,7 @@
 
 #### Defined in
 
-[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
+[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
 
 ***
 
@@ -130,7 +144,7 @@
 
 #### Defined in
 
-[interfaces.ts:34](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L34)
+[interfaces.ts:36](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L36)
 
 ***
 
@@ -144,7 +158,21 @@
 
 #### Defined in
 
-[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+
+***
+
+### name?
+
+> `optional` **name**: `string`
+
+#### Inherited from
+
+`Omit.name`
+
+#### Defined in
+
+[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
 
 ***
 
@@ -158,7 +186,7 @@
 
 #### Defined in
 
-[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
+[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
 
 ***
 
@@ -172,7 +200,7 @@
 
 #### Defined in
 
-[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
+[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
 
 ***
 
@@ -186,7 +214,7 @@
 
 #### Defined in
 
-[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
+[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
 
 ***
 
@@ -196,7 +224,7 @@
 
 #### Defined in
 
-[interfaces.ts:35](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L35)
+[interfaces.ts:37](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L37)
 
 ***
 
@@ -210,7 +238,7 @@
 
 #### Defined in
 
-[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
+[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
 
 ***
 
@@ -224,7 +252,7 @@
 
 #### Defined in
 
-[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
+[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
 
 ***
 
@@ -238,7 +266,7 @@
 
 #### Defined in
 
-[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
+[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
 
 ***
 
@@ -252,7 +280,7 @@
 
 #### Defined in
 
-[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
+[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
 
 ***
 
@@ -266,4 +294,4 @@
 
 #### Defined in
 
-[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
+[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md b/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
index 03b77ee114..8831bc95d0 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:39](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L39)
+[interfaces.ts:41](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L41)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -42,7 +42,7 @@
 
 #### Defined in
 
-[interfaces.ts:41](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L41)
+[interfaces.ts:43](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L43)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:42](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L42)
+[interfaces.ts:44](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L44)
 
 ***
 
@@ -66,7 +66,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -76,7 +76,7 @@
 
 #### Defined in
 
-[interfaces.ts:40](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L40)
+[interfaces.ts:42](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L42)
 
 ***
 
@@ -90,4 +90,4 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IOperator.md b/docs/sdk/typescript/interfaces/interfaces/IOperator.md
index 14d310da5f..8f0a2138fe 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IOperator.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IOperator.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:57](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L57)
+[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
+[interfaces.ts:62](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L62)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:62](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L62)
+[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
+[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:58](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L58)
+[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
 
 ***
 
@@ -64,4 +64,4 @@
 
 #### Defined in
 
-[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
+[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
index f5737a7811..95b8787b77 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:57](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L57)
+[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:66](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L66)
+[interfaces.ts:68](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L68)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:62](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L62)
+[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
 
 ***
 
@@ -60,7 +60,7 @@
 
 #### Defined in
 
-[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
+[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:58](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L58)
+[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
 
 ***
 
@@ -88,4 +88,4 @@
 
 #### Defined in
 
-[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
+[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IPagination.md b/docs/sdk/typescript/interfaces/interfaces/IPagination.md
index 67a0229bfa..b86ac64880 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IPagination.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IPagination.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -42,4 +42,4 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md b/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
index 8eaf8bf075..a15b6da6ec 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:109](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L109)
+[interfaces.ts:111](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L111)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:111](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L111)
+[interfaces.ts:113](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L113)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:110](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L110)
+[interfaces.ts:112](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L112)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:112](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L112)
+[interfaces.ts:114](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L114)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md b/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
index 3f904e9eb0..96d7a7c321 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:47](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L47)
+[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:46](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L46)
+[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
 
 ***
 
@@ -34,4 +34,4 @@
 
 #### Defined in
 
-[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
+[interfaces.ts:50](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L50)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
index 623849a7b9..5b8bb90174 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:47](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L47)
+[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
 
 ***
 
@@ -36,7 +36,7 @@
 
 #### Defined in
 
-[interfaces.ts:46](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L46)
+[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
 
 ***
 
@@ -46,4 +46,4 @@
 
 #### Defined in
 
-[interfaces.ts:53](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L53)
+[interfaces.ts:55](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L55)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReward.md b/docs/sdk/typescript/interfaces/interfaces/IReward.md
index 5e2cc1f0f9..a4a4433af8 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReward.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReward.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:6](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L6)
+[interfaces.ts:6](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L6)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[interfaces.ts:5](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L5)
+[interfaces.ts:5](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L5)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md b/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
index df1bd7a969..b70dc5b1c1 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:100](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L100)
+[interfaces.ts:102](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L102)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -60,7 +60,7 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -70,4 +70,4 @@
 
 #### Defined in
 
-[interfaces.ts:101](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L101)
+[interfaces.ts:103](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L103)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ITransaction.md b/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
index 4f3900f362..a9d9a12827 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:131](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L131)
+[interfaces.ts:133](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L133)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:139](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L139)
+[interfaces.ts:141](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L141)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:133](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L133)
+[interfaces.ts:135](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L135)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:141](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L141)
+[interfaces.ts:143](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L143)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:137](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L137)
+[interfaces.ts:139](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L139)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:138](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L138)
+[interfaces.ts:140](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L140)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:135](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L135)
+[interfaces.ts:137](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L137)
 
 ***
 
@@ -84,7 +84,7 @@
 
 #### Defined in
 
-[interfaces.ts:134](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L134)
+[interfaces.ts:136](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L136)
 
 ***
 
@@ -94,7 +94,7 @@
 
 #### Defined in
 
-[interfaces.ts:140](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L140)
+[interfaces.ts:142](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L142)
 
 ***
 
@@ -104,7 +104,7 @@
 
 #### Defined in
 
-[interfaces.ts:132](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L132)
+[interfaces.ts:134](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L134)
 
 ***
 
@@ -114,4 +114,4 @@
 
 #### Defined in
 
-[interfaces.ts:136](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L136)
+[interfaces.ts:138](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L138)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md b/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
index c8bc1caaa3..fd469183a8 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:145](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L145)
+[interfaces.ts:147](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L147)
 
 ***
 
@@ -28,7 +28,7 @@
 
 #### Defined in
 
-[interfaces.ts:147](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L147)
+[interfaces.ts:149](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L149)
 
 ***
 
@@ -38,7 +38,7 @@
 
 #### Defined in
 
-[interfaces.ts:149](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L149)
+[interfaces.ts:151](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L151)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:155](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L155)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -62,7 +62,7 @@
 
 #### Defined in
 
-[interfaces.ts:150](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L150)
+[interfaces.ts:152](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L152)
 
 ***
 
@@ -76,7 +76,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -90,7 +90,7 @@
 
 #### Defined in
 
-[interfaces.ts:156](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L156)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -100,7 +100,7 @@
 
 #### Defined in
 
-[interfaces.ts:146](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L146)
+[interfaces.ts:148](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L148)
 
 ***
 
@@ -110,7 +110,7 @@
 
 #### Defined in
 
-[interfaces.ts:148](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L148)
+[interfaces.ts:150](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L150)
 
 ***
 
@@ -120,4 +120,4 @@
 
 #### Defined in
 
-[interfaces.ts:151](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L151)
+[interfaces.ts:153](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L153)
diff --git a/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md b/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
index 4232571832..83cb9b2491 100644
--- a/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
+++ b/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:126](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L126)
+[interfaces.ts:128](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L128)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:121](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L121)
+[interfaces.ts:123](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L123)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:124](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L124)
+[interfaces.ts:126](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L126)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:125](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L125)
+[interfaces.ts:127](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L127)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:122](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L122)
+[interfaces.ts:124](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L124)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:127](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L127)
+[interfaces.ts:129](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L129)
 
 ***
 
@@ -74,4 +74,4 @@
 
 #### Defined in
 
-[interfaces.ts:123](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L123)
+[interfaces.ts:125](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L125)
diff --git a/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md b/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
index ca9eef85bf..a8c1d62a94 100644
--- a/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
+++ b/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:162](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L162)
+[interfaces.ts:164](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L164)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:163](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L163)
+[interfaces.ts:165](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L165)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:161](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L161)
+[interfaces.ts:163](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L163)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:164](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L164)
+[interfaces.ts:166](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L166)
diff --git a/docs/sdk/typescript/kvstore/classes/KVStoreClient.md b/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
index 99bebf359f..c6cfd5ffaf 100644
--- a/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
+++ b/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[kvstore.ts:108](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L108)
+[kvstore.ts:108](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L108)
 
 ## Properties
 
@@ -124,7 +124,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -138,7 +138,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ## Methods
 
@@ -194,7 +194,7 @@ await kvstoreClient.set('Role', 'RecordingOracle');
 
 #### Defined in
 
-[kvstore.ts:171](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L171)
+[kvstore.ts:171](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L171)
 
 ***
 
@@ -252,7 +252,7 @@ await kvstoreClient.setBulk(keys, values);
 
 #### Defined in
 
-[kvstore.ts:214](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L214)
+[kvstore.ts:214](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L214)
 
 ***
 
@@ -307,7 +307,7 @@ await kvstoreClient.setFileUrlAndHash('linkedin.com/example', 'linkedin_url');
 
 #### Defined in
 
-[kvstore.ts:257](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L257)
+[kvstore.ts:257](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L257)
 
 ***
 
@@ -341,4 +341,4 @@ The Runner object to interact with the Ethereum network
 
 #### Defined in
 
-[kvstore.ts:126](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L126)
+[kvstore.ts:126](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L126)
diff --git a/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md b/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
index 282ac129c2..cf03ded001 100644
--- a/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
+++ b/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
@@ -108,7 +108,7 @@ console.log(value);
 
 #### Defined in
 
-[kvstore.ts:389](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L389)
+[kvstore.ts:389](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L389)
 
 ***
 
@@ -158,7 +158,7 @@ console.log(url);
 
 #### Defined in
 
-[kvstore.ts:436](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L436)
+[kvstore.ts:436](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L436)
 
 ***
 
@@ -207,7 +207,7 @@ console.log(kvStoreData);
 
 #### Defined in
 
-[kvstore.ts:337](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L337)
+[kvstore.ts:337](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L337)
 
 ***
 
@@ -251,4 +251,4 @@ console.log(publicKey);
 
 #### Defined in
 
-[kvstore.ts:496](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L496)
+[kvstore.ts:496](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L496)
diff --git a/docs/sdk/typescript/operator/classes/OperatorUtils.md b/docs/sdk/typescript/operator/classes/OperatorUtils.md
index 56db12b9ee..ecffc2025a 100644
--- a/docs/sdk/typescript/operator/classes/OperatorUtils.md
+++ b/docs/sdk/typescript/operator/classes/OperatorUtils.md
@@ -54,7 +54,7 @@ const leader = await OperatorUtils.getLeader(ChainId.POLYGON_AMOY, '0x62dD51230A
 
 #### Defined in
 
-[operator.ts:44](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L44)
+[operator.ts:44](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L44)
 
 ***
 
@@ -91,7 +91,7 @@ const leaders = await OperatorUtils.getLeaders(filter);
 
 #### Defined in
 
-[operator.ts:107](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L107)
+[operator.ts:107](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L107)
 
 ***
 
@@ -137,7 +137,7 @@ const operators = await OperatorUtils.getReputationNetworkOperators(ChainId.POLY
 
 #### Defined in
 
-[operator.ts:186](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L186)
+[operator.ts:186](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L186)
 
 ***
 
@@ -177,4 +177,4 @@ const rewards = await OperatorUtils.getRewards(ChainId.POLYGON_AMOY, '0x62dD5123
 
 #### Defined in
 
-[operator.ts:236](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L236)
+[operator.ts:236](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L236)
diff --git a/docs/sdk/typescript/staking/classes/StakingClient.md b/docs/sdk/typescript/staking/classes/StakingClient.md
index d3d4fa0724..4cb377bb88 100644
--- a/docs/sdk/typescript/staking/classes/StakingClient.md
+++ b/docs/sdk/typescript/staking/classes/StakingClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:108](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L108)
+[staking.ts:108](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L108)
 
 ## Properties
 
@@ -120,7 +120,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:100](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L100)
+[staking.ts:100](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L100)
 
 ***
 
@@ -134,7 +134,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -148,7 +148,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ***
 
@@ -158,7 +158,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:99](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L99)
+[staking.ts:99](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L99)
 
 ***
 
@@ -168,7 +168,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:98](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L98)
+[staking.ts:98](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L98)
 
 ## Methods
 
@@ -217,7 +217,7 @@ await stakingClient.approveStake(amount);
 
 #### Defined in
 
-[staking.ts:193](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L193)
+[staking.ts:193](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L193)
 
 ***
 
@@ -255,7 +255,7 @@ console.log(stakingInfo.tokensStaked);
 
 #### Defined in
 
-[staking.ts:435](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L435)
+[staking.ts:435](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L435)
 
 ***
 
@@ -322,7 +322,7 @@ await stakingClient.slash('0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266', '0xf39Fd
 
 #### Defined in
 
-[staking.ts:373](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L373)
+[staking.ts:373](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L373)
 
 ***
 
@@ -374,7 +374,7 @@ await stakingClient.stake(amount);
 
 #### Defined in
 
-[staking.ts:247](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L247)
+[staking.ts:247](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L247)
 
 ***
 
@@ -425,7 +425,7 @@ await stakingClient.unstake(amount);
 
 #### Defined in
 
-[staking.ts:291](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L291)
+[staking.ts:291](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L291)
 
 ***
 
@@ -469,7 +469,7 @@ await stakingClient.withdraw();
 
 #### Defined in
 
-[staking.ts:336](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L336)
+[staking.ts:336](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L336)
 
 ***
 
@@ -503,4 +503,4 @@ The Runner object to interact with the Ethereum network
 
 #### Defined in
 
-[staking.ts:136](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L136)
+[staking.ts:136](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L136)
diff --git a/docs/sdk/typescript/statistics/classes/StatisticsClient.md b/docs/sdk/typescript/statistics/classes/StatisticsClient.md
index 44461b4bd6..048b4e33bf 100644
--- a/docs/sdk/typescript/statistics/classes/StatisticsClient.md
+++ b/docs/sdk/typescript/statistics/classes/StatisticsClient.md
@@ -59,7 +59,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:67](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L67)
+[statistics.ts:67](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L67)
 
 ## Properties
 
@@ -69,7 +69,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:59](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L59)
+[statistics.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L59)
 
 ***
 
@@ -79,7 +79,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:60](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L60)
+[statistics.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L60)
 
 ## Methods
 
@@ -147,7 +147,7 @@ const escrowStatisticsApril = await statisticsClient.getEscrowStatistics({
 
 #### Defined in
 
-[statistics.ts:120](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L120)
+[statistics.ts:120](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L120)
 
 ***
 
@@ -214,7 +214,7 @@ console.log('HMT statistics from 5/8 - 6/8:', hmtStatisticsRange);
 
 #### Defined in
 
-[statistics.ts:478](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L478)
+[statistics.ts:478](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L478)
 
 ***
 
@@ -259,7 +259,7 @@ console.log('HMT holders:', hmtHolders.map((h) => ({
 
 #### Defined in
 
-[statistics.ts:407](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L407)
+[statistics.ts:407](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L407)
 
 ***
 
@@ -300,7 +300,7 @@ console.log('HMT statistics:', {
 
 #### Defined in
 
-[statistics.ts:364](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L364)
+[statistics.ts:364](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L364)
 
 ***
 
@@ -386,7 +386,7 @@ console.log(
 
 #### Defined in
 
-[statistics.ts:300](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L300)
+[statistics.ts:300](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L300)
 
 ***
 
@@ -449,4 +449,4 @@ const workerStatisticsApril = await statisticsClient.getWorkerStatistics({
 
 #### Defined in
 
-[statistics.ts:204](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L204)
+[statistics.ts:204](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L204)
diff --git a/docs/sdk/typescript/storage/classes/StorageClient.md b/docs/sdk/typescript/storage/classes/StorageClient.md
index 86d8855a7d..f726bb772d 100644
--- a/docs/sdk/typescript/storage/classes/StorageClient.md
+++ b/docs/sdk/typescript/storage/classes/StorageClient.md
@@ -81,7 +81,7 @@ Optional. Cloud storage access data. If credentials are not provided - use anony
 
 #### Defined in
 
-[storage.ts:73](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L73)
+[storage.ts:73](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L73)
 
 ## Methods
 
@@ -127,7 +127,7 @@ const exists = await storageClient.bucketExists('bucket-name');
 
 #### Defined in
 
-[storage.ts:262](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L262)
+[storage.ts:262](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L262)
 
 ***
 
@@ -177,7 +177,7 @@ const files = await storageClient.downloadFiles(keys, 'bucket-name');
 
 #### Defined in
 
-[storage.ts:112](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L112)
+[storage.ts:112](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L112)
 
 ***
 
@@ -223,7 +223,7 @@ const fileNames = await storageClient.listObjects('bucket-name');
 
 #### Defined in
 
-[storage.ts:292](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L292)
+[storage.ts:292](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L292)
 
 ***
 
@@ -278,7 +278,7 @@ const uploadedFiles = await storageClient.uploadFiles(files, 'bucket-name');
 
 #### Defined in
 
-[storage.ts:198](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L198)
+[storage.ts:198](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L198)
 
 ***
 
@@ -312,4 +312,4 @@ const file = await StorageClient.downloadFileFromUrl('http://localhost/file.json
 
 #### Defined in
 
-[storage.ts:146](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L146)
+[storage.ts:146](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L146)
diff --git a/docs/sdk/typescript/transaction/classes/TransactionUtils.md b/docs/sdk/typescript/transaction/classes/TransactionUtils.md
index 9e9693a3df..1663b68b19 100644
--- a/docs/sdk/typescript/transaction/classes/TransactionUtils.md
+++ b/docs/sdk/typescript/transaction/classes/TransactionUtils.md
@@ -54,7 +54,7 @@ const transaction = await TransactionUtils.getTransaction(ChainId.POLYGON, '0x62
 
 #### Defined in
 
-[transaction.ts:34](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L34)
+[transaction.ts:34](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L34)
 
 ***
 
@@ -127,4 +127,4 @@ const transactions = await TransactionUtils.getTransactions(filter);
 
 #### Defined in
 
-[transaction.ts:109](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L109)
+[transaction.ts:109](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L109)
diff --git a/docs/sdk/typescript/types/enumerations/EscrowStatus.md b/docs/sdk/typescript/types/enumerations/EscrowStatus.md
index 216b18273a..6ce3379426 100644
--- a/docs/sdk/typescript/types/enumerations/EscrowStatus.md
+++ b/docs/sdk/typescript/types/enumerations/EscrowStatus.md
@@ -18,7 +18,7 @@ Escrow is cancelled.
 
 #### Defined in
 
-[types.ts:32](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L32)
+[types.ts:32](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L32)
 
 ***
 
@@ -30,7 +30,7 @@ Escrow is finished.
 
 #### Defined in
 
-[types.ts:28](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L28)
+[types.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L28)
 
 ***
 
@@ -42,7 +42,7 @@ Escrow is launched.
 
 #### Defined in
 
-[types.ts:12](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L12)
+[types.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L12)
 
 ***
 
@@ -54,7 +54,7 @@ Escrow is fully paid.
 
 #### Defined in
 
-[types.ts:24](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L24)
+[types.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L24)
 
 ***
 
@@ -66,7 +66,7 @@ Escrow is partially paid out.
 
 #### Defined in
 
-[types.ts:20](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L20)
+[types.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L20)
 
 ***
 
@@ -78,4 +78,4 @@ Escrow is funded, and waiting for the results to be submitted.
 
 #### Defined in
 
-[types.ts:16](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L16)
+[types.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L16)
diff --git a/docs/sdk/typescript/types/type-aliases/EscrowCancel.md b/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
index 34a40f9a8b..679a257da6 100644
--- a/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
+++ b/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
@@ -26,4 +26,4 @@ The hash of the transaction associated with the escrow cancellation.
 
 ## Defined in
 
-[types.ts:145](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L145)
+[types.ts:145](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L145)
diff --git a/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md b/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
index 71dc329883..c64abc0b3e 100644
--- a/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
+++ b/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
@@ -32,4 +32,4 @@ The hash of the transaction associated with the escrow withdrawal.
 
 ## Defined in
 
-[types.ts:159](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L159)
+[types.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L159)
diff --git a/docs/sdk/typescript/types/type-aliases/NetworkData.md b/docs/sdk/typescript/types/type-aliases/NetworkData.md
index 83a5bc2e19..3cbac50b7f 100644
--- a/docs/sdk/typescript/types/type-aliases/NetworkData.md
+++ b/docs/sdk/typescript/types/type-aliases/NetworkData.md
@@ -80,4 +80,4 @@ Network title
 
 ## Defined in
 
-[types.ts:95](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L95)
+[types.ts:95](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L95)
diff --git a/docs/sdk/typescript/types/type-aliases/StorageCredentials.md b/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
index 0161f59062..a38e4fa260 100644
--- a/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
+++ b/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
@@ -30,4 +30,4 @@ StorageClient is deprecated. Use Minio.Client directly.
 
 ## Defined in
 
-[types.ts:40](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L40)
+[types.ts:40](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L40)
diff --git a/docs/sdk/typescript/types/type-aliases/StorageParams.md b/docs/sdk/typescript/types/type-aliases/StorageParams.md
index c900a7461e..d7f39bf639 100644
--- a/docs/sdk/typescript/types/type-aliases/StorageParams.md
+++ b/docs/sdk/typescript/types/type-aliases/StorageParams.md
@@ -40,4 +40,4 @@ StorageClient is deprecated. Use Minio.Client directly.
 
 ## Defined in
 
-[types.ts:54](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L54)
+[types.ts:54](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L54)
diff --git a/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md b/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
index 0118484b2d..99d8015136 100644
--- a/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
+++ b/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[types.ts:174](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L174)
+[types.ts:174](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L174)
diff --git a/docs/sdk/typescript/types/type-aliases/UploadFile.md b/docs/sdk/typescript/types/type-aliases/UploadFile.md
index 2e61465a0e..802fc11ec0 100644
--- a/docs/sdk/typescript/types/type-aliases/UploadFile.md
+++ b/docs/sdk/typescript/types/type-aliases/UploadFile.md
@@ -32,4 +32,4 @@ Uploaded object URL
 
 ## Defined in
 
-[types.ts:77](https://github.com/humanprotocol/human-protocol/blob/b190dc1831c2c96fe3d44fd63e915e54011e1ec8/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L77)
+[types.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L77)
diff --git a/package.json b/package.json
index 986078ff8c..2186faff70 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "scripts": {
     "test": "concurrently \"yarn workspace @human-protocol/core test\" \"yarn workspace @human-protocol/sdk test\" \"yarn workspace @human-protocol/subgraph test\" \"yarn workspace @human-protocol/faucet-server test\" \"yarn workspace @human-protocol/job-launcher-server test\" \"yarn workspace @human-protocol/job-launcher-client test\" \"yarn workspace @human-protocol/human-app-frontend test\" \"yarn workspace @human-protocol/human-app-server test\" \"yarn workspace @human-protocol/reputation-oracle test\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server test\" \"yarn workspace @human-protocol/fortune-recording-oracle test\"",
-    "lint": "concurrently \"yarn workspace @human-protocol/core lint\" \"yarn workspace @human-protocol/sdk lint\" \"yarn workspace @human-protocol/subgraph lint\" \"yarn workspace @human-protocol/faucet-client lint\" \"yarn workspace @human-protocol/faucet-server lint\" \"yarn workspace @human-protocol/job-launcher-server lint\" \"yarn workspace @human-protocol/job-launcher-client lint\" \"yarn workspace @human-protocol/human-app-frontend lint\" \"yarn workspace @human-protocol/human-app-server lint\" \"yarn workspace @human-protocol/reputation-oracle lint\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server lint\" \"yarn workspace @human-protocol/fortune-recording-oracle lint\" \"yarn workspace @human-protocol/dashboard-ui-2024 lint\"",
+    "lint": "concurrently \"yarn workspace @human-protocol/core lint\" \"yarn workspace @human-protocol/sdk lint\" \"yarn workspace @human-protocol/subgraph lint\" \"yarn workspace @human-protocol/faucet-client lint\" \"yarn workspace @human-protocol/faucet-server lint\" \"yarn workspace @human-protocol/job-launcher-server lint\" \"yarn workspace @human-protocol/job-launcher-client lint\" \"yarn workspace @human-protocol/human-app-frontend lint\" \"yarn workspace @human-protocol/human-app-server lint\" \"yarn workspace @human-protocol/reputation-oracle lint\" \"yarn workspace @human-protocol/fortune-exchange-oracle-server lint\" \"yarn workspace @human-protocol/fortune-recording-oracle lint\" \"yarn workspace @human-protocol/dashboard-client lint\"",
     "prepare": "husky",
     "postinstall": "yarn workspace @human-protocol/sdk build"
   },
diff --git a/packages/apps/dashboard/ui-2024/.env.example b/packages/apps/dashboard/client/.env.example
similarity index 100%
rename from packages/apps/dashboard/ui-2024/.env.example
rename to packages/apps/dashboard/client/.env.example
diff --git a/packages/apps/dashboard/ui-2024/.eslintrc.cjs b/packages/apps/dashboard/client/.eslintrc.cjs
similarity index 100%
rename from packages/apps/dashboard/ui-2024/.eslintrc.cjs
rename to packages/apps/dashboard/client/.eslintrc.cjs
diff --git a/packages/apps/dashboard/ui-2024/.gitignore b/packages/apps/dashboard/client/.gitignore
similarity index 100%
rename from packages/apps/dashboard/ui-2024/.gitignore
rename to packages/apps/dashboard/client/.gitignore
diff --git a/packages/apps/dashboard/ui-2024/.prettierrc b/packages/apps/dashboard/client/.prettierrc
similarity index 100%
rename from packages/apps/dashboard/ui-2024/.prettierrc
rename to packages/apps/dashboard/client/.prettierrc
diff --git a/packages/apps/dashboard/client/README.md b/packages/apps/dashboard/client/README.md
new file mode 100644
index 0000000000..b56a184f9f
--- /dev/null
+++ b/packages/apps/dashboard/client/README.md
@@ -0,0 +1,78 @@
+<p align="center">
+  <a href="https://www.humanprotocol.org/" target="blank"><img src="https://s2.coinmarketcap.com/static/img/coins/64x64/10347.png" width="100" alt="Human Protocol" /></a>
+</p>
+
+<h1 align="center">Dashboard Client</h1>
+<p align="center">The Dashboard Client is a client application for managing operations on the Human Protocol. It provides a user-friendly interface for checking with the protocol activity.</p>
+
+## 🚀 Getting Started
+
+### Prerequisites
+
+- Node.js
+- Yarn (as a package manager)
+
+### Installation
+
+First, install the dependencies:
+
+```bash
+$ yarn install
+```
+
+### Environment Variables
+
+The application requires environment variables to function correctly. Create a `.env` file, use the `.env.example` file as a template:
+
+```bash
+$ cp .env.example .env
+```
+
+### Running the Application
+
+#### Development
+
+To start the application in development mode:
+
+```bash
+$ yarn start
+```
+
+#### Production
+
+To build and start the application in production mode:
+
+```bash
+$ yarn build
+$ yarn start:prod
+```
+
+#### Preview
+
+To preview the production build:
+
+```bash
+$ yarn preview
+```
+
+## 🔧 Commands
+
+### Linting
+
+To lint the codebase:
+
+```bash
+$ yarn lint
+```
+
+### Formatting
+
+To format the codebase with Prettier and ESLint:
+
+```bash
+$ yarn format
+```
+
+## 📝 License
+
+This project is licensed under the MIT License. See the LICENSE file for more details.
diff --git a/packages/apps/dashboard/ui-2024/index.html b/packages/apps/dashboard/client/index.html
similarity index 100%
rename from packages/apps/dashboard/ui-2024/index.html
rename to packages/apps/dashboard/client/index.html
diff --git a/packages/apps/dashboard/ui-2024/package.json b/packages/apps/dashboard/client/package.json
similarity index 90%
rename from packages/apps/dashboard/ui-2024/package.json
rename to packages/apps/dashboard/client/package.json
index 0686f5d3b6..c869ab3c16 100644
--- a/packages/apps/dashboard/ui-2024/package.json
+++ b/packages/apps/dashboard/client/package.json
@@ -1,6 +1,6 @@
 {
   "private": "true",
-  "name": "@human-protocol/dashboard-ui-2024",
+  "name": "@human-protocol/dashboard-client",
   "version": "1.0.0",
   "description": "Human Protocol Dashboard",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "@emotion/styled": "^11.11.5",
     "@mui/icons-material": "^6.2.0",
     "@mui/material": "^5.15.18",
-    "@mui/styled-engine-sc": "6.1.3",
+    "@mui/styled-engine-sc": "6.4.0",
     "@mui/x-data-grid": "^7.23.2",
     "@mui/x-date-pickers": "^7.23.6",
     "@tanstack/react-query": "^5.48.0",
@@ -26,12 +26,12 @@
     "axios": "^1.7.2",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.11",
-    "node-sass": "^9.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-number-format": "^5.4.0",
+    "react-number-format": "^5.4.3",
     "react-router-dom": "^6.23.1",
     "recharts": "^2.13.0-alpha.4",
+    "sass": "^1.83.4",
     "simplebar-react": "^3.2.5",
     "styled-components": "^6.1.11",
     "swiper": "^11.1.3",
@@ -49,7 +49,7 @@
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.11",
     "prettier": "3.4.2",
-    "sass": "^1.78.0",
+    "sass": "^1.83.4",
     "stylelint-prettier": "^5.0.0",
     "typescript": "^5.2.2",
     "vite": "^5.4.7",
diff --git a/packages/apps/dashboard/ui-2024/public/vite.svg b/packages/apps/dashboard/client/public/vite.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/public/vite.svg
rename to packages/apps/dashboard/client/public/vite.svg
diff --git a/packages/apps/dashboard/ui-2024/src/App.css b/packages/apps/dashboard/client/src/App.css
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/App.css
rename to packages/apps/dashboard/client/src/App.css
diff --git a/packages/apps/dashboard/ui-2024/src/App.tsx b/packages/apps/dashboard/client/src/App.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/App.tsx
rename to packages/apps/dashboard/client/src/App.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/assets/bing.png b/packages/apps/dashboard/client/src/assets/bing.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/bing.png
rename to packages/apps/dashboard/client/src/assets/bing.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/bitfinex.png b/packages/apps/dashboard/client/src/assets/bitfinex.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/bitfinex.png
rename to packages/apps/dashboard/client/src/assets/bitfinex.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/coinlist.png b/packages/apps/dashboard/client/src/assets/coinlist.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/coinlist.png
rename to packages/apps/dashboard/client/src/assets/coinlist.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/ethereum.png b/packages/apps/dashboard/client/src/assets/ethereum.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/ethereum.png
rename to packages/apps/dashboard/client/src/assets/ethereum.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/exchange.png b/packages/apps/dashboard/client/src/assets/exchange.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/exchange.png
rename to packages/apps/dashboard/client/src/assets/exchange.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/gate.png b/packages/apps/dashboard/client/src/assets/gate.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/gate.png
rename to packages/apps/dashboard/client/src/assets/gate.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/human.png b/packages/apps/dashboard/client/src/assets/human.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/human.png
rename to packages/apps/dashboard/client/src/assets/human.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/binance.svg b/packages/apps/dashboard/client/src/assets/icons/binance.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/binance.svg
rename to packages/apps/dashboard/client/src/assets/icons/binance.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/celo.svg b/packages/apps/dashboard/client/src/assets/icons/celo.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/celo.svg
rename to packages/apps/dashboard/client/src/assets/icons/celo.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/discord.svg b/packages/apps/dashboard/client/src/assets/icons/discord.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/discord.svg
rename to packages/apps/dashboard/client/src/assets/icons/discord.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/ethereum.svg b/packages/apps/dashboard/client/src/assets/icons/ethereum.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/ethereum.svg
rename to packages/apps/dashboard/client/src/assets/icons/ethereum.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/exchange-oracle.svg b/packages/apps/dashboard/client/src/assets/icons/exchange-oracle.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/exchange-oracle.svg
rename to packages/apps/dashboard/client/src/assets/icons/exchange-oracle.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/excluded/escrow.svg b/packages/apps/dashboard/client/src/assets/icons/excluded/escrow.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/excluded/escrow.svg
rename to packages/apps/dashboard/client/src/assets/icons/excluded/escrow.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/excluded/wallet.svg b/packages/apps/dashboard/client/src/assets/icons/excluded/wallet.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/excluded/wallet.svg
rename to packages/apps/dashboard/client/src/assets/icons/excluded/wallet.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/human-app.svg b/packages/apps/dashboard/client/src/assets/icons/human-app.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/human-app.svg
rename to packages/apps/dashboard/client/src/assets/icons/human-app.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/job-launcher.svg b/packages/apps/dashboard/client/src/assets/icons/job-launcher.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/job-launcher.svg
rename to packages/apps/dashboard/client/src/assets/icons/job-launcher.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/moonbeam.svg b/packages/apps/dashboard/client/src/assets/icons/moonbeam.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/moonbeam.svg
rename to packages/apps/dashboard/client/src/assets/icons/moonbeam.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/okx.svg b/packages/apps/dashboard/client/src/assets/icons/okx.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/okx.svg
rename to packages/apps/dashboard/client/src/assets/icons/okx.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/polygon.svg b/packages/apps/dashboard/client/src/assets/icons/polygon.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/polygon.svg
rename to packages/apps/dashboard/client/src/assets/icons/polygon.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/recording-oracle.svg b/packages/apps/dashboard/client/src/assets/icons/recording-oracle.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/recording-oracle.svg
rename to packages/apps/dashboard/client/src/assets/icons/recording-oracle.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/reputation-oracle.svg b/packages/apps/dashboard/client/src/assets/icons/reputation-oracle.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/reputation-oracle.svg
rename to packages/apps/dashboard/client/src/assets/icons/reputation-oracle.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/icons/xlayer.svg b/packages/apps/dashboard/client/src/assets/icons/xlayer.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/icons/xlayer.svg
rename to packages/apps/dashboard/client/src/assets/icons/xlayer.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/lbank.png b/packages/apps/dashboard/client/src/assets/lbank.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/lbank.png
rename to packages/apps/dashboard/client/src/assets/lbank.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/logo-mobile.png b/packages/apps/dashboard/client/src/assets/logo-mobile.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/logo-mobile.png
rename to packages/apps/dashboard/client/src/assets/logo-mobile.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/logo.png b/packages/apps/dashboard/client/src/assets/logo.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/logo.png
rename to packages/apps/dashboard/client/src/assets/logo.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/probitGlobal.png b/packages/apps/dashboard/client/src/assets/probitGlobal.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/probitGlobal.png
rename to packages/apps/dashboard/client/src/assets/probitGlobal.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/react.svg b/packages/apps/dashboard/client/src/assets/react.svg
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/react.svg
rename to packages/apps/dashboard/client/src/assets/react.svg
diff --git a/packages/apps/dashboard/ui-2024/src/assets/recording.png b/packages/apps/dashboard/client/src/assets/recording.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/recording.png
rename to packages/apps/dashboard/client/src/assets/recording.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/reputation.png b/packages/apps/dashboard/client/src/assets/reputation.png
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/reputation.png
rename to packages/apps/dashboard/client/src/assets/reputation.png
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_breadcrumbs.scss b/packages/apps/dashboard/client/src/assets/styles/_breadcrumbs.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_breadcrumbs.scss
rename to packages/apps/dashboard/client/src/assets/styles/_breadcrumbs.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_const.scss b/packages/apps/dashboard/client/src/assets/styles/_const.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_const.scss
rename to packages/apps/dashboard/client/src/assets/styles/_const.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_footer.scss b/packages/apps/dashboard/client/src/assets/styles/_footer.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_footer.scss
rename to packages/apps/dashboard/client/src/assets/styles/_footer.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_graph-swipper.scss b/packages/apps/dashboard/client/src/assets/styles/_graph-swipper.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_graph-swipper.scss
rename to packages/apps/dashboard/client/src/assets/styles/_graph-swipper.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_header.scss b/packages/apps/dashboard/client/src/assets/styles/_header.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_header.scss
rename to packages/apps/dashboard/client/src/assets/styles/_header.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_home-page.scss b/packages/apps/dashboard/client/src/assets/styles/_home-page.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_home-page.scss
rename to packages/apps/dashboard/client/src/assets/styles/_home-page.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_nothing-found.scss b/packages/apps/dashboard/client/src/assets/styles/_nothing-found.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_nothing-found.scss
rename to packages/apps/dashboard/client/src/assets/styles/_nothing-found.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_page-wrapper.scss b/packages/apps/dashboard/client/src/assets/styles/_page-wrapper.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_page-wrapper.scss
rename to packages/apps/dashboard/client/src/assets/styles/_page-wrapper.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_search.scss b/packages/apps/dashboard/client/src/assets/styles/_search.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_search.scss
rename to packages/apps/dashboard/client/src/assets/styles/_search.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/_shadow-icon.scss b/packages/apps/dashboard/client/src/assets/styles/_shadow-icon.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/_shadow-icon.scss
rename to packages/apps/dashboard/client/src/assets/styles/_shadow-icon.scss
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/color-palette.ts b/packages/apps/dashboard/client/src/assets/styles/color-palette.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/color-palette.ts
rename to packages/apps/dashboard/client/src/assets/styles/color-palette.ts
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/favicon.ico b/packages/apps/dashboard/client/src/assets/styles/favicon.ico
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/favicon.ico
rename to packages/apps/dashboard/client/src/assets/styles/favicon.ico
diff --git a/packages/apps/dashboard/ui-2024/src/assets/styles/main.scss b/packages/apps/dashboard/client/src/assets/styles/main.scss
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/assets/styles/main.scss
rename to packages/apps/dashboard/client/src/assets/styles/main.scss
diff --git a/packages/apps/dashboard/ui-2024/src/components/Breadcrumbs/Breadcrumbs.tsx b/packages/apps/dashboard/client/src/components/Breadcrumbs/Breadcrumbs.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Breadcrumbs/Breadcrumbs.tsx
rename to packages/apps/dashboard/client/src/components/Breadcrumbs/Breadcrumbs.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Breadcrumbs/index.ts b/packages/apps/dashboard/client/src/components/Breadcrumbs/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Breadcrumbs/index.ts
rename to packages/apps/dashboard/client/src/components/Breadcrumbs/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Charts/AreaChart.tsx b/packages/apps/dashboard/client/src/components/Charts/AreaChart.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Charts/AreaChart.tsx
rename to packages/apps/dashboard/client/src/components/Charts/AreaChart.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Charts/CustomChartTooltip.tsx b/packages/apps/dashboard/client/src/components/Charts/CustomChartTooltip.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Charts/CustomChartTooltip.tsx
rename to packages/apps/dashboard/client/src/components/Charts/CustomChartTooltip.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Charts/CustomXAxisTick.tsx b/packages/apps/dashboard/client/src/components/Charts/CustomXAxisTick.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Charts/CustomXAxisTick.tsx
rename to packages/apps/dashboard/client/src/components/Charts/CustomXAxisTick.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Charts/ToggleCharts.tsx b/packages/apps/dashboard/client/src/components/Charts/ToggleCharts.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Charts/ToggleCharts.tsx
rename to packages/apps/dashboard/client/src/components/Charts/ToggleCharts.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Charts/index.ts b/packages/apps/dashboard/client/src/components/Charts/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Charts/index.ts
rename to packages/apps/dashboard/client/src/components/Charts/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Clipboard/Clipboard.tsx b/packages/apps/dashboard/client/src/components/Clipboard/Clipboard.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Clipboard/Clipboard.tsx
rename to packages/apps/dashboard/client/src/components/Clipboard/Clipboard.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Clipboard/index.ts b/packages/apps/dashboard/client/src/components/Clipboard/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Clipboard/index.ts
rename to packages/apps/dashboard/client/src/components/Clipboard/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/CustomTooltip/CustomTooltip.tsx b/packages/apps/dashboard/client/src/components/CustomTooltip/CustomTooltip.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/CustomTooltip/CustomTooltip.tsx
rename to packages/apps/dashboard/client/src/components/CustomTooltip/CustomTooltip.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/CustomTooltip/index.tsx b/packages/apps/dashboard/client/src/components/CustomTooltip/index.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/CustomTooltip/index.tsx
rename to packages/apps/dashboard/client/src/components/CustomTooltip/index.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/DataEntry/DatePicker.tsx b/packages/apps/dashboard/client/src/components/DataEntry/DatePicker.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/DataEntry/DatePicker.tsx
rename to packages/apps/dashboard/client/src/components/DataEntry/DatePicker.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/DataEntry/ToggleButtons.tsx b/packages/apps/dashboard/client/src/components/DataEntry/ToggleButtons.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/DataEntry/ToggleButtons.tsx
rename to packages/apps/dashboard/client/src/components/DataEntry/ToggleButtons.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/DataEntry/index.ts b/packages/apps/dashboard/client/src/components/DataEntry/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/DataEntry/index.ts
rename to packages/apps/dashboard/client/src/components/DataEntry/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Footer/Footer.tsx b/packages/apps/dashboard/client/src/components/Footer/Footer.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Footer/Footer.tsx
rename to packages/apps/dashboard/client/src/components/Footer/Footer.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Footer/index.ts b/packages/apps/dashboard/client/src/components/Footer/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Footer/index.ts
rename to packages/apps/dashboard/client/src/components/Footer/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Header/Header.tsx b/packages/apps/dashboard/client/src/components/Header/Header.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Header/Header.tsx
rename to packages/apps/dashboard/client/src/components/Header/Header.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Header/index.ts b/packages/apps/dashboard/client/src/components/Header/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Header/index.ts
rename to packages/apps/dashboard/client/src/components/Header/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Home/FormatNumber.tsx b/packages/apps/dashboard/client/src/components/Home/FormatNumber.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Home/FormatNumber.tsx
rename to packages/apps/dashboard/client/src/components/Home/FormatNumber.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Home/GraphSwiper.tsx b/packages/apps/dashboard/client/src/components/Home/GraphSwiper.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Home/GraphSwiper.tsx
rename to packages/apps/dashboard/client/src/components/Home/GraphSwiper.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Home/SmallGraph.tsx b/packages/apps/dashboard/client/src/components/Home/SmallGraph.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Home/SmallGraph.tsx
rename to packages/apps/dashboard/client/src/components/Home/SmallGraph.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Home/index.ts b/packages/apps/dashboard/client/src/components/Home/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Home/index.ts
rename to packages/apps/dashboard/client/src/components/Home/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/AvalancheIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/AvalancheIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/AvalancheIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/AvalancheIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/BinanceSmartChainIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/BinanceSmartChainIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/BinanceSmartChainIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/BinanceSmartChainIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/CeloIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/CeloIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/CeloIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/CeloIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/DiscordIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/DiscordIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/DiscordIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/DiscordIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/EscrowAddressIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/EscrowAddressIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/EscrowAddressIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/EscrowAddressIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/EthereumIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/EthereumIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/EthereumIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/EthereumIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/ExchangeOracleIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/ExchangeOracleIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/ExchangeOracleIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/ExchangeOracleIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/HumanIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/HumanIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/HumanIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/HumanIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/JobLauncher.tsx b/packages/apps/dashboard/client/src/components/Icons/JobLauncher.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/JobLauncher.tsx
rename to packages/apps/dashboard/client/src/components/Icons/JobLauncher.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/LeaderboardIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/LeaderboardIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/LeaderboardIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/LeaderboardIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/LogoBlockIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/LogoBlockIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/LogoBlockIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/LogoBlockIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/LogoBlockIconMobile.tsx b/packages/apps/dashboard/client/src/components/Icons/LogoBlockIconMobile.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/LogoBlockIconMobile.tsx
rename to packages/apps/dashboard/client/src/components/Icons/LogoBlockIconMobile.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/MoonbaseAlphaIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/MoonbaseAlphaIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/MoonbaseAlphaIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/MoonbaseAlphaIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/MoonbeamIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/MoonbeamIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/MoonbeamIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/MoonbeamIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/PolygonIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/PolygonIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/PolygonIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/PolygonIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/RecordingOracle.tsx b/packages/apps/dashboard/client/src/components/Icons/RecordingOracle.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/RecordingOracle.tsx
rename to packages/apps/dashboard/client/src/components/Icons/RecordingOracle.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/ReputationOracle.tsx b/packages/apps/dashboard/client/src/components/Icons/ReputationOracle.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/ReputationOracle.tsx
rename to packages/apps/dashboard/client/src/components/Icons/ReputationOracle.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/WalletIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/WalletIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/WalletIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/WalletIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Icons/XLayerIcon.tsx b/packages/apps/dashboard/client/src/components/Icons/XLayerIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Icons/XLayerIcon.tsx
rename to packages/apps/dashboard/client/src/components/Icons/XLayerIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/Loader/index.tsx b/packages/apps/dashboard/client/src/components/Loader/index.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/Loader/index.tsx
rename to packages/apps/dashboard/client/src/components/Loader/index.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/NetworkIcon/index.tsx b/packages/apps/dashboard/client/src/components/NetworkIcon/index.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/NetworkIcon/index.tsx
rename to packages/apps/dashboard/client/src/components/NetworkIcon/index.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/NothingFound/NothingFound.tsx b/packages/apps/dashboard/client/src/components/NothingFound/NothingFound.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/NothingFound/NothingFound.tsx
rename to packages/apps/dashboard/client/src/components/NothingFound/NothingFound.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/NothingFound/index.ts b/packages/apps/dashboard/client/src/components/NothingFound/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/NothingFound/index.ts
rename to packages/apps/dashboard/client/src/components/NothingFound/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/PageWrapper/PageWrapper.tsx b/packages/apps/dashboard/client/src/components/PageWrapper/PageWrapper.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/PageWrapper/PageWrapper.tsx
rename to packages/apps/dashboard/client/src/components/PageWrapper/PageWrapper.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/PageWrapper/index.ts b/packages/apps/dashboard/client/src/components/PageWrapper/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/PageWrapper/index.ts
rename to packages/apps/dashboard/client/src/components/PageWrapper/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/SearchBar/SearchBar.styles.ts b/packages/apps/dashboard/client/src/components/SearchBar/SearchBar.styles.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/SearchBar/SearchBar.styles.ts
rename to packages/apps/dashboard/client/src/components/SearchBar/SearchBar.styles.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/SearchBar/SearchBar.tsx b/packages/apps/dashboard/client/src/components/SearchBar/SearchBar.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/SearchBar/SearchBar.tsx
rename to packages/apps/dashboard/client/src/components/SearchBar/SearchBar.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/SearchResults/AbbreviateClipboard.tsx b/packages/apps/dashboard/client/src/components/SearchResults/AbbreviateClipboard.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/SearchResults/AbbreviateClipboard.tsx
rename to packages/apps/dashboard/client/src/components/SearchResults/AbbreviateClipboard.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/SearchResults/TitleSectionWrapper.tsx b/packages/apps/dashboard/client/src/components/SearchResults/TitleSectionWrapper.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/SearchResults/TitleSectionWrapper.tsx
rename to packages/apps/dashboard/client/src/components/SearchResults/TitleSectionWrapper.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/SearchResults/index.ts b/packages/apps/dashboard/client/src/components/SearchResults/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/SearchResults/index.ts
rename to packages/apps/dashboard/client/src/components/SearchResults/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/components/ShadowIcon/ShadowIcon.tsx b/packages/apps/dashboard/client/src/components/ShadowIcon/ShadowIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/ShadowIcon/ShadowIcon.tsx
rename to packages/apps/dashboard/client/src/components/ShadowIcon/ShadowIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/components/ShadowIcon/index.ts b/packages/apps/dashboard/client/src/components/ShadowIcon/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/components/ShadowIcon/index.ts
rename to packages/apps/dashboard/client/src/components/ShadowIcon/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/AddressCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/AddressCell.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/AddressCell.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/AddressCell.tsx
diff --git a/packages/apps/dashboard/client/src/features/Leaderboard/components/CategoryCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/CategoryCell.tsx
new file mode 100644
index 0000000000..36d3f78d17
--- /dev/null
+++ b/packages/apps/dashboard/client/src/features/Leaderboard/components/CategoryCell.tsx
@@ -0,0 +1,36 @@
+import { Chip } from '@mui/material';
+
+interface CategoryCellProps {
+  value?: string;
+}
+
+export const CategoryCell = ({ value }: CategoryCellProps) =>
+  value?.length ? (
+    <Chip
+      label={getCategoryLabel(value)}
+      variant="outlined"
+      color={getCategoryColor(value)}
+    />
+  ) : null;
+
+const getCategoryLabel = (category: string) => {
+  switch (category) {
+    case 'machine_learning':
+      return 'Machine Learning';
+    case 'market_making':
+      return 'Market Making';
+    default:
+      return category;
+  }
+};
+
+const getCategoryColor = (category: string) => {
+  switch (category) {
+    case 'machine_learning':
+      return 'primary';
+    case 'market_making':
+      return 'success';
+    default:
+      return 'default';
+  }
+};
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/ChainCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/ChainCell.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/ChainCell.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/ChainCell.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/DataGridWrapper.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/DataGridWrapper.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/DataGridWrapper.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/DataGridWrapper.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/EntityIcon.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/EntityIcon.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/ReputationLabel.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/ReputationLabel.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/ReputationLabel.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/ReputationLabel.tsx
diff --git a/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx
new file mode 100644
index 0000000000..0c11b729a4
--- /dev/null
+++ b/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx
@@ -0,0 +1,80 @@
+import { Box, Typography } from '@mui/material';
+import { Launch as LaunchIcon } from '@mui/icons-material';
+import { useBreakPoints } from '@utils/hooks/use-is-mobile';
+import { Link } from 'react-router-dom';
+import { EntityIcon } from './EntityIcon';
+
+const Wrapper = ({
+  children,
+  websiteUrl,
+}: React.PropsWithChildren<{ websiteUrl?: string }>) => {
+  return websiteUrl ? (
+    <Link
+      to={websiteUrl}
+      target="_blank"
+      rel="noopener noreferrer"
+      style={{
+        textDecoration: 'none',
+        color: 'inherit',
+        display: 'flex',
+        alignItems: 'center',
+        gap: '6px',
+      }}
+    >
+      {children}
+    </Link>
+  ) : (
+    <>{children}</>
+  );
+};
+
+export const RoleCell = ({
+  role,
+  websiteUrl,
+  name,
+}: {
+  role: string;
+  websiteUrl?: string;
+  name?: string;
+}) => {
+  const {
+    mobile: { isMobile },
+  } = useBreakPoints();
+
+  return (
+    <Box display="flex" alignItems="center" gap={1} height="100%">
+      <Wrapper websiteUrl={websiteUrl}>
+        <Box display="flex" alignItems="center" gap={1}>
+          {!isMobile && <EntityIcon role={role} />}
+          <Box display="flex" flexDirection="column" gap={4 / 8}>
+            <Box display="flex" alignItems="center" gap={12 / 8}>
+              <Typography
+                variant={isMobile ? 'subtitle2' : 'h6'}
+                sx={{
+                  wordBreak: 'unset',
+                  width: '100%',
+                  whiteSpace: isMobile ? 'wrap' : 'nowrap',
+                }}
+              >
+                {name ?? role}
+              </Typography>
+              {websiteUrl ? <LaunchIcon fontSize="small" /> : null}
+            </Box>
+            {name && role ? (
+              <Typography
+                variant={isMobile ? 'body3' : 'body1'}
+                sx={{
+                  wordBreak: 'unset',
+                  width: '100%',
+                  whiteSpace: isMobile ? 'wrap' : 'nowrap',
+                }}
+              >
+                {role}
+              </Typography>
+            ) : null}
+          </Box>
+        </Box>
+      </Wrapper>
+    </Box>
+  );
+};
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/SelectNetwork.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/SelectNetwork.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/SelectNetwork.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/SelectNetwork.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/TextCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/TextCell.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/TextCell.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/components/TextCell.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/hooks/useDataGrid.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/hooks/useDataGrid.tsx
similarity index 85%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/hooks/useDataGrid.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/hooks/useDataGrid.tsx
index e73d7e0d61..33e4fc4f3e 100644
--- a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/hooks/useDataGrid.tsx
+++ b/packages/apps/dashboard/client/src/features/Leaderboard/hooks/useDataGrid.tsx
@@ -12,8 +12,8 @@ import { RoleCell } from '../components/RoleCell';
 import { AddressCell } from '../components/AddressCell';
 import { ChainCell } from '../components/ChainCell';
 import { SelectNetwork } from '../components/SelectNetwork';
-import { ReputationLabel } from '../components/ReputationLabel';
 import { TextCell } from '../components/TextCell';
+import { CategoryCell } from '../components/CategoryCell';
 
 export const useDataGrid = (data: LeaderBoardData) => {
   const {
@@ -47,7 +47,7 @@ export const useDataGrid = (data: LeaderBoardData) => {
         field: 'role',
         sortable: false,
         flex: isMobile ? 0.8 : 1.5,
-        minWidth: isMobile ? 100 : 240,
+        minWidth: isMobile ? 100 : 360,
         headerClassName: isMobile
           ? 'home-page-table-header pinned-column--header'
           : 'home-page-table-header',
@@ -58,7 +58,11 @@ export const useDataGrid = (data: LeaderBoardData) => {
           </Typography>
         ),
         renderCell: (params: GridRenderCellParams) => (
-          <RoleCell role={params.value} websiteUrl={params.row.website} />
+          <RoleCell
+            role={params.value}
+            websiteUrl={params.row.website}
+            name={params.row.name}
+          />
         ),
       },
       {
@@ -136,31 +140,17 @@ export const useDataGrid = (data: LeaderBoardData) => {
         ),
       },
       {
-        field: 'reputation',
-        headerName: 'Reputation Score',
-        sortable: false,
-        flex: 1,
-        minWidth: 210,
+        field: 'category',
+        minWidth: 200,
+        headerName: 'Category',
         headerClassName: 'home-page-table-header',
         renderHeader: () => (
-          <Box display="flex" gap="8px" alignItems="center">
-            <CustomTooltip
-              title="Reputation of the role as per their activities "
-              arrow
-            >
-              <HelpOutlineIcon
-                style={{
-                  color: colorPalette.sky.main,
-                }}
-              />
-            </CustomTooltip>
-            <Typography component="span" variant="body3">
-              Reputation Score
-            </Typography>
-          </Box>
+          <Typography variant="body3" component="div">
+            Category
+          </Typography>
         ),
         renderCell: (params: GridRenderCellParams) => (
-          <ReputationLabel reputation={params.value} />
+          <CategoryCell value={params.value} />
         ),
       },
       {
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/hooks/useDatagridOptions.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/hooks/useDatagridOptions.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/hooks/useDatagridOptions.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/hooks/useDatagridOptions.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/index.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/index.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/features/Leaderboard/index.tsx
rename to packages/apps/dashboard/client/src/features/Leaderboard/index.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/abbreviateValue.ts b/packages/apps/dashboard/client/src/helpers/abbreviateValue.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/abbreviateValue.ts
rename to packages/apps/dashboard/client/src/helpers/abbreviateValue.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/env.ts b/packages/apps/dashboard/client/src/helpers/env.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/env.ts
rename to packages/apps/dashboard/client/src/helpers/env.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/formatDate.ts b/packages/apps/dashboard/client/src/helpers/formatDate.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/formatDate.ts
rename to packages/apps/dashboard/client/src/helpers/formatDate.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/formatHMTDecimals.ts b/packages/apps/dashboard/client/src/helpers/formatHMTDecimals.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/formatHMTDecimals.ts
rename to packages/apps/dashboard/client/src/helpers/formatHMTDecimals.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/formatNumber.ts b/packages/apps/dashboard/client/src/helpers/formatNumber.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/formatNumber.ts
rename to packages/apps/dashboard/client/src/helpers/formatNumber.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/index.ts b/packages/apps/dashboard/client/src/helpers/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/index.ts
rename to packages/apps/dashboard/client/src/helpers/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/helpers/isValidEVMAddress.ts b/packages/apps/dashboard/client/src/helpers/isValidEVMAddress.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/helpers/isValidEVMAddress.ts
rename to packages/apps/dashboard/client/src/helpers/isValidEVMAddress.ts
diff --git a/packages/apps/dashboard/ui-2024/src/index.css b/packages/apps/dashboard/client/src/index.css
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/index.css
rename to packages/apps/dashboard/client/src/index.css
diff --git a/packages/apps/dashboard/ui-2024/src/main.tsx b/packages/apps/dashboard/client/src/main.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/main.tsx
rename to packages/apps/dashboard/client/src/main.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Graph/Graph.tsx b/packages/apps/dashboard/client/src/pages/Graph/Graph.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Graph/Graph.tsx
rename to packages/apps/dashboard/client/src/pages/Graph/Graph.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Graph/index.ts b/packages/apps/dashboard/client/src/pages/Graph/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Graph/index.ts
rename to packages/apps/dashboard/client/src/pages/Graph/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/HMTPrice.tsx b/packages/apps/dashboard/client/src/pages/Home/HMTPrice.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/HMTPrice.tsx
rename to packages/apps/dashboard/client/src/pages/Home/HMTPrice.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/Holders.tsx b/packages/apps/dashboard/client/src/pages/Home/Holders.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/Holders.tsx
rename to packages/apps/dashboard/client/src/pages/Home/Holders.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/Home.tsx b/packages/apps/dashboard/client/src/pages/Home/Home.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/Home.tsx
rename to packages/apps/dashboard/client/src/pages/Home/Home.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/Leaderboard.tsx b/packages/apps/dashboard/client/src/pages/Home/Leaderboard.tsx
similarity index 62%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/Leaderboard.tsx
rename to packages/apps/dashboard/client/src/pages/Home/Leaderboard.tsx
index 2b62b4f33e..532e9788ff 100644
--- a/packages/apps/dashboard/ui-2024/src/pages/Home/Leaderboard.tsx
+++ b/packages/apps/dashboard/client/src/pages/Home/Leaderboard.tsx
@@ -2,12 +2,11 @@ import { useLeaderboardDetails } from '@services/api/use-leaderboard-details';
 import { Leaderboard as LeaderboardFeature } from '../../features/Leaderboard';
 
 export const Leaderboard = () => {
-  const { data, status, error } = useLeaderboardDetails();
-  const isMoreThatFiveEntries = data?.length && data.length > 5;
+  const { data, status, error } = useLeaderboardDetails(4);
 
   return (
     <LeaderboardFeature
-      data={isMoreThatFiveEntries ? data.slice(0, 5) : data}
+      data={data}
       status={status}
       error={error}
       viewAllBanner
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/TotalNumberOfTasks.tsx b/packages/apps/dashboard/client/src/pages/Home/TotalNumberOfTasks.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/TotalNumberOfTasks.tsx
rename to packages/apps/dashboard/client/src/pages/Home/TotalNumberOfTasks.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/TotalTransactions.tsx b/packages/apps/dashboard/client/src/pages/Home/TotalTransactions.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/TotalTransactions.tsx
rename to packages/apps/dashboard/client/src/pages/Home/TotalTransactions.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Home/index.ts b/packages/apps/dashboard/client/src/pages/Home/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/Home/index.ts
rename to packages/apps/dashboard/client/src/pages/Home/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/pages/Leaderboard/index.tsx b/packages/apps/dashboard/client/src/pages/Leaderboard/index.tsx
similarity index 78%
rename from packages/apps/dashboard/ui-2024/src/pages/Leaderboard/index.tsx
rename to packages/apps/dashboard/client/src/pages/Leaderboard/index.tsx
index 997067848b..1a2a7f2d48 100644
--- a/packages/apps/dashboard/ui-2024/src/pages/Leaderboard/index.tsx
+++ b/packages/apps/dashboard/client/src/pages/Leaderboard/index.tsx
@@ -7,7 +7,6 @@ import { LeaderboardIcon } from '@components/Icons/LeaderboardIcon';
 
 export const LeaderBoard = () => {
   const { data, status, error } = useLeaderboardDetails();
-  const isMoreThatFiveEntries = data?.length && data.length > 5;
 
   return (
     <PageWrapper className="standard-background">
@@ -17,11 +16,7 @@ export const LeaderBoard = () => {
         title="Leaderboard"
         img={<LeaderboardIcon />}
       />
-      <Leaderboard
-        data={isMoreThatFiveEntries ? data.slice(0, 5) : data}
-        status={status}
-        error={error}
-      />
+      <Leaderboard data={data} status={status} error={error} />
     </PageWrapper>
   );
 };
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/EscrowAddress.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/EscrowAddress.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/EscrowAddress.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/EscrowAddress.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/HMTBalance.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/HMTBalance.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/HMTBalance.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/HMTBalance.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/index.ts b/packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/EscrowAddress/index.ts
rename to packages/apps/dashboard/client/src/pages/SearchResults/EscrowAddress/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetails.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/RoleDetailsEscrowsTable.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/RoleDetailsEscrowsTable.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/RoleDetailsEscrowsTable.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/RoleDetailsEscrowsTable.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBody.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBody.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBody.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBody.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBodyContainer.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBodyContainer.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBodyContainer.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetailsEscrows/tableComponents/EscrowsTableBodyContainer.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/index.ts b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/RoleDetails/index.ts
rename to packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/SearchResults.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/SearchResults.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/SearchResults.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/SearchResults.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddress.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddress.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddress.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddress.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/WalletAddressTransactionsTable.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/WalletAddressTransactionsTable.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/WalletAddressTransactionsTable.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/WalletAddressTransactionsTable.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellMethod.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellMethod.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellMethod.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellMethod.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellValue.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellValue.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellValue.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellValue.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBody.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBody.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBody.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBody.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBodyContainer.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBodyContainer.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBodyContainer.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBodyContainer.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableHead.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableHead.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableHead.tsx
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableHead.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/index.ts b/packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/WalletAddress/index.ts
rename to packages/apps/dashboard/client/src/pages/SearchResults/WalletAddress/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/pages/SearchResults/index.ts b/packages/apps/dashboard/client/src/pages/SearchResults/index.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/pages/SearchResults/index.ts
rename to packages/apps/dashboard/client/src/pages/SearchResults/index.ts
diff --git a/packages/apps/dashboard/ui-2024/src/services/api-paths.ts b/packages/apps/dashboard/client/src/services/api-paths.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api-paths.ts
rename to packages/apps/dashboard/client/src/services/api-paths.ts
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-address-details.tsx b/packages/apps/dashboard/client/src/services/api/use-address-details.tsx
similarity index 98%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-address-details.tsx
rename to packages/apps/dashboard/client/src/services/api/use-address-details.tsx
index b61dd32a13..fb61b47f59 100644
--- a/packages/apps/dashboard/ui-2024/src/services/api/use-address-details.tsx
+++ b/packages/apps/dashboard/client/src/services/api/use-address-details.tsx
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { httpService } from '../http-service';
 import { apiPaths } from '../api-paths';
 import { useWalletSearch } from '@utils/hooks/use-wallet-search';
-import { validateResponse } from '../../services/validate-response';
+import { validateResponse } from '../validate-response';
 import { reputationSchema } from '@services/api/use-leaderboard-details';
 
 const transformOptionalTokenAmount = (
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-escrows-details.tsx b/packages/apps/dashboard/client/src/services/api/use-escrows-details.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-escrows-details.tsx
rename to packages/apps/dashboard/client/src/services/api/use-escrows-details.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-general-stats.tsx b/packages/apps/dashboard/client/src/services/api/use-general-stats.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-general-stats.tsx
rename to packages/apps/dashboard/client/src/services/api/use-general-stats.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-graph-page-chart-data.tsx b/packages/apps/dashboard/client/src/services/api/use-graph-page-chart-data.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-graph-page-chart-data.tsx
rename to packages/apps/dashboard/client/src/services/api/use-graph-page-chart-data.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-hcaptcha-general-stats.tsx b/packages/apps/dashboard/client/src/services/api/use-hcaptcha-general-stats.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-hcaptcha-general-stats.tsx
rename to packages/apps/dashboard/client/src/services/api/use-hcaptcha-general-stats.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-hmt-price.tsx b/packages/apps/dashboard/client/src/services/api/use-hmt-price.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-hmt-price.tsx
rename to packages/apps/dashboard/client/src/services/api/use-hmt-price.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-leaderboard-details.tsx b/packages/apps/dashboard/client/src/services/api/use-leaderboard-details.tsx
similarity index 89%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-leaderboard-details.tsx
rename to packages/apps/dashboard/client/src/services/api/use-leaderboard-details.tsx
index 03e0b774bd..39390eea7c 100644
--- a/packages/apps/dashboard/ui-2024/src/services/api/use-leaderboard-details.tsx
+++ b/packages/apps/dashboard/client/src/services/api/use-leaderboard-details.tsx
@@ -43,13 +43,15 @@ const leaderBoardEntity = z.object({
   url: z.string().nullable(),
   website: z.string().nullable(),
   chainId: z.number(),
+  name: z.string().nullable(),
+  category: z.string().nullable(),
 });
 
 export const leaderBoardSuccessResponseSchema = z.array(leaderBoardEntity);
 export type LeaderBoardEntity = z.infer<typeof leaderBoardEntity>;
 export type LeaderBoardData = z.infer<typeof leaderBoardSuccessResponseSchema>;
 
-export function useLeaderboardDetails() {
+export function useLeaderboardDetails(first?: number) {
   const {
     filterParams: { chainId },
   } = useLeaderboardSearch();
@@ -59,8 +61,9 @@ export function useLeaderboardDetails() {
       if (chainId === -1) {
         return [];
       }
+
       const { data } = await httpService.get(apiPaths.leaderboardDetails.path, {
-        params: { chainId },
+        params: { chainId, first },
       });
 
       const validResponse = validateResponse(
@@ -70,6 +73,6 @@ export function useLeaderboardDetails() {
 
       return validResponse;
     },
-    queryKey: ['useLeaderboardDetails', chainId],
+    queryKey: ['useLeaderboardDetails', chainId, first],
   });
 }
diff --git a/packages/apps/dashboard/ui-2024/src/services/api/use-transaction-details.tsx b/packages/apps/dashboard/client/src/services/api/use-transaction-details.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/api/use-transaction-details.tsx
rename to packages/apps/dashboard/client/src/services/api/use-transaction-details.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/services/global.type.ts b/packages/apps/dashboard/client/src/services/global.type.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/global.type.ts
rename to packages/apps/dashboard/client/src/services/global.type.ts
diff --git a/packages/apps/dashboard/ui-2024/src/services/handle-error-message.ts b/packages/apps/dashboard/client/src/services/handle-error-message.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/handle-error-message.ts
rename to packages/apps/dashboard/client/src/services/handle-error-message.ts
diff --git a/packages/apps/dashboard/ui-2024/src/services/http-service.ts b/packages/apps/dashboard/client/src/services/http-service.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/http-service.ts
rename to packages/apps/dashboard/client/src/services/http-service.ts
diff --git a/packages/apps/dashboard/ui-2024/src/services/validate-response.ts b/packages/apps/dashboard/client/src/services/validate-response.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/services/validate-response.ts
rename to packages/apps/dashboard/client/src/services/validate-response.ts
diff --git a/packages/apps/dashboard/ui-2024/src/theme.tsx b/packages/apps/dashboard/client/src/theme.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/theme.tsx
rename to packages/apps/dashboard/client/src/theme.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/utils/config/networks.ts b/packages/apps/dashboard/client/src/utils/config/networks.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/config/networks.ts
rename to packages/apps/dashboard/client/src/utils/config/networks.ts
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-escrows-details-dto.ts b/packages/apps/dashboard/client/src/utils/hooks/use-escrows-details-dto.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-escrows-details-dto.ts
rename to packages/apps/dashboard/client/src/utils/hooks/use-escrows-details-dto.ts
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-filtered-networks.ts b/packages/apps/dashboard/client/src/utils/hooks/use-filtered-networks.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-filtered-networks.ts
rename to packages/apps/dashboard/client/src/utils/hooks/use-filtered-networks.ts
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-graph-page-chart-params.tsx b/packages/apps/dashboard/client/src/utils/hooks/use-graph-page-chart-params.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-graph-page-chart-params.tsx
rename to packages/apps/dashboard/client/src/utils/hooks/use-graph-page-chart-params.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-is-mobile.tsx b/packages/apps/dashboard/client/src/utils/hooks/use-is-mobile.tsx
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-is-mobile.tsx
rename to packages/apps/dashboard/client/src/utils/hooks/use-is-mobile.tsx
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-leaderboard-search.ts b/packages/apps/dashboard/client/src/utils/hooks/use-leaderboard-search.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-leaderboard-search.ts
rename to packages/apps/dashboard/client/src/utils/hooks/use-leaderboard-search.ts
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-transactions-details-dto.ts b/packages/apps/dashboard/client/src/utils/hooks/use-transactions-details-dto.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-transactions-details-dto.ts
rename to packages/apps/dashboard/client/src/utils/hooks/use-transactions-details-dto.ts
diff --git a/packages/apps/dashboard/ui-2024/src/utils/hooks/use-wallet-search.ts b/packages/apps/dashboard/client/src/utils/hooks/use-wallet-search.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/utils/hooks/use-wallet-search.ts
rename to packages/apps/dashboard/client/src/utils/hooks/use-wallet-search.ts
diff --git a/packages/apps/dashboard/ui-2024/src/vite-env.d.ts b/packages/apps/dashboard/client/src/vite-env.d.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/src/vite-env.d.ts
rename to packages/apps/dashboard/client/src/vite-env.d.ts
diff --git a/packages/apps/dashboard/ui-2024/tsconfig.json b/packages/apps/dashboard/client/tsconfig.json
similarity index 100%
rename from packages/apps/dashboard/ui-2024/tsconfig.json
rename to packages/apps/dashboard/client/tsconfig.json
diff --git a/packages/apps/dashboard/ui-2024/tsconfig.node.json b/packages/apps/dashboard/client/tsconfig.node.json
similarity index 100%
rename from packages/apps/dashboard/ui-2024/tsconfig.node.json
rename to packages/apps/dashboard/client/tsconfig.node.json
diff --git a/packages/apps/dashboard/ui-2024/vercel.json b/packages/apps/dashboard/client/vercel.json
similarity index 100%
rename from packages/apps/dashboard/ui-2024/vercel.json
rename to packages/apps/dashboard/client/vercel.json
diff --git a/packages/apps/dashboard/ui-2024/vite.config.ts b/packages/apps/dashboard/client/vite.config.ts
similarity index 100%
rename from packages/apps/dashboard/ui-2024/vite.config.ts
rename to packages/apps/dashboard/client/vite.config.ts
diff --git a/packages/apps/dashboard/server/src/common/config/network-config.service.ts b/packages/apps/dashboard/server/src/common/config/network-config.service.ts
index 6437fbacdd..82805f0fb8 100644
--- a/packages/apps/dashboard/server/src/common/config/network-config.service.ts
+++ b/packages/apps/dashboard/server/src/common/config/network-config.service.ts
@@ -62,24 +62,6 @@ export class NetworkConfigService {
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_TESTNET'),
         },
       }),
-      ...(this.configService.get<string>('RPC_URL_MOONBEAM') && {
-        moonbeam: {
-          chainId: ChainId.MOONBEAM,
-          rpcUrl: this.configService.get<string>('RPC_URL_MOONBEAM'),
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER_TESTNET') && {
-        xlayertestnet: {
-          chainId: ChainId.XLAYER_TESTNET,
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER_TESTNET'),
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER') && {
-        xlayer: {
-          chainId: ChainId.XLAYER,
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER'),
-        },
-      }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
           chainId: ChainId.LOCALHOST,
diff --git a/packages/apps/dashboard/server/src/modules/details/details.controller.ts b/packages/apps/dashboard/server/src/modules/details/details.controller.ts
index beff08f6bd..55441a0b0f 100644
--- a/packages/apps/dashboard/server/src/modules/details/details.controller.ts
+++ b/packages/apps/dashboard/server/src/modules/details/details.controller.ts
@@ -15,6 +15,7 @@ import { DetailsService } from './details.service';
 import {
   DetailsResponseDto,
   DetailsPaginationResponseDto,
+  KVStoreDataDto,
 } from './dto/details-response.dto';
 import {
   DetailsTransactionsPaginationDto,
@@ -35,13 +36,12 @@ export class DetailsController {
   @Get('/leaders')
   @HttpCode(200)
   @ApiOperation({
-    summary: 'Get the best leaders by role',
-    description:
-      'Returns the top leader for each role for a given chain or all chains.',
+    summary: 'Get leaders',
+    description: 'Returns leaders for the given filters.',
   })
   @ApiResponse({
     status: 200,
-    description: 'Best leaders retrieved successfully',
+    description: 'Leaders retrieved successfully',
     type: LeaderDto,
     isArray: true,
   })
@@ -160,4 +160,24 @@ export class DetailsController {
 
     return response;
   }
+
+  @Get('/kvstore/:address')
+  @HttpCode(200)
+  @ApiOperation({
+    summary: 'Get KVStore data by address',
+    description: 'Returns all the data stored in KVStore for a given address.',
+  })
+  @ApiQuery({ name: 'chain_id', enum: ChainId, required: true })
+  @ApiResponse({
+    status: 200,
+    description: 'Data retrieved successfully',
+    type: KVStoreDataDto,
+    isArray: true,
+  })
+  public async KVStore(
+    @Param('address', AddressValidationPipe) address: string,
+    @Query('chain_id') chainId: ChainId,
+  ): Promise<KVStoreDataDto[]> {
+    return this.detailsService.getKVStoreData(chainId, address);
+  }
 }
diff --git a/packages/apps/dashboard/server/src/modules/details/details.service.ts b/packages/apps/dashboard/server/src/modules/details/details.service.ts
index 4e45ea21a5..e87e312afe 100644
--- a/packages/apps/dashboard/server/src/modules/details/details.service.ts
+++ b/packages/apps/dashboard/server/src/modules/details/details.service.ts
@@ -10,6 +10,7 @@ import {
   NETWORKS,
   ILeadersFilter,
   OrderDirection,
+  KVStoreUtils,
 } from '@human-protocol/sdk';
 
 import { WalletDto } from './dto/wallet.dto';
@@ -30,6 +31,7 @@ import {
   MIN_AMOUNT_STAKED,
 } from '../../common/constants/leader';
 import { GetLeadersPaginationOptions } from 'src/common/types';
+import { KVStoreDataDto } from './dto/details-response.dto';
 
 @Injectable()
 export class DetailsService {
@@ -339,4 +341,20 @@ export class DetailsService {
 
     return sortedLeaders;
   }
+
+  public async getKVStoreData(
+    chainId: ChainId,
+    address: string,
+  ): Promise<KVStoreDataDto[]> {
+    const kvStoreData = await KVStoreUtils.getKVStoreData(chainId, address);
+
+    const data: KVStoreDataDto[] = kvStoreData.map((data: any) => {
+      return plainToInstance(KVStoreDataDto, {
+        key: data.key,
+        value: data.value,
+      });
+    });
+
+    return data;
+  }
 }
diff --git a/packages/apps/dashboard/server/src/modules/details/details.spec.ts b/packages/apps/dashboard/server/src/modules/details/details.spec.ts
index 28895a15a7..787ca4112a 100644
--- a/packages/apps/dashboard/server/src/modules/details/details.spec.ts
+++ b/packages/apps/dashboard/server/src/modules/details/details.spec.ts
@@ -9,6 +9,7 @@ import {
   ChainId,
   ILeader,
   OperatorUtils,
+  KVStoreUtils,
   OrderDirection,
 } from '@human-protocol/sdk';
 import { LeadersOrderBy } from '../../common/enums/leader';
@@ -18,6 +19,9 @@ jest.mock('@human-protocol/sdk', () => ({
   OperatorUtils: {
     getLeaders: jest.fn(),
   },
+  KVStoreUtils: {
+    getKVStoreData: jest.fn(),
+  },
 }));
 
 jest.mock('../../common/constants/leader', () => ({
@@ -162,4 +166,22 @@ describe('DetailsService', () => {
       }),
     ]);
   });
+
+  it('should fetch and return KV store data', async () => {
+    const mockKVStoreData = [
+      { key: 'key1', value: 'value1' },
+      { key: 'key2', value: 'value2' },
+    ];
+
+    jest
+      .spyOn(KVStoreUtils, 'getKVStoreData')
+      .mockResolvedValue(mockKVStoreData);
+
+    const result = await service.getKVStoreData(ChainId.MAINNET, '0x123');
+
+    expect(result).toEqual([
+      expect.objectContaining({ key: 'key1', value: 'value1' }),
+      expect.objectContaining({ key: 'key2', value: 'value2' }),
+    ]);
+  });
 });
diff --git a/packages/apps/dashboard/server/src/modules/details/dto/details-response.dto.ts b/packages/apps/dashboard/server/src/modules/details/dto/details-response.dto.ts
index 492c31b633..f007cf5d9a 100644
--- a/packages/apps/dashboard/server/src/modules/details/dto/details-response.dto.ts
+++ b/packages/apps/dashboard/server/src/modules/details/dto/details-response.dto.ts
@@ -41,3 +41,11 @@ export class DetailsPaginationResponseDto {
   @IsArray()
   public results: EscrowPaginationDto[] | TransactionPaginationDto[];
 }
+
+export class KVStoreDataDto {
+  @ApiProperty({ example: 'key' })
+  public key: string;
+
+  @ApiProperty({ example: 'value' })
+  public value: string;
+}
diff --git a/packages/apps/dashboard/server/src/modules/details/dto/leader.dto.ts b/packages/apps/dashboard/server/src/modules/details/dto/leader.dto.ts
index ed495d2627..0719913d06 100644
--- a/packages/apps/dashboard/server/src/modules/details/dto/leader.dto.ts
+++ b/packages/apps/dashboard/server/src/modules/details/dto/leader.dto.ts
@@ -75,4 +75,18 @@ export class LeaderDto {
   @IsNumber()
   @Expose()
   public amountJobsProcessed: number;
+
+  @ApiProperty({ example: 'CVAT' })
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  @Expose()
+  public name?: string;
+
+  @ApiProperty({ example: 'Machine Learning' })
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  @Expose()
+  public category?: string;
 }
diff --git a/packages/apps/dashboard/ui-2024/README.md b/packages/apps/dashboard/ui-2024/README.md
deleted file mode 100644
index 70ac8c27a7..0000000000
--- a/packages/apps/dashboard/ui-2024/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# React + TypeScript + Vite
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
-
-- Configure the top-level `parserOptions` property like this:
-
-```js
-export default {
-	// other rules...
-	parserOptions: {
-		ecmaVersion: 'latest',
-		sourceType: 'module',
-		project: ['./tsconfig.json', './tsconfig.node.json'],
-		tsconfigRootDir: __dirname,
-	},
-};
-```
-
-- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
-- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
-- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
diff --git a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/RoleCell.tsx b/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/RoleCell.tsx
deleted file mode 100644
index fade268f52..0000000000
--- a/packages/apps/dashboard/ui-2024/src/features/Leaderboard/components/RoleCell.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Box, Typography } from '@mui/material';
-import { useBreakPoints } from '@utils/hooks/use-is-mobile';
-import { Link } from 'react-router-dom';
-import { EntityIcon } from './EntityIcon';
-
-export const RoleCell = ({
-  role,
-  websiteUrl,
-}: {
-  role: string;
-  websiteUrl?: string;
-}) => {
-  const {
-    mobile: { isMobile },
-  } = useBreakPoints();
-
-  return (
-    <Box display="flex" alignItems="center" gap="6px" height="100%">
-      {websiteUrl ? (
-        <Link
-          to={websiteUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          style={{
-            textDecoration: 'none',
-            color: 'inherit',
-            display: 'flex',
-            alignItems: 'center',
-            gap: '6px',
-          }}
-        >
-          {!isMobile && <EntityIcon role={role} />}
-          <Typography
-            variant={isMobile ? 'subtitle2' : 'h6'}
-            sx={{
-              wordBreak: 'unset',
-              whiteSpace: isMobile ? 'wrap' : 'nowrap',
-            }}
-          >
-            {role}
-          </Typography>
-        </Link>
-      ) : (
-        <>
-          {!isMobile && <EntityIcon role={role} />}
-          <Typography
-            variant={isMobile ? 'subtitle2' : 'h6'}
-            sx={{
-              wordBreak: 'unset',
-              width: '100%',
-              whiteSpace: isMobile ? 'wrap' : 'nowrap',
-            }}
-          >
-            {role}
-          </Typography>
-        </>
-      )}
-    </Box>
-  );
-};
diff --git a/packages/apps/faucet/client/src/constants/index.ts b/packages/apps/faucet/client/src/constants/index.ts
index 8ee6eadd11..60ad7fbdfb 100644
--- a/packages/apps/faucet/client/src/constants/index.ts
+++ b/packages/apps/faucet/client/src/constants/index.ts
@@ -4,8 +4,4 @@ export const FAUCET_CHAIN_IDS = [
   ChainId.SEPOLIA,
   ChainId.BSC_TESTNET,
   ChainId.POLYGON_AMOY,
-  ChainId.MOONBASE_ALPHA,
-  ChainId.AVALANCHE_TESTNET,
-  ChainId.CELO_ALFAJORES,
-  ChainId.XLAYER_TESTNET,
 ];
diff --git a/packages/apps/faucet/server/src/constants/networks.ts b/packages/apps/faucet/server/src/constants/networks.ts
index d62293666f..e79f7ddb62 100644
--- a/packages/apps/faucet/server/src/constants/networks.ts
+++ b/packages/apps/faucet/server/src/constants/networks.ts
@@ -16,18 +16,6 @@ export const FAUCET_NETWORKS: {
   [ChainId.POLYGON_AMOY]: {
     rpcUrl: process.env.RPC_URL_POLYGON_AMOY || '',
   },
-  [ChainId.MOONBASE_ALPHA]: {
-    rpcUrl: process.env.RPC_URL_MOONBASE_ALPHA || '',
-  },
-  [ChainId.AVALANCHE_TESTNET]: {
-    rpcUrl: process.env.RPC_URL_AVALANCHE_TESTNET || '',
-  },
-  [ChainId.CELO_ALFAJORES]: {
-    rpcUrl: process.env.RPC_URL_CELO_ALFAJORES || '',
-  },
-  [ChainId.XLAYER_TESTNET]: {
-    rpcUrl: process.env.RPC_URL_XLAYER_TESTNET || '',
-  },
   [ChainId.LOCALHOST]: {
     rpcUrl: process.env.RPC_PORT
       ? `http://127.0.0.1:${process.env.RPC_PORT}`
diff --git a/packages/apps/fortune/exchange-oracle/client/src/constants/chains.ts b/packages/apps/fortune/exchange-oracle/client/src/constants/chains.ts
index aecd68e9a9..7d7d5ffea3 100644
--- a/packages/apps/fortune/exchange-oracle/client/src/constants/chains.ts
+++ b/packages/apps/fortune/exchange-oracle/client/src/constants/chains.ts
@@ -14,7 +14,6 @@ switch (import.meta.env.VITE_APP_ENVIRONMENT.toLowerCase()) {
       ChainId.BSC_TESTNET,
       ChainId.POLYGON_AMOY,
       ChainId.SEPOLIA,
-      ChainId.XLAYER_TESTNET,
     ];
     break;
   case 'localhost':
diff --git a/packages/apps/fortune/exchange-oracle/server/ENV.md b/packages/apps/fortune/exchange-oracle/server/ENV.md
index 5587f3f2b4..3a718a5cfc 100644
--- a/packages/apps/fortune/exchange-oracle/server/ENV.md
+++ b/packages/apps/fortune/exchange-oracle/server/ENV.md
@@ -39,12 +39,6 @@ RPC_URL_BSC_MAINNET=
 ### The RPC URL for the BSC Testnet network.
 RPC_URL_BSC_TESTNET=
 
-### The RPC URL for the Moonbeam network.
-RPC_URL_MOONBEAM=
-
-### The RPC URL for the XLayer network.
-RPC_URL_XLAYER=
-
 ### The RPC URL for the Localhost network.
 RPC_URL_LOCALHOST=
 
diff --git a/packages/apps/fortune/exchange-oracle/server/src/common/config/network-config.service.ts b/packages/apps/fortune/exchange-oracle/server/src/common/config/network-config.service.ts
index d414a012d2..416f8f1a67 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/common/config/network-config.service.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/common/config/network-config.service.ts
@@ -62,24 +62,6 @@ export class NetworkConfigService {
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_TESTNET'),
         },
       }),
-      ...(this.configService.get<string>('RPC_URL_MOONBEAM') && {
-        moonbeam: {
-          chainId: ChainId.MOONBEAM,
-          /**
-           * The RPC URL for the Moonbeam network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_MOONBEAM'),
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER') && {
-        xLayer: {
-          chainId: ChainId.XLAYER,
-          /**
-           * The RPC URL for the XLayer network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER'),
-        },
-      }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
           chainId: ChainId.LOCALHOST,
diff --git a/packages/apps/fortune/exchange-oracle/server/src/common/constant/index.ts b/packages/apps/fortune/exchange-oracle/server/src/common/constant/index.ts
index 132258f27b..d083a54a22 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/common/constant/index.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/common/constant/index.ts
@@ -14,7 +14,6 @@ export const TESTNET_CHAIN_IDS = [
 export const MAINNET_CHAIN_IDS = [
   ChainId.POLYGON,
   ChainId.BSC_MAINNET,
-  ChainId.MOONBEAM,
 ];
 
 export const JWT_KVSTORE_KEY = 'jwt_public_key';
diff --git a/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
index 4acaa96149..9b54afb497 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -161,4 +161,38 @@ describe('TransformEnumInterceptor', () => {
     });
     expect(callHandler.handle).toHaveBeenCalled();
   });
+
+  it('should return bodyOrQuery if instance is not an object', () => {
+    // Test with `null` as the instance
+    let result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      null,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with `undefined` as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      undefined,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with a primitive value (string) as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      'some string',
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with a primitive value (number) as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      123,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  });
 });
diff --git a/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.ts b/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
index 62309328a1..d24d146f34 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
@@ -83,6 +83,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
     instance: any,
     targetClass: ClassConstructor<any>,
   ): any {
+    if (!instance || typeof instance !== 'object') {
+      return bodyOrQuery;
+    }
+
     for (const property in bodyOrQuery) {
       if (bodyOrQuery.hasOwnProperty(property)) {
         const instanceValue = instance[property];
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/assignment/assignment.controller.spec.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/assignment/assignment.controller.spec.ts
index 7594876b8e..50bb4303a2 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/modules/assignment/assignment.controller.spec.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/modules/assignment/assignment.controller.spec.ts
@@ -40,7 +40,7 @@ describe('assignmentController', () => {
   describe('getAssignmentList', () => {
     it('should call assignmentService.getAssignmentList', async () => {
       const query: GetAssignmentsDto = {
-        chainId: 80001,
+        chainId: 80002,
         jobType: JobType.FORTUNE,
         escrowAddress: escrowAddress,
         status: AssignmentStatus.ACTIVE,
@@ -73,7 +73,7 @@ describe('assignmentController', () => {
   describe('createAssignment', () => {
     it('should call assignmentService.createAssignment', async () => {
       const body: CreateAssignmentDto = {
-        chainId: 80001,
+        chainId: 80002,
         escrowAddress: escrowAddress,
       };
       jest.spyOn(assignmentService, 'createAssignment').mockResolvedValue({
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.spec.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.spec.ts
index 558fea3c1b..8a5b00a3af 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.spec.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.spec.ts
@@ -75,7 +75,7 @@ describe('JobController', () => {
         solution: 'job-solution',
       };
 
-      await jobController.solveJob(solveJobDto, 'signature');
+      await jobController.solveJob(solveJobDto);
 
       expect(jobService.solveJob).toHaveBeenCalledWith(
         Number(solveJobDto.assignmentId),
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.ts
index b5cac2a69b..8209881c5e 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/modules/job/job.controller.ts
@@ -6,7 +6,6 @@ import {
   Query,
   UseGuards,
   Request,
-  Headers,
 } from '@nestjs/common';
 import {
   ApiBearerAuth,
@@ -95,7 +94,6 @@ export class JobController {
   @AllowedRoles([AuthSignatureRole.Worker])
   async solveJob(
     @Body() solveJobDto: SolveJobDto,
-    @Headers(HEADER_SIGNATURE_KEY) signature: string,
   ): Promise<SolveJobResponseDto> {
     const { assignmentId, solution } = solveJobDto;
 
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.spec.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.spec.ts
index 638d6eae6a..63f73173b4 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.spec.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.spec.ts
@@ -1,6 +1,5 @@
 import { createMock } from '@golevelup/ts-jest';
 import { Test } from '@nestjs/testing';
-import { MOCK_SIGNATURE } from '../../../test/constants';
 import { EventType } from '../../common/enums/webhook';
 import { WebhookController } from './webhook.controller';
 import { WebhookDto } from './webhook.dto';
@@ -41,7 +40,7 @@ describe('webhookController', () => {
       };
       jest.spyOn(webhookService, 'handleWebhook').mockResolvedValue();
 
-      await webhookController.processWebhook(webhook, MOCK_SIGNATURE);
+      await webhookController.processWebhook(webhook);
 
       expect(webhookService.handleWebhook).toHaveBeenCalledWith(webhook);
     });
diff --git a/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.ts b/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.ts
index e00712099b..ac5d7ee606 100644
--- a/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.ts
+++ b/packages/apps/fortune/exchange-oracle/server/src/modules/webhook/webhook.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Headers, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 import {
   ApiBody,
   ApiResponse,
@@ -58,7 +58,6 @@ export class WebhookController {
   })
   public async processWebhook(
     @Body() body: WebhookDto,
-    @Headers(HEADER_SIGNATURE_KEY) _: string,
   ): Promise<void> {
     return this.webhookService.handleWebhook(body);
   }
diff --git a/packages/apps/fortune/recording-oracle/ENV.md b/packages/apps/fortune/recording-oracle/ENV.md
index 75fb1b9f25..705df340a2 100644
--- a/packages/apps/fortune/recording-oracle/ENV.md
+++ b/packages/apps/fortune/recording-oracle/ENV.md
@@ -15,9 +15,6 @@ RPC_URL_BSC_MAINNET=
 ### The RPC URL for the BSC Testnet network.
 RPC_URL_BSC_TESTNET=
 
-### The RPC URL for the Moonbeam network.
-RPC_URL_MOONBEAM=
-
 ### The RPC URL for the Localhost network.
 RPC_URL_LOCALHOST=
 
diff --git a/packages/apps/fortune/recording-oracle/src/common/config/network-config.service.ts b/packages/apps/fortune/recording-oracle/src/common/config/network-config.service.ts
index a01fa50076..a2571f7619 100644
--- a/packages/apps/fortune/recording-oracle/src/common/config/network-config.service.ts
+++ b/packages/apps/fortune/recording-oracle/src/common/config/network-config.service.ts
@@ -62,15 +62,6 @@ export class NetworkConfigService {
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_TESTNET'),
         },
       }),
-      ...(this.configService.get<string>('RPC_URL_MOONBEAM') && {
-        moonbeam: {
-          chainId: ChainId.MOONBEAM,
-          /**
-           * The RPC URL for the Moonbeam network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_MOONBEAM'),
-        },
-      }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
           chainId: ChainId.LOCALHOST,
diff --git a/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.spec.ts
index a018cb8c2a..8e012a1f44 100644
--- a/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -200,4 +200,38 @@ describe('TransformEnumInterceptor', () => {
     });
     expect(callHandler.handle).toHaveBeenCalled();
   });
+
+  it('should return bodyOrQuery if instance is not an object', () => {
+    // Test with `null` as the instance
+    let result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      null,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with `undefined` as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      undefined,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (string) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      'some string',
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (number) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      123,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  });
 });
diff --git a/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.ts b/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.ts
index 885611824a..020899bc21 100644
--- a/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.ts
+++ b/packages/apps/fortune/recording-oracle/src/common/interceptors/transform-enum.interceptor.ts
@@ -83,6 +83,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
     instance: any,
     targetClass: ClassConstructor<any>,
   ): any {
+    if (!instance || typeof instance !== 'object') {
+      return bodyOrQuery;
+    }
+
     for (const property in bodyOrQuery) {
       if (Object.prototype.hasOwnProperty.call(bodyOrQuery, property)) {
         const instanceValue = instance[property];
diff --git a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts
index 65e1111dd4..be72180122 100644
--- a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts
+++ b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.spec.ts
@@ -6,11 +6,7 @@ import { HttpService } from '@nestjs/axios';
 import { ConfigService } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
 import { of } from 'rxjs';
-import {
-  MOCK_FILE_URL,
-  MOCK_SIGNATURE,
-  mockConfig,
-} from '../../../test/constants';
+import { MOCK_FILE_URL, mockConfig } from '../../../test/constants';
 import { EventType } from '../../common/enums/webhook';
 import { verifySignature } from '../../common/utils/signature';
 import { JobService } from '../job/job.service';
@@ -100,7 +96,7 @@ describe('webhookController', () => {
 
       (verifySignature as jest.Mock).mockReturnValue(true);
 
-      await webhookController.processWebhook(webhook, MOCK_SIGNATURE);
+      await webhookController.processWebhook(webhook);
 
       expect(webhookService.handleWebhook).toHaveBeenCalledWith(webhook);
     });
@@ -121,7 +117,7 @@ describe('webhookController', () => {
 
       jest.spyOn(webhookService, 'handleWebhook').mockResolvedValue();
 
-      await webhookController.processWebhook(webhook, MOCK_SIGNATURE);
+      await webhookController.processWebhook(webhook);
 
       expect(webhookService.handleWebhook).toHaveBeenCalledWith(webhook);
     });
@@ -136,9 +132,9 @@ describe('webhookController', () => {
 
       (verifySignature as jest.Mock).mockReturnValue(true);
 
-      await expect(
-        webhookController.processWebhook(webhook, MOCK_SIGNATURE),
-      ).rejects.toThrow('Invalid webhook event type: job_completed');
+      await expect(webhookController.processWebhook(webhook)).rejects.toThrow(
+        'Invalid webhook event type: job_completed',
+      );
 
       expect(webhookService.handleWebhook).toHaveBeenCalledWith(webhook);
     });
diff --git a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.ts b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.ts
index 1c664189f0..d3d99abc7b 100644
--- a/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.ts
+++ b/packages/apps/fortune/recording-oracle/src/modules/webhook/webhook.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Headers, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 import {
   ApiBody,
   ApiHeader,
@@ -50,10 +50,7 @@ export class WebhookController {
     new SignatureAuthGuard([Role.Exchange, Role.Reputation, Role.JobLauncher]),
   )
   @Post()
-  processWebhook(
-    @Body() body: WebhookDto,
-    @Headers(HEADER_SIGNATURE_KEY) _: string,
-  ): Promise<any> {
+  processWebhook(@Body() body: WebhookDto): Promise<any> {
     return this.webhookService.handleWebhook(body);
   }
 }
diff --git a/packages/apps/human-app/frontend/.env.example b/packages/apps/human-app/frontend/.env.example
index 9239e2bbad..2035eeae60 100644
--- a/packages/apps/human-app/frontend/.env.example
+++ b/packages/apps/human-app/frontend/.env.example
@@ -10,8 +10,6 @@ VITE_HUMAN_PROTOCOL_HELP_URL= #string
 VITE_HUMAN_SUPPORT_EMAIL= #string
 # link to human web page
 VITE_HUMAN_PROTOCOL_URL= #string
-# link to "Learn more" in wallet connect modal
-VITE_WALLET_CONNECT_MODAL_LINK= #string
 # link to human web page in main page navbar
 VITE_NAVBAR__LINK__PROTOCOL_URL= #string
 # link to human web page section in main page navbar
diff --git a/packages/apps/human-app/frontend/Dockerfile b/packages/apps/human-app/frontend/Dockerfile
new file mode 100644
index 0000000000..8473ebefe0
--- /dev/null
+++ b/packages/apps/human-app/frontend/Dockerfile
@@ -0,0 +1,28 @@
+# Using bullseye instead of slim because it needs Python and build tools for node-gyp
+FROM node:18-bullseye
+ARG APP_PATH=packages/apps/human-app/frontend
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Copy expected yarn dist
+COPY .yarn ./.yarn
+COPY .yarnrc ./
+# Copy files for deps installation
+COPY package.json yarn.lock ./
+COPY ${APP_PATH}/package.json ./${APP_PATH}/package.json
+# Some deps are referenced as "*", so we need to build them
+COPY tsconfig.json ./
+COPY packages/core ./packages/core
+COPY packages/sdk ./packages/sdk
+
+RUN yarn install
+
+# Copy everything else to ensure proper build process
+COPY . .
+
+WORKDIR ./${APP_PATH}
+RUN yarn build
+
+# Start the server using the build
+CMD [ "yarn", "start:prod" ]
\ No newline at end of file
diff --git a/packages/apps/human-app/frontend/package.json b/packages/apps/human-app/frontend/package.json
index d7ad7ecabe..5a0e437ffb 100644
--- a/packages/apps/human-app/frontend/package.json
+++ b/packages/apps/human-app/frontend/package.json
@@ -23,6 +23,7 @@
     "@human-protocol/sdk": "*",
     "@mui/icons-material": "^6.2.0",
     "@mui/material": "^5.16.7",
+    "@mui/x-date-pickers": "^7.23.6",
     "@reown/appkit": "1.3.2",
     "@reown/appkit-adapter-wagmi": "1.3.2",
     "@synaps-io/verify-sdk": "^4.0.45",
@@ -32,7 +33,7 @@
     "i18next": "^23.8.2",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
-    "material-react-table": "^3.0.1",
+    "material-react-table": "3.0.1",
     "mui-image": "^1.0.7",
     "notistack": "^3.0.1",
     "query-string": "^9.0.0",
@@ -41,8 +42,9 @@
     "react-hook-form": "^7.53.2",
     "react-i18next": "^15.1.0",
     "react-imask": "^7.4.0",
-    "react-number-format": "^5.3.4",
+    "react-number-format": "^5.4.3",
     "react-router-dom": "^6.22.0",
+    "serve": "^14.2.4",
     "viem": "^2.21.44",
     "vite-plugin-svgr": "^4.2.0",
     "wagmi": "2.14.6",
diff --git a/packages/apps/human-app/frontend/src/main.tsx b/packages/apps/human-app/frontend/src/main.tsx
index 5a45f59c3c..855bc34e58 100644
--- a/packages/apps/human-app/frontend/src/main.tsx
+++ b/packages/apps/human-app/frontend/src/main.tsx
@@ -16,7 +16,7 @@ import '@fontsource/inter/800.css';
 import { WalletConnectProvider } from '@/shared/contexts/wallet-connect';
 import { Web3AuthProvider } from '@/modules/auth-web3/context/web3-auth-context';
 import { JWTExpirationCheck } from '@/shared/contexts/jwt-expiration-check';
-import { ColorModeProvider } from '@/shared/contexts/color-mode-context';
+import { ColorModeProvider } from '@/shared/contexts/color-mode';
 import { HomePageStateProvider } from '@/shared/contexts/homepage-state';
 import { RegisteredOraclesProvider } from '@/shared/contexts/registered-oracles';
 import { NotificationProvider } from '@/shared/providers/notifications-provider';
diff --git a/packages/apps/human-app/frontend/src/modules/auth-web3/components/wallet-connect-modal.tsx b/packages/apps/human-app/frontend/src/modules/auth-web3/components/wallet-connect-modal.tsx
index 89ac0c446e..d213b84901 100644
--- a/packages/apps/human-app/frontend/src/modules/auth-web3/components/wallet-connect-modal.tsx
+++ b/packages/apps/human-app/frontend/src/modules/auth-web3/components/wallet-connect-modal.tsx
@@ -1,13 +1,11 @@
 import { t } from 'i18next';
 import { Grid, Typography } from '@mui/material';
 import { Trans } from 'react-i18next';
-import { Link } from 'react-router-dom';
 import { useEffect } from 'react';
 import { Button } from '@/shared/components/ui/button';
 import { ConnectWalletBtn } from '@/shared/components/ui/connect-wallet-btn';
 import { useModalStore } from '@/shared/components/ui/modal/modal.store';
-import { env } from '@/shared/env';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 
 export function WalletConnectModal() {
   const { closeModal } = useModalStore();
@@ -46,21 +44,7 @@ export function WalletConnectModal() {
           }}
         >
           <Typography variant="body1">
-            <Trans
-              components={{
-                1: (
-                  <Link
-                    rel="noreferrer"
-                    style={{
-                      color: 'inherit',
-                    }}
-                    target="_blank"
-                    to={env.VITE_WALLET_CONNECT_MODAL_LINK}
-                  />
-                ),
-              }}
-              i18nKey="walletConnectModal.paragraph"
-            />
+            <Trans i18nKey="walletConnectModal.paragraph" />
           </Typography>
           <ConnectWalletBtn fullWidth>
             {t('walletConnectModal.connectBtn')}
diff --git a/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-web3-auth.tsx b/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-web3-auth.tsx
index f083554017..bc8d8cfb76 100644
--- a/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-web3-auth.tsx
+++ b/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-web3-auth.tsx
@@ -2,7 +2,7 @@ import { useLocation, Navigate } from 'react-router-dom';
 import { createContext } from 'react';
 import { routerPaths } from '@/router/router-paths';
 import type { Web3AuthenticatedUserContextType } from '@/modules/auth-web3/context/web3-auth-context';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import { PageCardLoader } from '@/shared/components/ui/page-card';
 import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
 
 export const Web3AuthenticatedUserContext =
diff --git a/packages/apps/human-app/frontend/src/modules/auth/providers/require-auth.tsx b/packages/apps/human-app/frontend/src/modules/auth/providers/require-auth.tsx
index decf428974..d47ac1b61e 100644
--- a/packages/apps/human-app/frontend/src/modules/auth/providers/require-auth.tsx
+++ b/packages/apps/human-app/frontend/src/modules/auth/providers/require-auth.tsx
@@ -3,7 +3,7 @@ import { createContext } from 'react';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
 import { routerPaths } from '@/router/router-paths';
 import type { AuthenticatedUserContextType } from '@/modules/auth/context/auth-context';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import { PageCardLoader } from '@/shared/components/ui/page-card';
 
 export const AuthenticatedUserContext =
   createContext<AuthenticatedUserContextType | null>(null);
diff --git a/packages/apps/human-app/frontend/src/modules/homepage/components/choose-sign-up-account-type.tsx b/packages/apps/human-app/frontend/src/modules/homepage/components/choose-sign-up-account-type.tsx
index 79a4ae364c..c694ab548e 100644
--- a/packages/apps/human-app/frontend/src/modules/homepage/components/choose-sign-up-account-type.tsx
+++ b/packages/apps/human-app/frontend/src/modules/homepage/components/choose-sign-up-account-type.tsx
@@ -6,9 +6,9 @@ import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { routerPaths } from '@/router/router-paths';
 import { PageCard } from '@/shared/components/ui/page-card';
 import type { HomePageStageType } from '@/modules/homepage/views/home.page';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
-import { useHomePageState } from '@/shared/contexts/homepage-state';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
+import { useHomePageState } from '@/shared/contexts/homepage-state';
 
 interface ChooseSignUpAccountType {
   setStage: (step: HomePageStageType) => void;
@@ -27,10 +27,10 @@ export function ChooseSignUpAccountType() {
 
   return (
     <PageCard
-      backArrowPath={backToWelcomeStage}
-      cancelRouterPathOrCallback={backToWelcomeStage}
+      backNavigation={backToWelcomeStage}
+      cancelNavigation={backToWelcomeStage}
       childrenMaxWidth="876px"
-      hiddenCancelButton={!isMobileMd}
+      showCancelButton={isMobileMd}
       maxContentWidth="748px"
       title={<Typography variant="h4">{t('homepage.welcome')} 👋</Typography>}
     >
diff --git a/packages/apps/human-app/frontend/src/modules/homepage/components/home-container.tsx b/packages/apps/human-app/frontend/src/modules/homepage/components/home-container.tsx
index 7921f64edd..8450f2b27a 100644
--- a/packages/apps/human-app/frontend/src/modules/homepage/components/home-container.tsx
+++ b/packages/apps/human-app/frontend/src/modules/homepage/components/home-container.tsx
@@ -1,13 +1,13 @@
 import { Container } from '@mui/material';
 import { useEffect } from 'react';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
+import { useBackgroundContext } from '@/shared/contexts/background';
 import { useHomePageState } from '@/shared/contexts/homepage-state';
 import { Welcome } from './welcome';
 import { ChooseSignUpAccountType } from './choose-sign-up-account-type';
 
 export function HomeContainer() {
   const { pageView } = useHomePageState();
-  const { setWhiteBackground, setGrayBackground } = useBackgroundColorStore();
+  const { setWhiteBackground, setGrayBackground } = useBackgroundContext();
 
   useEffect(() => {
     if (pageView === 'chooseSignUpAccountType') {
diff --git a/packages/apps/human-app/frontend/src/modules/homepage/components/welcome.tsx b/packages/apps/human-app/frontend/src/modules/homepage/components/welcome.tsx
index e1294de4bb..5c844d81f0 100644
--- a/packages/apps/human-app/frontend/src/modules/homepage/components/welcome.tsx
+++ b/packages/apps/human-app/frontend/src/modules/homepage/components/welcome.tsx
@@ -11,13 +11,13 @@ import { Button } from '@/shared/components/ui/button';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { OperatorSignIn } from '@/modules/homepage/hooks/use-operator-signin';
 import { WorkerSignIn } from '@/modules/homepage/components/worker-signin';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useHomePageState } from '@/shared/contexts/homepage-state';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
+import { useBackgroundContext } from '@/shared/contexts/background';
 
 export function Welcome() {
   const { colorPalette, isDarkMode } = useColorMode();
-  const { setWhiteBackground } = useBackgroundColorStore();
+  const { setWhiteBackground } = useBackgroundContext();
   const { setPageView } = useHomePageState();
   const { t } = useTranslation();
   const logoText: string = t('homepage.humanApp');
diff --git a/packages/apps/human-app/frontend/src/modules/homepage/hooks/use-operator-signin.tsx b/packages/apps/human-app/frontend/src/modules/homepage/hooks/use-operator-signin.tsx
index 18a571327a..4486365bbd 100644
--- a/packages/apps/human-app/frontend/src/modules/homepage/hooks/use-operator-signin.tsx
+++ b/packages/apps/human-app/frontend/src/modules/homepage/hooks/use-operator-signin.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef } from 'react';
 import { Link } from 'react-router-dom';
 import Snackbar from '@mui/material/Snackbar';
 import { Button } from '@/shared/components/ui/button';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import { useWeb3SignIn } from '@/modules/operator/hooks/use-web3-signin';
 import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
 import { routerPaths } from '@/router/router-paths';
diff --git a/packages/apps/human-app/frontend/src/modules/homepage/views/home.page.tsx b/packages/apps/human-app/frontend/src/modules/homepage/views/home.page.tsx
index a3a69c973a..83821bd2ab 100644
--- a/packages/apps/human-app/frontend/src/modules/homepage/views/home.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/homepage/views/home.page.tsx
@@ -7,9 +7,9 @@ import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
 import { routerPaths } from '@/router/router-paths';
 import { Button } from '@/shared/components/ui/button';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
-import { useHomePageState } from '@/shared/contexts/homepage-state';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { HomeContainer } from '@/modules/homepage/components/home-container';
+import { useHomePageState } from '@/shared/contexts/homepage-state';
 
 export type HomePageStageType = 'welcome' | 'chooseSignUpAccountType';
 
diff --git a/packages/apps/human-app/frontend/src/modules/operator/components/profile/profile-disable-button.tsx b/packages/apps/human-app/frontend/src/modules/operator/components/profile/profile-disable-button.tsx
index e113b27c67..e8b89fcc4f 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/components/profile/profile-disable-button.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/components/profile/profile-disable-button.tsx
@@ -1,7 +1,7 @@
 import { t } from 'i18next';
 import { Typography } from '@mui/material';
 import { useDisableWeb3Operator } from '@/modules/operator/hooks/use-disable-operator';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { Button } from '@/shared/components/ui/button';
 import type { SignatureData } from '@/api/hooks/use-prepare-signature';
 import {
diff --git a/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/edit-existing-keys-form.tsx b/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/edit-existing-keys-form.tsx
index d70a64ef25..654bccfed8 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/edit-existing-keys-form.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/edit-existing-keys-form.tsx
@@ -13,7 +13,7 @@ import { Select } from '@/shared/components/data-entry/select';
 import { MultiSelect } from '@/shared/components/data-entry/multi-select';
 import { JOB_TYPES } from '@/shared/consts';
 import type { GetEthKVStoreValuesSuccessResponse } from '@/modules/operator/hooks/use-get-keys';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import {
   order,
   sortFormKeys,
diff --git a/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/existing-keys.tsx b/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/existing-keys.tsx
index 8eb715e501..d617ab6d0a 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/existing-keys.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/components/sign-up/add-keys/existing-keys.tsx
@@ -15,7 +15,7 @@ import {
   order,
   sortFormKeys,
 } from '@/modules/operator/components/sign-up/add-keys/sort-form';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 const existingKeysConfig: Record<
   EthKVStoreKeyValues,
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake-mutation-state.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake-mutation-state.ts
index ec007fc25d..0a18642b74 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake-mutation-state.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake-mutation-state.ts
@@ -1,7 +1,7 @@
 import last from 'lodash/last';
 import { useMutationState } from '@tanstack/react-query';
 import type { MutationState } from '@tanstack/react-query';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import type { ResponseError } from '@/shared/types/global.type';
 import { type AddStakeCallArguments } from '@/modules/operator/hooks/use-add-stake';
 
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake.ts
index 703e477371..675b9b8850 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-add-stake.ts
@@ -4,7 +4,7 @@ import { t } from 'i18next';
 import { useNavigate } from 'react-router-dom';
 import { ethers } from 'ethers';
 import { stakingStake } from '@/modules/smart-contracts/Staking/staking-stake';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
 import { hmTokenApprove } from '@/modules/smart-contracts/HMToken/hm-token-approve';
 import type { ContractCallArguments } from '@/modules/smart-contracts/types';
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-disable-operator.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-disable-operator.ts
index 421c9aa88e..a316284888 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-disable-operator.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-disable-operator.ts
@@ -1,7 +1,7 @@
 import { useMutation } from '@tanstack/react-query';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { useAccessTokenRefresh } from '@/api/hooks/use-access-token-refresh';
 import { useWeb3AuthenticatedUser } from '@/modules/auth-web3/hooks/use-web3-authenticated-user';
 
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-edit-existing-keys.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-edit-existing-keys.ts
index ce22aeab45..53b789008b 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-edit-existing-keys.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-edit-existing-keys.ts
@@ -9,7 +9,7 @@ import type { JsonRpcSigner } from 'ethers';
 import { z, ZodError } from 'zod';
 import { t } from 'i18next';
 import { routerPaths } from '@/router/router-paths';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import {
   EthKVStoreKeys,
   JobType,
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-keys.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-keys.ts
index 47eab661c0..166c232129 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-keys.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-keys.ts
@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { z } from 'zod';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { ethKVStoreGetKeys } from '@/modules/smart-contracts/EthKVStore/eth-kv-store-get-keys';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
 import { EthKVStoreKeys } from '@/modules/smart-contracts/EthKVStore/config';
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-stacked-amount.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-stacked-amount.ts
index 2d7aa5fa73..1b927f7850 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-stacked-amount.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-get-stacked-amount.ts
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 import { ethers } from 'ethers';
 import { t } from 'i18next';
 import { stakingGetStakedTokens } from '@/modules/smart-contracts/Staking/staking-get-staked-tokens';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
 
 export const stakedAmountFormatter = (amount: bigint) => {
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-human-token-decimals.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-human-token-decimals.ts
index 21d3560603..07a3e00a2c 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-human-token-decimals.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-human-token-decimals.ts
@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { hmTokenDecimals } from '@/modules/smart-contracts/HMToken/hm-token-decimals';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
 
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signin.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signin.ts
index 40c55669d2..8641645e07 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signin.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signin.ts
@@ -2,12 +2,11 @@
 import { useMutation } from '@tanstack/react-query';
 import { z } from 'zod';
 import { useNavigate } from 'react-router-dom';
-import { t } from 'i18next';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
 import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
 import { routerPaths } from '@/router/router-paths';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import type { PrepareSignatureBody } from '@/api/hooks/use-prepare-signature';
 import { prepareSignature } from '@/api/hooks/use-prepare-signature';
 
@@ -27,9 +26,7 @@ export function useWeb3SignIn() {
   return useMutation({
     mutationFn: async (body: PrepareSignatureBody) => {
       const dataToSign = await prepareSignature(body);
-      if (!signMessage) {
-        throw new Error(t('errors.unknown'));
-      }
+
       const signature = await signMessage(JSON.stringify(dataToSign));
 
       return apiClient(apiPaths.operator.web3Auth.signIn.path, {
diff --git a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signup.ts b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signup.ts
index a24c5e610e..bae23c38dd 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signup.ts
+++ b/packages/apps/human-app/frontend/src/modules/operator/hooks/use-web3-signup.ts
@@ -2,7 +2,7 @@
 import { useMutation } from '@tanstack/react-query';
 import { z } from 'zod';
 import { useNavigate } from 'react-router-dom';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
 import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/profile/profile.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/profile/profile.page.tsx
index ba8438ded1..c128bd16dc 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/profile/profile.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/profile/profile.page.tsx
@@ -4,15 +4,17 @@ import { useTranslation } from 'react-i18next';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { useGetKeys } from '@/modules/operator/hooks/use-get-keys';
 import { useWeb3AuthenticatedUser } from '@/modules/auth-web3/hooks/use-web3-authenticated-user';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import {
+  PageCardError,
+  PageCardLoader,
+} from '@/shared/components/ui/page-card';
 import { getErrorMessageForError } from '@/shared/errors';
 import { ProfileDisableButton } from '@/modules/operator/components/profile/profile-disable-button';
 import { ProfileListItem } from '@/shared/components/ui/profile-list-item';
 import { useGetOperatorStats } from '@/modules/operator/hooks/use-get-stats';
 import { ProfileEnableButton } from '@/modules/operator/components/profile/profile-enable-button';
 import { CheckmarkIcon, LockerIcon } from '@/shared/components/ui/icons';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function OperatorProfilePage() {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-keys.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-keys.page.tsx
index ff9d65dbb1..ad3c82ef2a 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-keys.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-keys.page.tsx
@@ -2,9 +2,11 @@ import { Grid } from '@mui/material';
 import type { UseFormReturn } from 'react-hook-form';
 import { t } from 'i18next';
 import { Link } from 'react-router-dom';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
-import { PageCard } from '@/shared/components/ui/page-card';
+import {
+  PageCardError,
+  PageCardLoader,
+  PageCard,
+} from '@/shared/components/ui/page-card';
 import { getErrorMessageForError, jsonRpcErrorHandler } from '@/shared/errors';
 import type { EditEthKVStoreValuesMutationData } from '@/modules/operator/hooks/use-edit-existing-keys';
 import { useEditExistingKeysMutationState } from '@/modules/operator/hooks/use-edit-existing-keys';
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-stake.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-stake.page.tsx
index 9b1f186c52..76fc5e9fc7 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-stake.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/add-stake.page.tsx
@@ -2,9 +2,11 @@ import Grid from '@mui/material/Grid';
 import { Typography } from '@mui/material';
 import { useState } from 'react';
 import { t } from 'i18next';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
-import { PageCard } from '@/shared/components/ui/page-card';
+import {
+  PageCardError,
+  PageCardLoader,
+  PageCard,
+} from '@/shared/components/ui/page-card';
 import { getErrorMessageForError } from '@/shared/errors';
 import { Buttons } from '@/modules/operator/components/sign-up/add-stake/buttons';
 import { StakeForm } from '@/modules/operator/components/sign-up/add-stake/stake-form';
@@ -15,7 +17,7 @@ import {
 } from '@/modules/operator/hooks/use-get-stacked-amount';
 import { useAddStakeMutationState } from '@/modules/operator/hooks/use-add-stake-mutation-state';
 import { useHMTokenDecimals } from '@/modules/operator/hooks/use-human-token-decimals';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 
 export function AddStakeOperatorPage() {
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/connect-wallet.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/connect-wallet.page.tsx
index e75fee6d81..08787c134d 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/connect-wallet.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/connect-wallet.page.tsx
@@ -2,7 +2,7 @@ import { Grid, Typography } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { Navigate } from 'react-router-dom';
 import { PageCard } from '@/shared/components/ui/page-card';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { Button } from '@/shared/components/ui/button';
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/edit-existing-keys-success.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/edit-existing-keys-success.page.tsx
index 9d3f5843fc..a541510587 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/edit-existing-keys-success.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/edit-existing-keys-success.page.tsx
@@ -1,8 +1,10 @@
 import { t } from 'i18next';
 import { Grid, Typography } from '@mui/material';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
-import { PageCard } from '@/shared/components/ui/page-card';
+import {
+  PageCardError,
+  PageCardLoader,
+  PageCard,
+} from '@/shared/components/ui/page-card';
 import { Button } from '@/shared/components/ui/button';
 import { getErrorMessageForError } from '@/shared/errors';
 import { useWeb3SignUp } from '@/modules/operator/hooks/use-web3-signup';
@@ -12,7 +14,7 @@ import {
   usePrepareSignature,
 } from '@/api/hooks/use-prepare-signature';
 import { Alert } from '@/shared/components/ui/alert';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 
 export function EditExistingKeysSuccessPage() {
   const { address, signMessage } = useConnectedWallet();
@@ -59,8 +61,8 @@ export function EditExistingKeysSuccessPage() {
           </Alert>
         ) : undefined
       }
-      hiddenArrowButton
-      hiddenCancelButton
+      showBackButton={false}
+      showCancelButton={false}
       title={t('operator.editExistingKeysSuccess.title')}
     >
       <Grid container gap="2rem">
diff --git a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/set-up-operator.page.tsx b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/set-up-operator.page.tsx
index 920b50bf3a..5c0386bf4e 100644
--- a/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/set-up-operator.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/operator/views/sign-up/set-up-operator.page.tsx
@@ -5,7 +5,7 @@ import { PageCard } from '@/shared/components/ui/page-card';
 import { Alert } from '@/shared/components/ui/alert';
 import { Button } from '@/shared/components/ui/button';
 import { routerPaths } from '@/router/router-paths';
-import { useConnectedWallet } from '@/modules/auth-web3/hooks/use-connected-wallet';
+import { useConnectedWallet } from '@/shared/contexts/wallet-connect';
 
 export function SetUpOperatorPage() {
   const { t } = useTranslation();
diff --git a/packages/apps/human-app/frontend/src/modules/playground/components/table-example/table-search-form.tsx b/packages/apps/human-app/frontend/src/modules/playground/components/table-example/table-search-form.tsx
index 551216976b..454fc88446 100644
--- a/packages/apps/human-app/frontend/src/modules/playground/components/table-example/table-search-form.tsx
+++ b/packages/apps/human-app/frontend/src/modules/playground/components/table-example/table-search-form.tsx
@@ -2,7 +2,7 @@ import Search from '@mui/icons-material/Search';
 import InputAdornment from '@mui/material/InputAdornment';
 import { FormProvider, useForm } from 'react-hook-form';
 import { Input } from '@/shared/components/data-entry/input';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface SearchFormProps {
   label: string;
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/index.ts b/packages/apps/human-app/frontend/src/modules/signin/worker/index.ts
new file mode 100644
index 0000000000..b76ee6a475
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signin/worker/index.ts
@@ -0,0 +1 @@
+export * from './sign-in.page';
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in-form.tsx b/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in-form.tsx
new file mode 100644
index 0000000000..f6336f2f1a
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in-form.tsx
@@ -0,0 +1,87 @@
+/* eslint-disable camelcase -- ...*/
+import { FormProvider, useForm } from 'react-hook-form';
+import { Box, Grid, Typography } from '@mui/material';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+import { Input } from '@/shared/components/data-entry/input';
+import { Button } from '@/shared/components/ui/button';
+import { Password } from '@/shared/components/data-entry/password/password';
+import { routerPaths } from '@/router/router-paths';
+import { type SignInDto } from '@/modules/worker/services/sign-in/types';
+import { signInDtoSchema } from '@/modules/worker/services/sign-in/schema';
+import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
+
+interface SignInFormProps {
+  onSubmit: (data: SignInDto) => void;
+  error?: unknown;
+  isLoading?: boolean;
+  resetMutation: () => void;
+}
+
+export function SignInForm({
+  onSubmit,
+  error,
+  isLoading,
+  resetMutation,
+}: Readonly<SignInFormProps>) {
+  const { t } = useTranslation();
+
+  const methods = useForm<SignInDto>({
+    defaultValues: {
+      email: '',
+      password: '',
+      h_captcha_token: '',
+    },
+    resolver: zodResolver(signInDtoSchema),
+  });
+
+  useResetMutationErrors(methods.watch, resetMutation);
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    void methods.handleSubmit(onSubmit)(event);
+  };
+
+  return (
+    <FormProvider {...methods}>
+      <form onSubmit={handleSubmit}>
+        <Grid container gap="1.5rem">
+          <Input
+            fullWidth
+            label={t('worker.signInForm.fields.email')}
+            name="email"
+          />
+          <Password
+            fullWidth
+            label={t('worker.signInForm.fields.password')}
+            name="password"
+          />
+          <Box width="100%">
+            <Typography variant="body1">
+              <Link
+                style={{
+                  textDecoration: 'none',
+                  fontWeight: 600,
+                  color: 'inherit',
+                }}
+                to={routerPaths.worker.sendResetLink}
+              >
+                {t('worker.signInForm.forgotPassword')}
+              </Link>
+            </Typography>
+          </Box>
+          <HCaptchaForm error={error} name="h_captcha_token" />
+          <Button
+            fullWidth
+            loading={isLoading}
+            type="submit"
+            variant="contained"
+          >
+            {t('worker.signInForm.submitBtn')}
+          </Button>
+        </Grid>
+      </form>
+    </FormProvider>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in.page.tsx b/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in.page.tsx
new file mode 100644
index 0000000000..c650c09fb7
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in.page.tsx
@@ -0,0 +1,39 @@
+import { t } from 'i18next';
+import { PageCard } from '@/shared/components/ui/page-card';
+import { Alert } from '@/shared/components/ui/alert';
+import { getErrorMessageForError } from '@/shared/errors';
+import { FetchError } from '@/api/fetcher';
+import { useSignIn } from './use-sign-in';
+import { SignInForm } from './sign-in-form';
+
+function formattedSignInErrorMessage(
+  unknownError: unknown
+): string | undefined {
+  if (unknownError instanceof FetchError && unknownError.status === 400) {
+    return t('worker.signInForm.errors.invalidCredentials');
+  }
+}
+
+export function SignInWorkerPage() {
+  const { signIn, error, isError, isLoading, reset } = useSignIn();
+
+  return (
+    <PageCard
+      title={t('worker.signInForm.title')}
+      alert={
+        isError ? (
+          <Alert color="error" severity="error" sx={{ width: '100%' }}>
+            {getErrorMessageForError(error, formattedSignInErrorMessage)}
+          </Alert>
+        ) : undefined
+      }
+    >
+      <SignInForm
+        onSubmit={signIn}
+        error={error}
+        isLoading={isLoading}
+        resetMutation={reset}
+      />
+    </PageCard>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in.tsx b/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in.tsx
new file mode 100644
index 0000000000..29121d5791
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in.tsx
@@ -0,0 +1,30 @@
+import { useEffect } from 'react';
+import { useSignInMutation } from '@/modules/worker/services/sign-in/sign-in';
+import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
+import { type SignInDto } from '@/modules/worker/services/sign-in/types';
+
+export function useSignIn() {
+  const {
+    mutate: signInWorkerMutate,
+    error: signInWorkerError,
+    isError: isSignInWorkerError,
+    isPending: isSignInWorkerPending,
+    reset: signInWorkerMutationReset,
+  } = useSignInMutation();
+
+  useEffect(() => {
+    browserAuthProvider.signOut({ triggerSignOutSubscriptions: false });
+  }, []);
+
+  const handleWorkerSignIn = (data: SignInDto) => {
+    signInWorkerMutate(data);
+  };
+
+  return {
+    signIn: handleWorkerSignIn,
+    error: signInWorkerError,
+    isError: isSignInWorkerError,
+    isLoading: isSignInWorkerPending,
+    reset: signInWorkerMutationReset,
+  };
+}
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-worker.tsx b/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-worker.tsx
new file mode 100644
index 0000000000..6dc975e461
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-worker.tsx
@@ -0,0 +1,31 @@
+import { useEffect } from 'react';
+import omit from 'lodash/omit';
+import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
+import type { SignUpDto } from '@/modules/worker/services/sign-up';
+import { useSignUpMutation } from '@/modules/worker/services/sign-up';
+
+export function useSignUpWorker() {
+  const {
+    mutate: signUpWorkerMutate,
+    error: signUpWorkerError,
+    isError: isSignUpWorkerError,
+    isPending: isSignUpWorkerPending,
+    reset: signUpWorkerMutationReset,
+  } = useSignUpMutation();
+
+  useEffect(() => {
+    browserAuthProvider.signOut({ triggerSignOutSubscriptions: false });
+  }, []);
+
+  const handleWorkerSignUp = (data: SignUpDto) => {
+    signUpWorkerMutate(omit(data, ['confirmPassword']));
+  };
+
+  return {
+    signUp: handleWorkerSignUp,
+    error: signUpWorkerError,
+    isError: isSignUpWorkerError,
+    isLoading: isSignUpWorkerPending,
+    reset: signUpWorkerMutationReset,
+  };
+}
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/index.ts b/packages/apps/human-app/frontend/src/modules/signup/worker/index.ts
new file mode 100644
index 0000000000..3c0e3dddf5
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/signup/worker/index.ts
@@ -0,0 +1 @@
+export * from './views/sign-up-worker.page';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-up.page.tsx b/packages/apps/human-app/frontend/src/modules/signup/worker/views/sign-up-worker.page.tsx
similarity index 66%
rename from packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-up.page.tsx
rename to packages/apps/human-app/frontend/src/modules/signup/worker/views/sign-up-worker.page.tsx
index 33e2ff4b44..f9a9eb4c08 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-up.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/signup/worker/views/sign-up-worker.page.tsx
@@ -1,17 +1,11 @@
-import { Trans } from 'react-i18next';
 import { FormProvider, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import Grid from '@mui/material/Grid';
 import Typography from '@mui/material/Typography';
 import Link from '@mui/material/Link';
-import { t } from 'i18next';
-import omit from 'lodash/omit';
-import { useEffect } from 'react';
+import { useTranslation, Trans } from 'react-i18next';
 import type { SignUpDto } from '@/modules/worker/services/sign-up';
-import {
-  signUpDtoSchema,
-  useSignUpMutation,
-} from '@/modules/worker/services/sign-up';
+import { signUpDtoSchema } from '@/modules/worker/services/sign-up';
 import { Button } from '@/shared/components/ui/button';
 import { Input } from '@/shared/components/data-entry/input';
 import { Password } from '@/shared/components/data-entry/password/password';
@@ -19,22 +13,14 @@ import { PageCard } from '@/shared/components/ui/page-card';
 import { env } from '@/shared/env';
 import { getErrorMessageForError } from '@/shared/errors';
 import { Alert } from '@/shared/components/ui/alert';
-import { FetchError } from '@/api/fetcher';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
-import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-
-function formattedSignUpErrorMessage(unknownError: unknown) {
-  if (unknownError instanceof FetchError && unknownError.status === 409) {
-    return t('worker.signUpForm.errors.emailTaken');
-  }
-}
+import { FetchError } from '@/api/fetcher';
+import { useSignUpWorker } from '@/modules/signup/worker/hooks/use-sign-up-worker';
 
 export function SignUpWorkerPage() {
-  useEffect(() => {
-    browserAuthProvider.signOut({ triggerSignOutSubscriptions: false });
-  }, []);
-
+  const { t } = useTranslation();
+  const { signUp, error, isError, isLoading, reset } = useSignUpWorker();
   const methods = useForm<SignUpDto>({
     defaultValues: {
       email: '',
@@ -46,40 +32,31 @@ export function SignUpWorkerPage() {
     resolver: zodResolver(signUpDtoSchema),
   });
 
-  const {
-    mutate: signUpWorkerMutate,
-    error: signUpWorkerError,
-    isError: isSignUpWorkerError,
-    isPending: isSignUpWorkerPending,
-    reset: signUpWorkerMutationReset,
-  } = useSignUpMutation();
+  useResetMutationErrors(methods.watch, reset);
 
-  useResetMutationErrors(methods.watch, signUpWorkerMutationReset);
+  const handleSignupError = (unknownError: unknown) => {
+    if (unknownError instanceof FetchError && unknownError.status === 409) {
+      return t('worker.signUpForm.errors.emailTaken');
+    }
+  };
 
-  const handleWorkerSignUp = (data: SignUpDto) => {
-    signUpWorkerMutate(omit(data, ['confirmPassword']));
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    void methods.handleSubmit(signUp)(event);
   };
 
   return (
     <PageCard
       alert={
-        isSignUpWorkerError ? (
+        isError ? (
           <Alert color="error" severity="error" sx={{ width: '100%' }}>
-            {getErrorMessageForError(
-              signUpWorkerError,
-              formattedSignUpErrorMessage
-            )}
+            {getErrorMessageForError(isError, handleSignupError)}
           </Alert>
         ) : undefined
       }
       title={t('worker.signUpForm.title')}
     >
       <FormProvider {...methods}>
-        <form
-          onSubmit={(event) => {
-            void methods.handleSubmit(handleWorkerSignUp)(event);
-          }}
-        >
+        <form onSubmit={handleSubmit}>
           <Grid container gap="1.5rem">
             <Input label={t('worker.signUpForm.fields.email')} name="email" />
             <Password
@@ -113,10 +90,10 @@ export function SignUpWorkerPage() {
                 />
               </Typography>
             </Grid>
-            <FormCaptcha error={signUpWorkerError} name="h_captcha_token" />
+            <HCaptchaForm error={error} name="h_captcha_token" />
             <Button
               fullWidth
-              loading={isSignUpWorkerPending}
+              loading={isLoading}
               type="submit"
               variant="contained"
             >
diff --git a/packages/apps/human-app/frontend/src/modules/smart-contracts/chains.ts b/packages/apps/human-app/frontend/src/modules/smart-contracts/chains.ts
index 3dccd83c1e..107f8355d1 100644
--- a/packages/apps/human-app/frontend/src/modules/smart-contracts/chains.ts
+++ b/packages/apps/human-app/frontend/src/modules/smart-contracts/chains.ts
@@ -26,14 +26,7 @@ export type ChainWithAddresses = Chain & {
 export const TestnetChainsIds = [
   ChainId.POLYGON_AMOY,
   ChainId.SEPOLIA,
-  ChainId.RINKEBY,
-  ChainId.GOERLI,
   ChainId.BSC_TESTNET,
-  ChainId.POLYGON_MUMBAI,
-  ChainId.MOONBASE_ALPHA,
-  ChainId.AVALANCHE_TESTNET,
-  ChainId.CELO_ALFAJORES,
-  ChainId.XLAYER_TESTNET,
   ChainId.LOCALHOST,
 ] as const;
 
@@ -41,10 +34,6 @@ export const MainnetChainsIds = [
   ChainId.POLYGON,
   ChainId.MAINNET,
   ChainId.BSC_MAINNET,
-  ChainId.MOONBEAM,
-  ChainId.AVALANCHE,
-  ChainId.CELO,
-  ChainId.XLAYER,
   ChainId.ALL,
 ] as const;
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx
index f6aca97d8d..df817e5d34 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx
@@ -13,7 +13,7 @@ import {
   useNotification,
 } from '@/shared/hooks/use-notification';
 import { getErrorMessageForError } from '@/shared/errors';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 const accordionWidth = { width: '284px' };
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx
index 4fc84228e4..205d7ede42 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx
@@ -2,7 +2,7 @@ import { Divider, Grid, Typography } from '@mui/material';
 import { t } from 'i18next';
 import { RefreshIcon } from '@/shared/components/ui/icons';
 import type { HCaptchaUserStatsSuccess } from '@/modules/worker/services/hcaptcha-user-stats';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 
 export function UserStatsDetails({
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table-mobile.tsx
index ac26e08950..99324e5807 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table-mobile.tsx
@@ -6,7 +6,7 @@ import { Loader } from '@/shared/components/ui/loader';
 import type { OraclesDataQueryResult } from '@/modules/worker/views/jobs-discovery/jobs-discovery.page';
 import { EvmAddress } from '@/modules/worker/components/jobs/evm-address';
 import { ListItem } from '@/shared/components/ui/list-item';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import type { JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import type { Oracle } from '@/modules/worker/services/oracles';
 import { NoRecords } from '@/shared/components/ui/no-records';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table.tsx
index 216e8c8fb1..7e5ef2528d 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs-discovery/oracles-table.tsx
@@ -14,7 +14,7 @@ import { routerPaths } from '@/router/router-paths';
 import type { OraclesDataQueryResult } from '@/modules/worker/views/jobs-discovery/jobs-discovery.page';
 import { env } from '@/shared/env';
 import { useGetRegistrationInExchangeOracles } from '@/modules/worker/services/get-registration-in-exchange-oracles';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { type JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import { createTableDarkMode } from '@/shared/styles/create-table-dark-mode';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/desktop/available-jobs-table.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/desktop/available-jobs-table.tsx
index a49014f658..3c11391ce7 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/desktop/available-jobs-table.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/desktop/available-jobs-table.tsx
@@ -23,7 +23,7 @@ import { TableHeaderCell } from '@/shared/components/ui/table/table-header-cell'
 import { AvailableJobsNetworkFilter } from '@/modules/worker/components/jobs/available-jobs/desktop/available-jobs-network-filter';
 import { AvailableJobsRewardAmountSort } from '@/modules/worker/components/jobs/available-jobs/desktop/available-jobs-reward-amount-sort';
 import { AvailableJobsJobTypeFilter } from '@/modules/worker/components/jobs/available-jobs/desktop/available-jobs-job-type-filter';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { createTableDarkMode } from '@/shared/styles/create-table-dark-mode';
 import type { JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import { EscrowAddressSearchForm } from '@/modules/worker/components/jobs/escrow-address-search-form';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-drawer-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-drawer-mobile.tsx
index 3225cbe5bb..8fc33beddc 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-drawer-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-drawer-mobile.tsx
@@ -10,7 +10,7 @@ import { AvailableJobsNetworkFilterMobile } from '@/modules/worker/components/jo
 import { useHandleMainNavIconClick } from '@/shared/hooks/use-handle-main-nav-icon-click';
 import { AvailableJobsJobTypeFilterMobile } from '@/modules/worker/components/jobs/available-jobs/mobile/available-jobs-job-type-filter-mobile';
 import { AvailableJobsRewardAmountSortMobile } from '@/modules/worker/components/jobs/available-jobs/mobile/available-jobs-reward-amount-sort-mobile';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface DrawerMobileProps {
   setIsMobileFilterDrawerOpen: Dispatch<SetStateAction<boolean>>;
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-reward-amount-sort-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-reward-amount-sort-mobile.tsx
index 41a74c8e8d..ce6704f8e3 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-reward-amount-sort-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-reward-amount-sort-mobile.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import { t } from 'i18next';
 import Typography from '@mui/material/Typography';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useJobsFilterStore } from '@/modules/worker/hooks/use-jobs-filter-store';
 import { Sorting } from '@/modules/worker/components/jobs/sorting';
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-table-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-table-mobile.tsx
index 361afe7e89..f41a2b2511 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-table-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/available-jobs/mobile/available-jobs-table-mobile.tsx
@@ -15,7 +15,7 @@ import { EvmAddress } from '@/modules/worker/components/jobs/evm-address';
 import { Chip } from '@/shared/components/ui/chip';
 import { RewardAmount } from '@/modules/worker/components/jobs/reward-amount';
 import { ListItem } from '@/shared/components/ui/list-item';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import type { JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import { EscrowAddressSearchForm } from '@/modules/worker/components/jobs/escrow-address-search-form';
 import { AvailableJobsAssignJobButton } from '@/modules/worker/components/jobs/available-jobs/mobile/available-jobs-assign-job-button';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/escrow-address-search-form.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/escrow-address-search-form.tsx
index 0c02b6a14b..a1443e3ec0 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/escrow-address-search-form.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/escrow-address-search-form.tsx
@@ -6,7 +6,7 @@ import { z } from 'zod';
 import { useEffect } from 'react';
 import Grid from '@mui/material/Grid';
 import debounce from 'lodash/debounce';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { Input } from '@/shared/components/data-entry/input';
 import { addressSchemaOrEmptyString } from '@/shared/schemas';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/evm-address.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/evm-address.tsx
index 2956b14e25..1370dd854a 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/evm-address.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/evm-address.tsx
@@ -3,7 +3,7 @@ import Typography from '@mui/material/Typography';
 import { shortenEscrowAddress } from '@/shared/helpers/evm';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function EvmAddress({ address }: { address: string }) {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/desktop/my-jobs-table.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/desktop/my-jobs-table.tsx
index 16c124d5ec..9b66f0c267 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/desktop/my-jobs-table.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/desktop/my-jobs-table.tsx
@@ -25,7 +25,7 @@ import { MyJobsRewardAmountSort } from '@/modules/worker/components/jobs/my-jobs
 import { MyJobsStatusFilter } from '@/modules/worker/components/jobs/my-jobs/desktop/my-jobs-status-filter';
 import { MyJobsExpiresAtSort } from '@/modules/worker/components/jobs/my-jobs/desktop/my-jobs-expires-at-sort';
 import { MyJobsNetworkFilter } from '@/modules/worker/components/jobs/my-jobs/desktop/my-jobs-network-filter';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { createTableDarkMode } from '@/shared/styles/create-table-dark-mode';
 import type { JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import { EscrowAddressSearchForm } from '@/modules/worker/components/jobs/escrow-address-search-form';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-drawer-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-drawer-mobile.tsx
index 1dbb9c965e..9355052137 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-drawer-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-drawer-mobile.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import CloseIcon from '@mui/icons-material/Close';
 import type { Dispatch, SetStateAction } from 'react';
 import { HumanLogoIcon } from '@/shared/components/ui/icons';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { MyJobsRewardAmountSortMobile } from '@/modules/worker/components/jobs/my-jobs/mobile/my-jobs-reward-amount-sort-mobile';
 import { MyJobsExpiresAtSortMobile } from '@/modules/worker/components/jobs/my-jobs/mobile/my-jobs-expires-at-sort-mobile';
 import { useHandleMainNavIconClick } from '@/shared/hooks/use-handle-main-nav-icon-click';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-expires-at-sort-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-expires-at-sort-mobile.tsx
index 82e97beba4..4dd1281177 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-expires-at-sort-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-expires-at-sort-mobile.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import Typography from '@mui/material/Typography';
 import { t } from 'i18next';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useMyJobsFilterStore } from '@/modules/worker/hooks/use-my-jobs-filter-store';
 import { Sorting } from '@/modules/worker/components/jobs/sorting';
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-reward-amount-sort-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-reward-amount-sort-mobile.tsx
index 675c789c87..818276a65a 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-reward-amount-sort-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-reward-amount-sort-mobile.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import Typography from '@mui/material/Typography';
 import { t } from 'i18next';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useMyJobsFilterStore } from '@/modules/worker/hooks/use-my-jobs-filter-store';
 import { Sorting } from '@/modules/worker/components/jobs/sorting';
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-table-mobile.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-table-mobile.tsx
index da0ca20c95..02cb08a5e9 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-table-mobile.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/my-jobs/mobile/my-jobs-table-mobile.tsx
@@ -16,7 +16,7 @@ import { useMyJobsFilterStore } from '@/modules/worker/hooks/use-my-jobs-filter-
 import { ListItem } from '@/shared/components/ui/list-item';
 import { EvmAddress } from '@/modules/worker/components/jobs/evm-address';
 import { RewardAmount } from '@/modules/worker/components/jobs/reward-amount';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { Chip } from '@/shared/components/ui/chip';
 import type { JobType } from '@/modules/smart-contracts/EthKVStore/config';
 import { EscrowAddressSearchForm } from '@/modules/worker/components/jobs/escrow-address-search-form';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/sorting.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/sorting.tsx
index 88ff53ad28..037d5d0042 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/sorting.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/sorting.tsx
@@ -5,7 +5,7 @@ import ListItemButton from '@mui/material/ListItemButton';
 import List from '@mui/material/List';
 import { Grid } from '@mui/material';
 import { SortArrow } from '@/shared/components/ui/icons';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { Button } from '@/shared/components/ui/button';
 
 interface SortingProps {
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/status-chip.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/status-chip.tsx
index f83de025b1..5d33c3ecc0 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/jobs/status-chip.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/jobs/status-chip.tsx
@@ -3,7 +3,7 @@ import Typography from '@mui/material/Typography';
 import { type MyJob } from '@/modules/worker/services/my-jobs-data';
 import { colorPalette as lightModeColorPalette } from '@/shared/styles/color-palette';
 import { getChipStatusColor } from '@/modules/worker/utils/get-chip-status-color';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function StatusChip({ status }: { status: MyJob['status'] }) {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-actions.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-actions.tsx
index 7450b87851..8f4eee2683 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-actions.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-actions.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Navigate } from 'react-router-dom';
 import { useEffect, useRef } from 'react';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import { Button } from '@/shared/components/ui/button';
 import { routerPaths } from '@/router/router-paths';
 import { WalletConnectDone } from '@/modules/worker/components/profile/wallet-connect-done';
@@ -11,7 +11,7 @@ import { StartKycButton } from '@/modules/worker/components/profile/start-kyc-bt
 import { RegisterAddressBtn } from '@/modules/worker/components/profile/register-address-btn';
 import { DoneLabel } from '@/modules/worker/components/profile/done-label';
 import { useRegisterAddressNotifications } from '@/modules/worker/hooks/use-register-address-notifications';
-import { useRegisterAddressMutation } from '@/modules/worker/hooks/use-register-address';
+import { useRegisterAddress } from '@/modules/worker/hooks/use-register-address';
 import { ErrorLabel } from './error-label';
 
 export function ProfileActions() {
@@ -24,7 +24,7 @@ export function ProfileActions() {
   const {
     mutate: registerAddressMutation,
     isPending: isRegisterAddressMutationPending,
-  } = useRegisterAddressMutation({
+  } = useRegisterAddress({
     onError,
     onSuccess,
   });
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-data.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-data.tsx
index 4f8c73a2ab..b3222fe956 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-data.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile-data.tsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
 import { Button } from '@/shared/components/ui/button';
 import { routerPaths } from '@/router/router-paths';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 
 export function ProfileData() {
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile.page.tsx
index cd20a82001..41425547d0 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/profile/profile.page.tsx
@@ -7,7 +7,7 @@ import {
   TopNotificationType,
   useNotification,
 } from '@/shared/hooks/use-notification';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/profile/register-address-btn.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/profile/register-address-btn.tsx
index 149c3f9829..b610f0c2bc 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/profile/register-address-btn.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/profile/register-address-btn.tsx
@@ -1,11 +1,11 @@
 import { t } from 'i18next';
 import { Button } from '@/shared/components/ui/button';
-import { useRegisterAddressMutation } from '@/modules/worker/hooks/use-register-address';
+import { useRegisterAddress } from '@/modules/worker/hooks/use-register-address';
 import { useRegisterAddressNotifications } from '@/modules/worker/hooks/use-register-address-notifications';
 
 export function RegisterAddressBtn() {
   const { onSuccess, onError } = useRegisterAddressNotifications();
-  const { mutate, isPending } = useRegisterAddressMutation({
+  const { mutate, isPending } = useRegisterAddress({
     onError,
     onSuccess,
   });
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/profile/wallet-connect-done.tsx b/packages/apps/human-app/frontend/src/modules/worker/components/profile/wallet-connect-done.tsx
index eefd503459..0bf83e501e 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/profile/wallet-connect-done.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/components/profile/wallet-connect-done.tsx
@@ -6,12 +6,12 @@ import styled from '@mui/material/styles/styled';
 import { CheckmarkIcon } from '@/shared/components/ui/icons';
 import { colorPalette } from '@/shared/styles/color-palette';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import {
   darkColorPalette,
   onlyDarkModeColor,
 } from '@/shared/styles/dark-color-palette';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 
 const CustomTextField = styled(TextField)(() => ({
   '& .Mui-disabled': {
diff --git a/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address-on-chain.ts b/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address-on-chain.ts
index 9544a2b122..145994de8a 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address-on-chain.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address-on-chain.ts
@@ -5,7 +5,7 @@ import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-use
 import { ethKvStoreSetBulk } from '@/modules/smart-contracts/EthKVStore/eth-kv-store-set-bulk';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
 import type { SignedAddressSuccess } from '@/modules/worker/services/get-signed-address';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 import { checkNetwork } from '@/modules/smart-contracts/check-network';
 
 async function registerAddressInKVStore({
diff --git a/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address.ts b/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address.ts
index bcd7d4b089..aac4236781 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/hooks/use-register-address.ts
@@ -1,73 +1,101 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { z } from 'zod';
 import { t } from 'i18next';
-import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
+import { z } from 'zod';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
+import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
+import { useAccessTokenRefresh } from '@/api/hooks/use-access-token-refresh';
 import {
   PrepareSignatureType,
   prepareSignature,
 } from '@/api/hooks/use-prepare-signature';
 import type { ResponseError } from '@/shared/types/global.type';
-import { useAccessTokenRefresh } from '@/api/hooks/use-access-token-refresh';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
+
+interface RegisterAddressCallbacks {
+  onSuccess?: () => void | Promise<void>;
+  onError?: (error: ResponseError) => void | Promise<void>;
+}
+
+interface RegisterAddressParams {
+  address: string;
+  signature: string;
+}
 
 const RegisterAddressSuccessSchema = z.unknown();
 
-export const registerAddress = (address: string, signature: string) => {
+const registerAddressRequest = async (
+  params: RegisterAddressParams
+): Promise<unknown> => {
   return apiClient(apiPaths.worker.registerAddress.path, {
     authenticated: true,
     withAuthRetry: apiPaths.worker.registerAddress.withAuthRetry,
     successSchema: RegisterAddressSuccessSchema,
     options: {
       method: 'POST',
-      body: JSON.stringify({ address, signature }),
+      body: JSON.stringify(params),
     },
   });
 };
 
-export function useRegisterAddressMutation(callbacks?: {
-  onSuccess?: (() => void) | (() => Promise<void>);
-  onError?:
-    | ((error: ResponseError) => void)
-    | ((error: ResponseError) => Promise<void>);
-}) {
+function useRegisterAddressMutation(callbacks?: RegisterAddressCallbacks) {
   const queryClient = useQueryClient();
   const { user } = useAuthenticatedUser();
   const { refreshAccessTokenAsync } = useAccessTokenRefresh();
-
   const { address, signMessage } = useWalletConnect();
-  return useMutation({
-    mutationFn: async () => {
-      if (!address) {
-        throw new Error(t('errors.unknown'));
-      }
-      const dataToSign = await prepareSignature({
-        address,
-        type: PrepareSignatureType.REGISTER_ADDRESS,
-      });
-      const messageToSign = JSON.stringify(dataToSign);
-      const signature = await signMessage(messageToSign);
 
-      if (!signature) {
-        throw new Error(t('errors.unknown'));
-      }
+  const mutationFn = async () => {
+    if (!address) {
+      throw new Error(t('errors.noAddress'));
+    }
 
-      await registerAddress(address, signature);
-      await refreshAccessTokenAsync({ authType: 'web2' });
-    },
-    onSuccess: async () => {
-      if (callbacks?.onSuccess) {
-        await callbacks.onSuccess();
-      }
-      await queryClient.invalidateQueries();
-    },
-    onError: async (error) => {
-      if (callbacks?.onError) {
-        await callbacks.onError(error);
-      }
-      await queryClient.invalidateQueries();
-    },
+    const dataToSign = await prepareSignature({
+      address,
+      type: PrepareSignatureType.REGISTER_ADDRESS,
+    });
+
+    const messageToSign = JSON.stringify(dataToSign);
+    const signature = await signMessage(messageToSign);
+
+    if (!signature) {
+      throw new Error(t('errors.cannotSignMessage'));
+    }
+
+    // wallet address is part of the JWT payload
+    // so we need to refresh the token after the address is registered
+    await registerAddressRequest({ address, signature });
+    await refreshAccessTokenAsync({ authType: 'web2' });
+  };
+
+  const onSuccess = async () => {
+    if (callbacks?.onSuccess) {
+      await callbacks.onSuccess();
+    }
+    await queryClient.invalidateQueries();
+  };
+
+  const onError = async (error: ResponseError) => {
+    if (callbacks?.onError) {
+      await callbacks.onError(error);
+    }
+    await queryClient.invalidateQueries();
+  };
+
+  return useMutation({
+    mutationFn,
+    onSuccess,
+    onError,
     mutationKey: [user.wallet_address],
   });
 }
+
+export function useRegisterAddress(callbacks?: RegisterAddressCallbacks) {
+  const mutation = useRegisterAddressMutation(callbacks);
+
+  return {
+    mutate: mutation.mutate,
+    isPending: mutation.isPending,
+    error: mutation.error,
+    isSuccess: mutation.isSuccess,
+  };
+}
diff --git a/packages/apps/human-app/frontend/src/modules/worker/services/get-on-chain-registered-address.ts b/packages/apps/human-app/frontend/src/modules/worker/services/get-on-chain-registered-address.ts
index d8e8b6e61b..d4a6f25467 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/services/get-on-chain-registered-address.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/services/get-on-chain-registered-address.ts
@@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
 import { ethKVStoreGetKycData } from '@/modules/smart-contracts/EthKVStore/eth-kv-store-get-kyc-data';
 import { getContractAddress } from '@/modules/smart-contracts/get-contract-address';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 
 export interface RegisterAddressPayload {
   address: string;
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/email-verification.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/email-verification.page.tsx
index f174feabd0..6cea27564c 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/email-verification.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/email-verification.page.tsx
@@ -7,9 +7,11 @@ import { Button } from '@/shared/components/ui/button';
 import { routerPaths } from '@/router/router-paths';
 import { useVerifyEmailQuery } from '@/modules/worker/services/email-verification';
 import { SuccessLabel } from '@/shared/components/ui/success-label';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
-import { PageCard } from '@/shared/components/ui/page-card';
+import {
+  PageCardError,
+  PageCardLoader,
+  PageCard,
+} from '@/shared/components/ui/page-card';
 import { useLocationState } from '@/modules/worker/hooks/use-location-state';
 import { getErrorMessageForError } from '@/shared/errors';
 
@@ -60,8 +62,8 @@ export function EmailVerificationWorker({ token }: { token: string }) {
 
   return (
     <PageCard
-      hiddenArrowButton
-      hiddenCancelButton
+      showBackButton={false}
+      showCancelButton={false}
       title={<SuccessLabel>{t('worker.emailVerification.title')}</SuccessLabel>}
     >
       <Grid container gap="2rem">
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/verify-email.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/verify-email.page.tsx
index 426c4a9c9f..073a8a2bd2 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/verify-email.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/email-verification/verify-email.page.tsx
@@ -5,8 +5,7 @@ import { useNavigate } from 'react-router-dom';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { FormProvider, useForm } from 'react-hook-form';
-import { PageCard } from '@/shared/components/ui/page-card';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import { PageCard, PageCardLoader } from '@/shared/components/ui/page-card';
 import { useLocationState } from '@/modules/worker/hooks/use-location-state';
 import { env } from '@/shared/env';
 import type { ResendEmailVerificationDto } from '@/modules/worker/services/resend-email-verification';
@@ -17,13 +16,13 @@ import {
 } from '@/modules/worker/services/resend-email-verification';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { Button } from '@/shared/components/ui/button';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
 import { routerPaths } from '@/router/router-paths';
 import { MailTo } from '@/shared/components/ui/mail-to';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 
 export function VerifyEmailWorkerPage() {
@@ -76,7 +75,7 @@ export function VerifyEmailWorkerPage() {
           </Alert>
         ) : undefined
       }
-      cancelRouterPathOrCallback={() => {
+      cancelNavigation={() => {
         signOut();
         navigate(routerPaths.homePage);
       }}
@@ -118,7 +117,7 @@ export function VerifyEmailWorkerPage() {
             </Typography>
             {isAuthenticated ? (
               <>
-                <FormCaptcha
+                <HCaptchaForm
                   error={mutationState?.error}
                   name="h_captcha_token"
                 />
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx
index b6e81d2375..f4c7e18a7e 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx
@@ -6,7 +6,7 @@ import { Navigate } from 'react-router-dom';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { useEnableHCaptchaLabelingMutation } from '@/modules/worker/services/enable-hcaptcha-labeling';
 import { Button } from '@/shared/components/ui/button';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
+import { PageCardError } from '@/shared/components/ui/page-card';
 import { getErrorMessageForError } from '@/shared/errors';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx
index aa19fba21c..495b7cbfda 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx
@@ -9,15 +9,17 @@ import { env } from '@/shared/env';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { Counter } from '@/shared/components/ui/counter';
 import { useHCaptchaUserStats } from '@/modules/worker/services/hcaptcha-user-stats';
-import { PageCardError } from '@/shared/components/ui/page-card-error';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import {
+  PageCardError,
+  PageCardLoader,
+} from '@/shared/components/ui/page-card';
 import { getErrorMessageForError } from '@/shared/errors';
 import { useDailyHmtSpent } from '@/modules/worker/services/daily-hmt-spent';
 import { getTomorrowDate } from '@/shared/helpers/date';
 import { useSolveHCaptchaMutation } from '@/modules/worker/services/solve-hcaptcha';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
 import { useHCaptchaLabelingNotifications } from '@/modules/worker/hooks/use-hcaptcha-labeling-notifications';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 import { routerPaths } from '@/router/router-paths';
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/jobs/jobs.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/jobs/jobs.page.tsx
index 5f80e76b8c..6a91be4441 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/jobs/jobs.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/jobs/jobs.page.tsx
@@ -12,13 +12,13 @@ import { MyJobsDrawerMobile } from '@/modules/worker/components/jobs/my-jobs/mob
 import { AvailableJobsDrawerMobile } from '@/modules/worker/components/jobs/available-jobs/mobile/available-jobs-drawer-mobile';
 import { useGetOracles } from '@/modules/worker/services/oracles';
 import { useGetUiConfig } from '@/modules/worker/services/get-ui-config';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useGetOraclesNotifications } from '@/modules/worker/hooks/use-get-oracles-notifications';
 import { NoRecords } from '@/shared/components/ui/no-records';
 import { AvailableJobsTableMobile } from '@/modules/worker/components/jobs/available-jobs/mobile/available-jobs-table-mobile';
 import { TabPanel } from '@/modules/worker/components/jobs/jobs-tab-panel';
 import { MyJobsTable } from '@/modules/worker/components/jobs/my-jobs/desktop/my-jobs-table';
+import { PageCardLoader } from '@/shared/components/ui/page-card';
 
 function generateTabA11yProps(index: number) {
   return {
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/registration/registration.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/registration/registration.page.tsx
index 0e006de11c..e207df2a26 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/registration/registration.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/registration/registration.page.tsx
@@ -4,16 +4,16 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { Button } from '@/shared/components/ui/button';
 import {
   type RegistrationInExchangeOracleDto,
   registrationInExchangeOracleDtoSchema,
   useExchangeOracleRegistrationMutation,
 } from '@/modules/worker/services/registration-in-exchange-oracles';
-import { useRegisteredOracles } from '@/shared/contexts/registered-oracles';
 import { useGetOracles } from '@/modules/worker/services/oracles';
 import { routerPaths } from '@/router/router-paths';
+import { useRegisteredOracles } from '@/shared/contexts/registered-oracles';
 
 export function RegistrationPage() {
   const navigate = useNavigate();
@@ -122,7 +122,7 @@ export function RegistrationPage() {
                 }
               >
                 <Stack alignItems="center" spacing={2}>
-                  <FormCaptcha
+                  <HCaptchaForm
                     error={registrationInExchangeOracleError}
                     name="h_captcha_token"
                   />
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password-success.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password-success.page.tsx
index b8c5da16e7..b499e83aeb 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password-success.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password-success.page.tsx
@@ -8,7 +8,7 @@ import { Button } from '@/shared/components/ui/button';
 import { routerPaths } from '@/router/router-paths';
 import { PageCard } from '@/shared/components/ui/page-card';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function ResetPasswordWorkerSuccessPage() {
   const { colorPalette } = useColorMode();
@@ -19,7 +19,7 @@ export function ResetPasswordWorkerSuccessPage() {
   }, [signOut]);
   return (
     <PageCard
-      hiddenCancelButton
+      showCancelButton={false}
       title={
         <Grid
           container
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password.page.tsx
index d3ec835c62..f42524c4a7 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/reset-password/reset-password.page.tsx
@@ -18,7 +18,7 @@ import {
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { routerPaths } from '@/router/router-paths';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
 
 export function ResetPasswordWorkerPage() {
@@ -59,8 +59,8 @@ export function ResetPasswordWorkerPage() {
           </Alert>
         ) : undefined
       }
-      cancelRouterPathOrCallback={routerPaths.worker.profile}
-      hiddenArrowButton
+      cancelNavigation={routerPaths.worker.profile}
+      showBackButton={false}
       title={t('worker.resetPassword.title')}
     >
       <FormProvider {...methods}>
@@ -81,7 +81,7 @@ export function ResetPasswordWorkerPage() {
               label={t('worker.resetPassword.fields.confirm')}
               name="confirmPassword"
             />
-            <FormCaptcha
+            <HCaptchaForm
               error={resetPasswordWorkerError}
               name="h_captcha_token"
             />
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link-success.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link-success.page.tsx
index f0f61811f8..572cf86346 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link-success.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link-success.page.tsx
@@ -15,10 +15,10 @@ import {
 } from '@/modules/worker/services/send-reset-link';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { MailTo } from '@/shared/components/ui/mail-to';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 
 export function SendResetLinkWorkerSuccessPage() {
@@ -90,7 +90,7 @@ export function SendResetLinkWorkerSuccessPage() {
                 values={{ email }}
               />
             </Typography>
-            <FormCaptcha error={error} name="h_captcha_token" />
+            <HCaptchaForm error={error} name="h_captcha_token" />
             <Button
               disabled={!email}
               fullWidth
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link.page.tsx
index 9606a70a7f..6e5b5ef0fd 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/views/send-reset-link/send-reset-link.page.tsx
@@ -14,7 +14,7 @@ import {
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
-import { FormCaptcha } from '@/shared/components/h-captcha';
+import { HCaptchaForm } from '@/shared/components/hcaptcha/h-captcha-form';
 import { routerPaths } from '@/router/router-paths';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
 
@@ -53,7 +53,7 @@ export function SendResetLinkWorkerPage() {
           </Alert>
         ) : undefined
       }
-      cancelRouterPathOrCallback={routerPaths.worker.profile}
+      cancelNavigation={routerPaths.worker.profile}
       title={t('worker.sendResetLinkForm.title')}
     >
       <FormProvider {...methods}>
@@ -71,7 +71,7 @@ export function SendResetLinkWorkerPage() {
               label={t('worker.sendResetLinkForm.fields.email')}
               name="email"
             />
-            <FormCaptcha
+            <HCaptchaForm
               error={sendResetLinkWorkerError}
               name="h_captcha_token"
             />
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-in.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-in.page.tsx
deleted file mode 100644
index 28cbc97445..0000000000
--- a/packages/apps/human-app/frontend/src/modules/worker/views/sign/sign-in.page.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { FormProvider, useForm } from 'react-hook-form';
-import { Box, Grid, Typography } from '@mui/material';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useTranslation } from 'react-i18next';
-import { t as i18NextT } from 'i18next';
-import { Link } from 'react-router-dom';
-import { useEffect } from 'react';
-import { PageCard } from '@/shared/components/ui/page-card';
-import { Input } from '@/shared/components/data-entry/input';
-import { Button } from '@/shared/components/ui/button';
-import { Password } from '@/shared/components/data-entry/password/password';
-import { useSignInMutation } from '@/modules/worker/services/sign-in/sign-in';
-import { FetchError } from '@/api/fetcher';
-import { routerPaths } from '@/router/router-paths';
-import { getErrorMessageForError } from '@/shared/errors';
-import { Alert } from '@/shared/components/ui/alert';
-import { FormCaptcha } from '@/shared/components/h-captcha';
-import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
-import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-import { type SignInDto } from '@/modules/worker/services/sign-in/types';
-import { signInDtoSchema } from '@/modules/worker/services/sign-in/schema';
-
-function formattedSignInErrorMessage(unknownError: unknown) {
-  if (unknownError instanceof FetchError && unknownError.status === 400) {
-    return i18NextT('worker.signInForm.errors.invalidCredentials');
-  }
-}
-
-export function SignInWorkerPage() {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    browserAuthProvider.signOut({ triggerSignOutSubscriptions: false });
-  }, []);
-
-  const methods = useForm<SignInDto>({
-    defaultValues: {
-      email: '',
-      password: '',
-      // eslint-disable-next-line camelcase -- export vite config
-      h_captcha_token: '',
-    },
-    resolver: zodResolver(signInDtoSchema),
-  });
-
-  const {
-    mutate: signInWorkerMutate,
-    error: signInWorkerError,
-    isError: isSignInWorkerError,
-    isPending: isSignInWorkerPending,
-    reset: signInWorkerMutationReset,
-  } = useSignInMutation();
-
-  useResetMutationErrors(methods.watch, signInWorkerMutationReset);
-
-  function handleWorkerSignIn(data: SignInDto) {
-    signInWorkerMutate(data);
-  }
-
-  return (
-    <PageCard
-      alert={
-        isSignInWorkerError ? (
-          <Alert color="error" severity="error" sx={{ width: '100%' }}>
-            {getErrorMessageForError(
-              signInWorkerError,
-              formattedSignInErrorMessage
-            )}
-          </Alert>
-        ) : undefined
-      }
-      title={t('worker.signInForm.title')}
-    >
-      <FormProvider {...methods}>
-        <form
-          onSubmit={(event) =>
-            void methods.handleSubmit(handleWorkerSignIn)(event)
-          }
-        >
-          <Grid container gap="1.5rem">
-            <Input
-              fullWidth
-              label={t('worker.signInForm.fields.email')}
-              name="email"
-            />
-            <Password
-              fullWidth
-              label={t('worker.signInForm.fields.password')}
-              name="password"
-            />
-            <Box width="100%">
-              <Typography variant="body1">
-                <Link
-                  style={{
-                    textDecoration: 'none',
-                    fontWeight: 600,
-                    color: 'inherit',
-                  }}
-                  to={routerPaths.worker.sendResetLink}
-                >
-                  {t('worker.signInForm.forgotPassword')}
-                </Link>
-              </Typography>
-            </Box>
-            <FormCaptcha error={signInWorkerError} name="h_captcha_token" />
-            <Button
-              fullWidth
-              loading={isSignInWorkerPending}
-              type="submit"
-              variant="contained"
-            >
-              {t('worker.signInForm.submitBtn')}
-            </Button>
-          </Grid>
-        </form>
-      </FormProvider>
-    </PageCard>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/router/router.tsx b/packages/apps/human-app/frontend/src/router/router.tsx
index 098ca5944e..becd779158 100644
--- a/packages/apps/human-app/frontend/src/router/router.tsx
+++ b/packages/apps/human-app/frontend/src/router/router.tsx
@@ -8,7 +8,7 @@ import {
   web3ProtectedRoutes,
 } from '@/router/routes';
 import { RequireAuth } from '@/modules/auth/providers/require-auth';
-import { RequireWalletConnect } from '@/modules/auth-web3/providers/require-wallet-connect';
+import { RequireWalletConnect } from '@/shared/contexts/wallet-connect';
 import { RequireWeb3Auth } from '@/modules/auth-web3/providers/require-web3-auth';
 import { DrawerNavigation } from '@/shared/components/layout/protected/drawer-navigation';
 import {
diff --git a/packages/apps/human-app/frontend/src/router/routes.tsx b/packages/apps/human-app/frontend/src/router/routes.tsx
index 7a181ac507..e14826d913 100644
--- a/packages/apps/human-app/frontend/src/router/routes.tsx
+++ b/packages/apps/human-app/frontend/src/router/routes.tsx
@@ -1,8 +1,7 @@
 import type { RouteProps } from 'react-router-dom';
 import { t } from 'i18next';
 import { ProtectedPage } from '@/modules/worker/views/protected/protected.page';
-import { SignInWorkerPage } from '@/modules/worker/views/sign/sign-in.page';
-import { SignUpWorkerPage } from '@/modules/worker/views/sign/sign-up.page';
+import { SignInWorkerPage } from '@/modules/signin/worker';
 import { routerPaths } from '@/router/router-paths';
 import { SendResetLinkWorkerSuccessPage } from '@/modules/worker/views/send-reset-link/send-reset-link-success.page';
 import { ResetPasswordWorkerPage } from '@/modules/worker/views/reset-password/reset-password.page';
@@ -32,6 +31,7 @@ import { ConnectWalletOperatorPage } from '@/modules/operator/views/sign-up/conn
 import { OperatorProfilePage } from '@/modules/operator/views/profile/profile.page';
 import { Playground } from '@/modules/playground/views/playground.page';
 import { HomePage } from '@/modules/homepage/views/home.page';
+import { SignUpWorkerPage } from '@/modules/signup/worker';
 
 export const unprotectedRoutes: RouteProps[] = [
   {
diff --git a/packages/apps/human-app/frontend/src/shared/components/data-entry/checkbox.tsx b/packages/apps/human-app/frontend/src/shared/components/data-entry/checkbox.tsx
index 27029d4539..47c02ce7e8 100644
--- a/packages/apps/human-app/frontend/src/shared/components/data-entry/checkbox.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/data-entry/checkbox.tsx
@@ -4,7 +4,7 @@ import CheckboxMui from '@mui/material/Checkbox';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface InputProps extends Omit<CheckboxProps, 'name' | 'error'> {
   name: string;
diff --git a/packages/apps/human-app/frontend/src/shared/components/data-entry/input.tsx b/packages/apps/human-app/frontend/src/shared/components/data-entry/input.tsx
index cedd7cced0..09155d903e 100644
--- a/packages/apps/human-app/frontend/src/shared/components/data-entry/input.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/data-entry/input.tsx
@@ -3,7 +3,7 @@ import type { TextFieldProps } from '@mui/material/TextField';
 import TextField from '@mui/material/TextField';
 import { Typography } from '@mui/material';
 import { type InputMask } from '@/shared/components/data-entry/input-masks';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export interface InputProps
   extends Omit<TextFieldProps, 'name' | 'error' | 'helperText'> {
diff --git a/packages/apps/human-app/frontend/src/shared/components/data-entry/multi-select.tsx b/packages/apps/human-app/frontend/src/shared/components/data-entry/multi-select.tsx
index b490116839..b3c64d370b 100644
--- a/packages/apps/human-app/frontend/src/shared/components/data-entry/multi-select.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/data-entry/multi-select.tsx
@@ -18,7 +18,7 @@ import {
   Typography,
 } from '@mui/material';
 import CancelIcon from '@mui/icons-material/Cancel';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface MultiSelectProps extends Omit<SelectProps, 'name'> {
   options: { label: string; value: string }[];
diff --git a/packages/apps/human-app/frontend/src/shared/components/data-entry/password/password.tsx b/packages/apps/human-app/frontend/src/shared/components/data-entry/password/password.tsx
index 6ac372bd38..fe1a11443c 100644
--- a/packages/apps/human-app/frontend/src/shared/components/data-entry/password/password.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/data-entry/password/password.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import InputAdornment from '@mui/material/InputAdornment';
 import IconButton from '@mui/material/IconButton';
 import { Input, type InputProps } from '@/shared/components/data-entry/input';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 type PasswordProps = InputProps & { type?: never };
 
diff --git a/packages/apps/human-app/frontend/src/shared/components/data-entry/select.tsx b/packages/apps/human-app/frontend/src/shared/components/data-entry/select.tsx
index 25ac162d62..e1c4ec5a3b 100644
--- a/packages/apps/human-app/frontend/src/shared/components/data-entry/select.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/data-entry/select.tsx
@@ -6,7 +6,7 @@ import { Controller } from 'react-hook-form';
 import InputLabel from '@mui/material/InputLabel';
 import FormHelperText from '@mui/material/FormHelperText';
 import { Chip } from '@/shared/components/ui/chip';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export interface OptionsProps {
   id: number;
diff --git a/packages/apps/human-app/frontend/src/shared/components/h-captcha.tsx b/packages/apps/human-app/frontend/src/shared/components/h-captcha.tsx
deleted file mode 100644
index 86a0dd528b..0000000000
--- a/packages/apps/human-app/frontend/src/shared/components/h-captcha.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { useEffect, useRef } from 'react';
-import HCaptcha from '@hcaptcha/react-hcaptcha';
-import { useFormContext } from 'react-hook-form';
-import { Typography } from '@mui/material';
-import { env } from '@/shared/env';
-import { FetchError } from '@/api/fetcher';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
-
-interface CaptchaProps {
-  setCaptchaToken: (token: string) => void;
-  error?: unknown;
-}
-
-export function Captcha({ setCaptchaToken, error }: CaptchaProps) {
-  const { isDarkMode } = useColorMode();
-  const captchaRef = useRef<HCaptcha>(null);
-
-  useEffect(() => {
-    if (error instanceof FetchError) {
-      captchaRef.current?.resetCaptcha();
-    }
-  }, [error]);
-
-  return (
-    <HCaptcha
-      onVerify={setCaptchaToken}
-      ref={captchaRef}
-      sitekey={env.VITE_H_CAPTCHA_SITE_KEY}
-      theme={isDarkMode ? 'dark' : 'light'}
-    />
-  );
-}
-
-interface FormCaptchaProps {
-  name: string;
-  error?: unknown;
-}
-
-export function FormCaptcha({ name, error }: FormCaptchaProps) {
-  const { colorPalette } = useColorMode();
-  const { setValue, formState } = useFormContext<Record<string, unknown>>();
-
-  function setCaptchaToken(token: string) {
-    setValue(name, token);
-  }
-
-  useEffect(() => {
-    if (error instanceof FetchError) {
-      setValue(name, '');
-    }
-  }, [error, name, setValue]);
-
-  return (
-    <div>
-      <Captcha error={error} setCaptchaToken={setCaptchaToken} />
-      <Typography
-        color={colorPalette.error.main}
-        component="div"
-        variant="helperText"
-      >
-        {formState.errors[name]?.message}
-      </Typography>
-    </div>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha-form.tsx b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha-form.tsx
new file mode 100644
index 0000000000..d185792184
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha-form.tsx
@@ -0,0 +1,42 @@
+import { useEffect, useRef } from 'react';
+import { useFormContext } from 'react-hook-form';
+import { Typography } from '@mui/material';
+import { FetchError } from '@/api/fetcher';
+import { useColorMode } from '@/shared/contexts/color-mode';
+import { CustomHCaptcha } from './h-captcha';
+import { type CustomHCaptchaRef } from './types';
+
+interface HCaptchaFormProps {
+  name: string;
+  error?: unknown;
+}
+
+export function HCaptchaForm({ name, error }: Readonly<HCaptchaFormProps>) {
+  const { colorPalette } = useColorMode();
+  const { setValue, formState } = useFormContext<Record<string, unknown>>();
+  const customCaptchaRef = useRef<CustomHCaptchaRef>(null);
+
+  function setCaptchaValue(token: string) {
+    setValue(name, token);
+  }
+
+  useEffect(() => {
+    if (error instanceof FetchError) {
+      setValue(name, '');
+      customCaptchaRef.current?.reset();
+    }
+  }, [error, name, setValue]);
+
+  return (
+    <div>
+      <CustomHCaptcha onVerify={setCaptchaValue} ref={customCaptchaRef} />
+      <Typography
+        color={colorPalette.error.main}
+        component="div"
+        variant="helperText"
+      >
+        {formState.errors[name]?.message}
+      </Typography>
+    </div>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha.tsx b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha.tsx
new file mode 100644
index 0000000000..2c65686351
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/h-captcha.tsx
@@ -0,0 +1,41 @@
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+import HCaptcha from '@hcaptcha/react-hcaptcha';
+import { env } from '@/shared/env';
+import { useColorMode } from '@/shared/contexts/color-mode';
+import { type CustomHCaptchaRef } from './types';
+
+interface CustomHCaptchaProps {
+  onVerify: (token: string) => void;
+}
+
+function InternalHCaptcha(
+  { onVerify }: CustomHCaptchaProps,
+  ref: React.Ref<unknown>
+) {
+  const { isDarkMode } = useColorMode();
+  const captchaRef = useRef<HCaptcha>(null);
+
+  useImperativeHandle(ref, () => ({
+    reset: () => {
+      if (captchaRef.current) {
+        captchaRef.current.resetCaptcha();
+      }
+    },
+  }));
+
+  return (
+    <HCaptcha
+      onVerify={(token: string) => {
+        onVerify(token);
+      }}
+      ref={captchaRef}
+      sitekey={env.VITE_H_CAPTCHA_SITE_KEY}
+      theme={isDarkMode ? 'dark' : 'light'}
+    />
+  );
+}
+
+export const CustomHCaptcha = forwardRef<
+  CustomHCaptchaRef,
+  CustomHCaptchaProps
+>(InternalHCaptcha);
diff --git a/packages/apps/human-app/frontend/src/shared/components/hcaptcha/types.ts b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/types.ts
new file mode 100644
index 0000000000..dd95b93c46
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/hcaptcha/types.ts
@@ -0,0 +1,3 @@
+export interface CustomHCaptchaRef {
+  reset: () => void;
+}
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/footer.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/footer.tsx
index 6face23c34..436d1bc401 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/footer.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/footer.tsx
@@ -4,7 +4,7 @@ import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { env } from '@/shared/env';
 import { Chat } from '@/modules/homepage/components/chat';
 import { breakpoints } from '@/shared/styles/breakpoints';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface FooterProps {
   displayChatIcon?: boolean;
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/protected/drawer-navigation.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/protected/drawer-navigation.tsx
index 42146e832d..2bc1732f39 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/protected/drawer-navigation.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/protected/drawer-navigation.tsx
@@ -14,7 +14,7 @@ import { Button } from '@/shared/components/ui/button';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { NAVBAR_PADDING } from '@/shared/components/layout/protected/navbar';
 import { colorPalette } from '@/shared/styles/color-palette';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 import { useHandleMainNavIconClick } from '@/shared/hooks/use-handle-main-nav-icon-click';
 
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/protected/layout.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/protected/layout.tsx
index 1176737199..ae589f1e45 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/protected/layout.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/protected/layout.tsx
@@ -3,7 +3,7 @@ import type { Dispatch, SetStateAction } from 'react';
 import { useEffect, useRef, useState } from 'react';
 import { Outlet } from 'react-router-dom';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
+import { useBackgroundContext } from '@/shared/contexts/background';
 import type { PageHeaderProps } from '@/shared/components/layout/protected/page-header';
 import { PageHeader } from '@/shared/components/layout/protected/page-header';
 import { breakpoints } from '@/shared/styles/breakpoints';
@@ -50,7 +50,7 @@ export function Layout({
   const isMobile = useIsMobile();
   const [drawerOpen, setDrawerOpen] = useState(!isMobile);
   const [hcaptchaDrawerOpen, setHcaptchaDrawerOpen] = useState(false);
-  const { backgroundColor, setGrayBackground } = useBackgroundColorStore();
+  const { backgroundColor, setGrayBackground } = useBackgroundContext();
   const toggleUserStatsDrawer = isHCaptchaLabelingPage
     ? () => {
         setHcaptchaDrawerOpen((state) => !state);
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/protected/navbar.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/protected/navbar.tsx
index 2ca37f27f7..4b71b17bc4 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/protected/navbar.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/protected/navbar.tsx
@@ -6,7 +6,7 @@ import { HumanLogoIcon } from '@/shared/components/ui/icons';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { Button } from '@/shared/components/ui/button';
 import { useIsHCaptchaLabelingPage } from '@/shared/hooks/use-is-hcaptcha-labeling-page';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useHandleMainNavIconClick } from '@/shared/hooks/use-handle-main-nav-icon-click';
 
 export const NAVBAR_PADDING = '16px';
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/layout.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/layout.tsx
index 926efddfea..1af00794ea 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/layout.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/layout.tsx
@@ -1,9 +1,9 @@
 import { Container, Grid } from '@mui/material';
 import { Outlet } from 'react-router-dom';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
+import { useBackgroundContext } from '@/shared/contexts/background';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { breakpoints } from '@/shared/styles/breakpoints';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { Footer } from '../footer';
 import { Navbar } from './navbar';
 
@@ -13,7 +13,7 @@ interface LayoutProps {
 
 export function Layout({ withNavigation = true }: LayoutProps) {
   const { colorPalette, isDarkMode } = useColorMode();
-  const { backgroundColor } = useBackgroundColorStore();
+  const { backgroundColor } = useBackgroundContext();
   const isMobile = useIsMobile();
   const layoutBackgroundColor = (() => {
     if (isDarkMode) {
diff --git a/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/navbar.tsx b/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/navbar.tsx
index 9709223f32..fa241c0ddb 100644
--- a/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/navbar.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/layout/unprotected/navbar.tsx
@@ -11,9 +11,9 @@ import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { Button } from '@/shared/components/ui/button';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { env } from '@/shared/env';
-import { useHomePageState } from '@/shared/contexts/homepage-state';
 import { DarkModeSwitch } from '@/shared/components/ui/dark-mode-switch';
 import { useHandleMainNavIconClick } from '@/shared/hooks/use-handle-main-nav-icon-click';
+import { useHomePageState } from '@/shared/contexts/homepage-state';
 
 interface NavbarProps {
   withNavigation: boolean;
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/alert.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/alert.tsx
index 7fdb16b2da..12d26491a1 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/alert.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/alert.tsx
@@ -4,7 +4,7 @@ import ErrorIcon from '@mui/icons-material/Error';
 import MuiAlert from '@mui/material/Alert';
 import type { AlertProps as MuiAlertProps } from '@mui/material/Alert';
 import { Typography } from '@mui/material';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { darkColorPalette } from '@/shared/styles/dark-color-palette';
 
 const getIcon = (severity: MuiAlertProps['severity'], isDarkMode: boolean) => {
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/chip.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/chip.tsx
index 83ae568c80..c4a469a4c7 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/chip.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/chip.tsx
@@ -1,5 +1,5 @@
 import { Box, Typography } from '@mui/material';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface ChipProps {
   label: string | React.ReactElement;
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/connect-wallet-btn.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/connect-wallet-btn.tsx
index 3b340baadd..13d546f536 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/connect-wallet-btn.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/connect-wallet-btn.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import type { CustomButtonProps } from '@/shared/components/ui/button';
 import { Button } from '@/shared/components/ui/button';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
+import { useWalletConnect } from '@/shared/contexts/wallet-connect';
 
 export function ConnectWalletBtn(props: CustomButtonProps) {
   const { openModal, isConnected } = useWalletConnect();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/dark-mode-switch.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/dark-mode-switch.tsx
index cda8a7cab6..6e41830d90 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/dark-mode-switch.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/dark-mode-switch.tsx
@@ -1,6 +1,6 @@
 import { Grid, Switch } from '@mui/material';
 import { MoonIcon, SunIcon } from '@/shared/components/ui/icons';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function DarkModeSwitch() {
   const { switchMode, isDarkMode } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/empty-placeholder.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/empty-placeholder.tsx
index 4cb8e19a0e..fa2eadfade 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/empty-placeholder.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/empty-placeholder.tsx
@@ -1,6 +1,6 @@
 import Typography from '@mui/material/Typography';
 import { t } from 'i18next';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function EmptyPlaceholder() {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/icons.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/icons.tsx
index 14d306e695..25681beef6 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/icons.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/icons.tsx
@@ -36,7 +36,7 @@ import SunIconDark from '@/assets/icons-dark-mode/sun.svg';
 import SunIconLight from '@/assets/icons/sun.svg';
 import MoonIconDark from '@/assets/icons-dark-mode/moon.svg';
 import MoonIconLight from '@/assets/icons/moon.svg';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import WorkHeaderDark from '@/assets/icons-dark-mode/work-header.svg';
 import WorkHeaderLight from '@/assets/icons/work-header.svg';
 
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/loader.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/loader.tsx
index 2f83b76aa2..1c32b0f261 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/loader.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/loader.tsx
@@ -1,6 +1,6 @@
 import type { CircularProgressProps } from '@mui/material/CircularProgress';
 import CircularProgress from '@mui/material/CircularProgress';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function Loader({ ...props }: CircularProgressProps) {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/no-records.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/no-records.tsx
index fb49dc542e..190638947e 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/no-records.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/no-records.tsx
@@ -1,5 +1,5 @@
 import { Grid } from '@mui/material';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function NoRecords() {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card-error.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/page-card-error.tsx
deleted file mode 100644
index a8a9bdf030..0000000000
--- a/packages/apps/human-app/frontend/src/shared/components/ui/page-card-error.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import type { SxProps, Theme } from '@mui/material';
-import { Grid } from '@mui/material';
-import { useNavigate } from 'react-router-dom';
-import { useEffect } from 'react';
-import { t } from 'i18next';
-import { Button } from '@/shared/components/ui/button';
-import { breakpoints } from '@/shared/styles/breakpoints';
-import { routerPaths } from '@/router/router-paths';
-import { colorPalette as constColorPalette } from '@/shared/styles/color-palette';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
-import { Alert } from '@/shared/components/ui/alert';
-import { darkColorPalette as constDarkColorPalette } from '@/shared/styles/dark-color-palette';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
-
-const commonStyles: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constColorPalette.white,
-};
-
-const commonStylesDark: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constDarkColorPalette.paper.main,
-  [breakpoints.mobile]: {
-    background: constDarkColorPalette.backgroundColor,
-  },
-};
-
-export function PageCardError({
-  errorMessage,
-  children,
-  withLayoutBackground,
-  cardMaxWidth = '100%',
-}:
-  | {
-      errorMessage: string;
-      children?: never;
-      cardMaxWidth?: string;
-      withLayoutBackground?: boolean;
-    }
-  | {
-      errorMessage?: never;
-      children: React.ReactElement;
-      cardMaxWidth?: string;
-      withLayoutBackground?: boolean;
-    }) {
-  const { isDarkMode } = useColorMode();
-  const navigate = useNavigate();
-  const { setGrayBackground } = useBackgroundColorStore();
-  const commonStyleForTheme = isDarkMode ? commonStylesDark : commonStyles;
-
-  const sx = cardMaxWidth
-    ? { ...commonStyleForTheme, maxWidth: cardMaxWidth }
-    : commonStyleForTheme;
-
-  useEffect(() => {
-    if (withLayoutBackground) {
-      setGrayBackground();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- call this effect once
-  }, []);
-
-  return (
-    <Grid container sx={{ ...sx, gap: '2rem' }}>
-      {children ? (
-        children
-      ) : (
-        <>
-          <Alert color="error" severity="error">
-            {errorMessage}
-          </Alert>
-          <Button onClick={navigate.bind(null, 0)} variant="contained">
-            {t('components.pageCardError.reload')}
-          </Button>
-          <Button
-            onClick={() => {
-              navigate(routerPaths.homePage);
-            }}
-            variant="outlined"
-          >
-            {t('components.pageCardError.goHome')}
-          </Button>
-        </>
-      )}
-    </Grid>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card-loader.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/page-card-loader.tsx
deleted file mode 100644
index 9ff9424a91..0000000000
--- a/packages/apps/human-app/frontend/src/shared/components/ui/page-card-loader.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import type { SxProps, Theme } from '@mui/material';
-import { Grid } from '@mui/material';
-import { useNavigate } from 'react-router-dom';
-import { useEffect } from 'react';
-import { t } from 'i18next';
-import { Button } from '@/shared/components/ui/button';
-import { breakpoints } from '@/shared/styles/breakpoints';
-import { routerPaths } from '@/router/router-paths';
-import { colorPalette as constColorPalette } from '@/shared/styles/color-palette';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
-import { Loader } from '@/shared/components/ui/loader';
-import { Alert } from '@/shared/components/ui/alert';
-import { darkColorPalette as constDarkColorPalette } from '@/shared/styles/dark-color-palette';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
-
-const commonStyles: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constColorPalette.white,
-};
-
-const commonStylesDark: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constDarkColorPalette.paper.main,
-  [breakpoints.mobile]: {
-    background: constDarkColorPalette.backgroundColor,
-  },
-};
-
-export function PageCardLoader({
-  withLayoutBackground = true,
-  cardMaxWidth = '100%',
-}: {
-  cardMaxWidth?: string;
-  withLayoutBackground?: boolean;
-}) {
-  const { isDarkMode } = useColorMode();
-  const { setGrayBackground } = useBackgroundColorStore();
-
-  useEffect(() => {
-    if (withLayoutBackground) {
-      setGrayBackground();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- call this effect once
-  }, []);
-
-  const commonStyleForTheme = isDarkMode ? commonStylesDark : commonStyles;
-
-  const sx = cardMaxWidth
-    ? {
-        ...commonStyleForTheme,
-        maxWidth: cardMaxWidth,
-      }
-    : commonStyleForTheme;
-
-  return (
-    <Grid container sx={sx}>
-      <Loader size={90} />
-    </Grid>
-  );
-}
-export function PageCardError({
-  errorMessage,
-  children,
-  withLayoutBackground,
-  cardMaxWidth = '100%',
-}:
-  | {
-      errorMessage: string;
-      children?: never;
-      cardMaxWidth?: string;
-      withLayoutBackground?: boolean;
-    }
-  | {
-      errorMessage?: never;
-      children: React.ReactElement;
-      cardMaxWidth?: string;
-      withLayoutBackground?: boolean;
-    }) {
-  const { isDarkMode } = useColorMode();
-  const navigate = useNavigate();
-  const { setGrayBackground } = useBackgroundColorStore();
-  const commonStyleForTheme = isDarkMode ? commonStylesDark : commonStyles;
-
-  const sx = cardMaxWidth
-    ? { ...commonStyleForTheme, maxWidth: cardMaxWidth }
-    : commonStyleForTheme;
-
-  useEffect(() => {
-    if (withLayoutBackground) {
-      setGrayBackground();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- call this effect once
-  }, []);
-
-  return (
-    <Grid container sx={{ ...sx, gap: '2rem' }}>
-      {children ? (
-        children
-      ) : (
-        <>
-          <Alert color="error" severity="error">
-            {errorMessage}
-          </Alert>
-          <Button onClick={navigate.bind(null, 0)} variant="contained">
-            {t('components.pageCardError.reload')}
-          </Button>
-          <Button
-            onClick={() => {
-              navigate(routerPaths.homePage);
-            }}
-            variant="outlined"
-          >
-            {t('components.pageCardError.goHome')}
-          </Button>
-        </>
-      )}
-    </Grid>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card/index.ts b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/index.ts
new file mode 100644
index 0000000000..91f6dbc39d
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/index.ts
@@ -0,0 +1,3 @@
+export * from './page-card';
+export * from './page-card-error';
+export * from './page-card-loader';
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-error.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-error.tsx
new file mode 100644
index 0000000000..c86e5e6d71
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-error.tsx
@@ -0,0 +1,49 @@
+import { Grid } from '@mui/material';
+import { useNavigate } from 'react-router-dom';
+import { t } from 'i18next';
+import { Button } from '@/shared/components/ui/button';
+import { routerPaths } from '@/router/router-paths';
+import { Alert } from '@/shared/components/ui/alert';
+import { useColorMode } from '@/shared/contexts/color-mode';
+import { commonDarkPageCardStyles, commonPageCardStyles } from './styles';
+import { type ErrorMessageProps } from './types';
+
+export function PageCardError({
+  errorMessage,
+  cardMaxWidth = '100%',
+}: Readonly<ErrorMessageProps>) {
+  const { isDarkMode } = useColorMode();
+  const navigate = useNavigate();
+
+  const commonStyleForTheme = isDarkMode
+    ? commonDarkPageCardStyles
+    : commonPageCardStyles;
+
+  const sx = cardMaxWidth
+    ? { ...commonStyleForTheme, maxWidth: cardMaxWidth }
+    : commonStyleForTheme;
+
+  return (
+    <Grid container sx={{ ...sx, gap: '2rem' }}>
+      <Alert color="error" severity="error">
+        {errorMessage}
+      </Alert>
+      <Button
+        onClick={() => {
+          navigate(0);
+        }}
+        variant="contained"
+      >
+        {t('components.pageCardError.reload')}
+      </Button>
+      <Button
+        onClick={() => {
+          navigate(routerPaths.homePage);
+        }}
+        variant="outlined"
+      >
+        {t('components.pageCardError.goHome')}
+      </Button>
+    </Grid>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-loader.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-loader.tsx
new file mode 100644
index 0000000000..fc13e4a9f0
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card-loader.tsx
@@ -0,0 +1,26 @@
+import { Grid } from '@mui/material';
+import { Loader } from '@/shared/components/ui/loader';
+import { useColorMode } from '@/shared/contexts/color-mode';
+import { commonDarkPageCardStyles, commonPageCardStyles } from './styles';
+import { type CommonProps } from './types';
+
+export function PageCardLoader({ cardMaxWidth = '100%' }: CommonProps) {
+  const { isDarkMode } = useColorMode();
+
+  const commonStyleForTheme = isDarkMode
+    ? commonDarkPageCardStyles
+    : commonPageCardStyles;
+
+  const sx = cardMaxWidth
+    ? {
+        ...commonStyleForTheme,
+        maxWidth: cardMaxWidth,
+      }
+    : commonStyleForTheme;
+
+  return (
+    <Grid container sx={sx}>
+      <Loader size={90} />
+    </Grid>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card.tsx
similarity index 61%
rename from packages/apps/human-app/frontend/src/shared/components/ui/page-card.tsx
rename to packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card.tsx
index 36b53f435e..ee4ad585a4 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/page-card.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/page-card.tsx
@@ -1,20 +1,14 @@
-import type { SxProps, Theme } from '@mui/material';
 import { Grid, Typography, styled } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { useNavigate } from 'react-router-dom';
-import { useEffect } from 'react';
 import { t } from 'i18next';
 import { Button } from '@/shared/components/ui/button';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { routerPaths } from '@/router/router-paths';
-import { colorPalette as constColorPalette } from '@/shared/styles/color-palette';
-import { useBackgroundColorStore } from '@/shared/hooks/use-background-store';
-import {
-  darkColorPalette as constDarkColorPalette,
-  onlyDarkModeColor,
-} from '@/shared/styles/dark-color-palette';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { useIsMobile } from '@/shared/hooks/use-is-mobile';
+import { commonDarkPageCardStyles, commonPageCardStyles } from './styles';
 
 const IconWrapper = styled('div')(() => ({
   width: '40px',
@@ -30,44 +24,18 @@ const IconWrapper = styled('div')(() => ({
   fontSize: '26px',
 }));
 
-const commonStyles: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constColorPalette.white,
-};
-
-const commonStylesDark: SxProps<Theme> = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  borderRadius: '20px',
-  minHeight: '70vh',
-  maxWidth: '1600px',
-  width: '100%',
-  background: constDarkColorPalette.paper.main,
-  [breakpoints.mobile]: {
-    background: constDarkColorPalette.backgroundColor,
-  },
-};
-
-type ButtonsProps = string | -1 | (() => void);
+type NavigationTarget = string | (() => void);
 
-interface FormCardProps {
+interface PageCardProps {
   children: React.JSX.Element;
   maxContentWidth?: string;
   childrenMaxWidth?: string;
   title?: React.JSX.Element | string;
   alert?: React.JSX.Element;
-  backArrowPath?: ButtonsProps;
-  cancelRouterPathOrCallback?: ButtonsProps;
-  hiddenCancelButton?: boolean;
-  hiddenArrowButton?: boolean;
-  withLayoutBackground?: boolean;
+  backNavigation?: NavigationTarget;
+  cancelNavigation?: NavigationTarget;
+  showCancelButton?: boolean;
+  showBackButton?: boolean;
   loader?: boolean;
 }
 
@@ -75,18 +43,17 @@ export function PageCard({
   children,
   title,
   alert,
+  backNavigation,
   maxContentWidth = '376px',
   childrenMaxWidth = '486px',
-  backArrowPath = -1,
-  cancelRouterPathOrCallback = routerPaths.homePage,
-  withLayoutBackground = true,
-  hiddenCancelButton = false,
-  hiddenArrowButton = false,
-}: FormCardProps) {
+  cancelNavigation = routerPaths.homePage,
+  showCancelButton = true,
+  showBackButton = true,
+}: Readonly<PageCardProps>) {
   const { isDarkMode, colorPalette } = useColorMode();
-  const { setGrayBackground } = useBackgroundColorStore();
   const navigate = useNavigate();
   const isMobile = useIsMobile('md');
+
   const contentStyles = {
     maxWidth: maxContentWidth,
     width: '100%',
@@ -95,34 +62,35 @@ export function PageCard({
     },
   };
 
-  useEffect(() => {
-    if (withLayoutBackground && !isDarkMode) {
-      setGrayBackground();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- call this effect once
-  }, []);
-
-  const goBack = (pathOrCallback: ButtonsProps) => {
-    if (pathOrCallback instanceof Function) {
-      pathOrCallback();
+  const goBack = (navigationTarget: NavigationTarget | undefined) => {
+    if (navigationTarget instanceof Function) {
+      navigationTarget();
       return;
     }
-    if (typeof pathOrCallback === 'string') {
-      navigate(pathOrCallback);
+    if (typeof navigationTarget === 'string') {
+      navigate(navigationTarget);
       return;
     }
-    navigate(pathOrCallback);
+    navigate(-1);
+  };
+
+  const handleBackButton = () => {
+    goBack(backNavigation);
+  };
+
+  const handleCancelButton = () => {
+    goBack(cancelNavigation);
   };
 
   return (
     <Grid
       container
       sx={{
-        ...(isDarkMode ? commonStylesDark : commonStyles),
+        ...(isDarkMode ? commonDarkPageCardStyles : commonPageCardStyles),
         padding: isMobile ? '0 2rem 7.25rem 2rem' : '2rem 2rem 7.7rem 2rem',
       }}
     >
-      {!hiddenCancelButton && (
+      {showCancelButton && (
         <Grid
           sx={{
             display: 'flex',
@@ -133,15 +101,7 @@ export function PageCard({
             },
           }}
         >
-          <Button
-            onClick={() => {
-              if (cancelRouterPathOrCallback instanceof Function) {
-                cancelRouterPathOrCallback();
-                return;
-              }
-              goBack(cancelRouterPathOrCallback);
-            }}
-          >
+          <Button onClick={handleCancelButton}>
             <Typography variant="buttonMedium">
               {t('components.modal.header.closeBtn')}
             </Typography>
@@ -178,14 +138,14 @@ export function PageCard({
               [breakpoints.mobile]: {
                 display: 'flex',
                 width: '100%',
-                justifyContent: backArrowPath ? 'space-between' : 'flex-end',
+                justifyContent: backNavigation ? 'space-between' : 'flex-end',
                 alignItems: 'center',
               },
             }}
           >
-            {backArrowPath && !hiddenArrowButton ? (
+            {showBackButton && (
               <IconWrapper
-                onClick={goBack.bind(null, backArrowPath)}
+                onClick={handleBackButton}
                 sx={{
                   width: '25px',
                   height: '25px',
@@ -197,17 +157,9 @@ export function PageCard({
               >
                 <ArrowBackIcon fontSize="inherit" />
               </IconWrapper>
-            ) : null}
-            {!hiddenCancelButton && (
-              <Button
-                onClick={() => {
-                  if (cancelRouterPathOrCallback instanceof Function) {
-                    cancelRouterPathOrCallback();
-                    return;
-                  }
-                  goBack(cancelRouterPathOrCallback);
-                }}
-              >
+            )}
+            {showCancelButton && (
+              <Button onClick={handleCancelButton}>
                 <Typography variant="buttonMedium">
                   {t('components.modal.header.closeBtn')}
                 </Typography>
@@ -229,7 +181,7 @@ export function PageCard({
             }}
             xs={12}
           >
-            <Grid sx={contentStyles}>{alert ? <>{alert}</> : null}</Grid>
+            <Grid sx={contentStyles}>{alert && <>{alert}</>}</Grid>
           </Grid>
           <Grid
             item
@@ -245,9 +197,9 @@ export function PageCard({
             }}
             xs={12}
           >
-            {backArrowPath && !hiddenArrowButton ? (
+            {showBackButton && (
               <IconWrapper
-                onClick={goBack.bind(null, backArrowPath)}
+                onClick={handleBackButton}
                 sx={{
                   backgroundColor: isDarkMode
                     ? onlyDarkModeColor.backArrowBg
@@ -256,7 +208,7 @@ export function PageCard({
               >
                 <ArrowBackIcon fontSize="inherit" />
               </IconWrapper>
-            ) : null}
+            )}
           </Grid>
           <Grid
             item
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card/styles.ts b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/styles.ts
new file mode 100644
index 0000000000..e26f4b48a7
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/styles.ts
@@ -0,0 +1,29 @@
+import type { SxProps, Theme } from '@mui/material';
+import { breakpoints } from '@/shared/styles/breakpoints';
+import { colorPalette as constColorPalette } from '@/shared/styles/color-palette';
+import { darkColorPalette as constDarkColorPalette } from '@/shared/styles/dark-color-palette';
+
+export const commonPageCardStyles: SxProps<Theme> = {
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'center',
+  borderRadius: '20px',
+  minHeight: '70vh',
+  maxWidth: '1600px',
+  width: '100%',
+  background: constColorPalette.white,
+};
+
+export const commonDarkPageCardStyles: SxProps<Theme> = {
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'center',
+  borderRadius: '20px',
+  minHeight: '70vh',
+  maxWidth: '1600px',
+  width: '100%',
+  background: constDarkColorPalette.paper.main,
+  [breakpoints.mobile]: {
+    background: constDarkColorPalette.backgroundColor,
+  },
+};
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/page-card/types.ts b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/types.ts
new file mode 100644
index 0000000000..08e46d471e
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/page-card/types.ts
@@ -0,0 +1,7 @@
+export interface CommonProps {
+  cardMaxWidth?: string;
+}
+
+export interface ErrorMessageProps extends CommonProps {
+  errorMessage: string;
+}
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/profile-list-item.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/profile-list-item.tsx
index 5cbf39b480..645c02e693 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/profile-list-item.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/profile-list-item.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Button } from '@/shared/components/ui/button';
 import { CheckmarkIcon, LockerIcon } from '@/shared/components/ui/icons';
 import { Chips } from '@/shared/components/ui/chips';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface ProfileListItemProps {
   header: string;
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/success-label.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/success-label.tsx
index 8ef8a4acef..e6f8c96501 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/success-label.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/success-label.tsx
@@ -1,6 +1,6 @@
 import Grid from '@mui/material/Grid';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function SuccessLabel({ children }: { children: string }) {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/filtering.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/filtering.tsx
index 9c963c14f2..1dd92c9ecd 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/filtering.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/filtering.tsx
@@ -4,7 +4,7 @@ import List from '@mui/material/List';
 import Divider from '@mui/material/Divider';
 import ListItem from '@mui/material/ListItem';
 import { t } from 'i18next';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface FilteringOption<T> {
   name: string;
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/sorting.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/sorting.tsx
index eda812848a..5d5749b639 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/sorting.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/table/table-header-menu.tsx/sorting.tsx
@@ -2,7 +2,7 @@ import { Divider, Typography } from '@mui/material';
 import List from '@mui/material/List';
 import ListItemText from '@mui/material/ListItemText';
 import { t } from 'i18next';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 interface SortingMenuProps {
   sortingOptions: { label: string; sortCallback: () => void }[];
diff --git a/packages/apps/human-app/frontend/src/shared/components/ui/ui-example.tsx b/packages/apps/human-app/frontend/src/shared/components/ui/ui-example.tsx
index 231cb7451e..f3eb5d962e 100644
--- a/packages/apps/human-app/frontend/src/shared/components/ui/ui-example.tsx
+++ b/packages/apps/human-app/frontend/src/shared/components/ui/ui-example.tsx
@@ -28,7 +28,7 @@ import {
 import { TableExample } from '@/modules/playground/components/table-example/table-example';
 import { Alert } from '@/shared/components/ui/alert';
 import { ConnectWalletBtn } from '@/shared/components/ui/connect-wallet-btn';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 
 export function UiExample() {
   const { colorPalette } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/background-color-store.tsx b/packages/apps/human-app/frontend/src/shared/contexts/background/background.tsx
similarity index 77%
rename from packages/apps/human-app/frontend/src/shared/contexts/background-color-store.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/background/background.tsx
index b8b23d06c0..321fa666f6 100644
--- a/packages/apps/human-app/frontend/src/shared/contexts/background-color-store.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/background/background.tsx
@@ -1,5 +1,11 @@
 import type { ReactNode } from 'react';
-import { createContext, useCallback, useEffect, useState } from 'react';
+import {
+  createContext,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
 import type { ColorPalette } from '@/shared/styles/color-palette';
 
 export interface BackgroundContextProps {
@@ -22,7 +28,7 @@ export function BackgroundProvider({
   children,
   colorPalette,
   isDarkMode,
-}: BackgroundProviderProps) {
+}: Readonly<BackgroundProviderProps>) {
   const [backgroundColor, setBackgroundColor] = useState<string>(
     colorPalette.white
   );
@@ -39,13 +45,13 @@ export function BackgroundProvider({
     setBackgroundColor(colorPalette.white);
   }, [colorPalette.white]);
 
-  const setGrayBackground = () => {
+  const setGrayBackground = useCallback(() => {
     if (isDarkMode) {
       setBackgroundColor(colorPalette.backgroundColor);
     } else {
       setBackgroundColor(colorPalette.paper.main);
     }
-  };
+  }, [isDarkMode, colorPalette.backgroundColor, colorPalette.paper.main]);
 
   const setGrayBackgroundInternal = useCallback(
     (_isDarkMode: boolean) => {
@@ -69,10 +75,13 @@ export function BackgroundProvider({
     setGrayBackgroundInternal,
   ]);
 
+  const contextValue = useMemo(
+    () => ({ backgroundColor, setWhiteBackground, setGrayBackground }),
+    [backgroundColor, setWhiteBackground, setGrayBackground]
+  );
+
   return (
-    <BackgroundContext.Provider
-      value={{ backgroundColor, setWhiteBackground, setGrayBackground }}
-    >
+    <BackgroundContext.Provider value={contextValue}>
       {children}
     </BackgroundContext.Provider>
   );
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/background/index.ts b/packages/apps/human-app/frontend/src/shared/contexts/background/index.ts
new file mode 100644
index 0000000000..3c17b2c9ef
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/background/index.ts
@@ -0,0 +1,2 @@
+export * from './background';
+export * from './use-background-context';
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/background/use-background-context.tsx b/packages/apps/human-app/frontend/src/shared/contexts/background/use-background-context.tsx
new file mode 100644
index 0000000000..1fb0d4db2e
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/background/use-background-context.tsx
@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { BackgroundContext, type BackgroundContextProps } from './background';
+
+export const useBackgroundContext = (): BackgroundContextProps => {
+  const context = useContext(BackgroundContext);
+  if (!context) {
+    throw new Error(
+      'useBackgroundContext must be used within a BackgroundProvider'
+    );
+  }
+  return context;
+};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/color-mode-context.tsx b/packages/apps/human-app/frontend/src/shared/contexts/color-mode-context.tsx
deleted file mode 100644
index 6856a418d8..0000000000
--- a/packages/apps/human-app/frontend/src/shared/contexts/color-mode-context.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { ReactNode } from 'react';
-import { createContext, useEffect, useMemo, useState } from 'react';
-import { ThemeProvider, createTheme } from '@mui/material';
-import { theme } from '@/shared/styles/theme';
-import { colorPalette as defaultColorPalette } from '@/shared/styles/color-palette';
-import { darkTheme } from '@/shared/styles/dark-theme';
-import { darkColorPalette } from '@/shared/styles/dark-color-palette';
-import { BackgroundProvider } from '@/shared/contexts/background-color-store';
-
-export interface ColorModeContextProps {
-  isDarkMode: boolean;
-  colorPalette: typeof defaultColorPalette;
-  switchMode: () => void;
-}
-
-const MODE_LOCAL_STORAGE_KEY = 'mode';
-
-const setModeInLocalStorage = (mode: 'dark' | 'light') => {
-  localStorage.setItem(MODE_LOCAL_STORAGE_KEY, mode);
-};
-
-const isDarkInModeLocalStorage = () => {
-  const mode = localStorage.getItem(MODE_LOCAL_STORAGE_KEY);
-  if (mode === 'dark') {
-    return true;
-  }
-  return false;
-};
-
-const isModeSetILocalStorage = () => {
-  return Boolean(localStorage.getItem(MODE_LOCAL_STORAGE_KEY));
-};
-
-export const ColorModeContext = createContext<
-  ColorModeContextProps | undefined
->(undefined);
-
-interface ColorModeProviderProps {
-  children: ReactNode;
-}
-
-export function ColorModeProvider({ children }: ColorModeProviderProps) {
-  const [isDarkMode, setIsDarkMode] = useState<boolean>(
-    isDarkInModeLocalStorage()
-  );
-
-  const switchMode = () => {
-    setIsDarkMode((current) => {
-      const newMode = !current;
-      setModeInLocalStorage(newMode ? 'dark' : 'light');
-      return newMode;
-    });
-  };
-
-  const runColorMode = (
-    fn: (matches: boolean) => void
-  ): (() => void) | undefined => {
-    const query = window.matchMedia('(prefers-color-scheme: dark)');
-    fn(query.matches);
-
-    const listener = (event: MediaQueryListEvent) => {
-      fn(event.matches);
-    };
-    query.addEventListener('change', listener);
-
-    return () => {
-      query.removeEventListener('change', listener);
-    };
-  };
-
-  useEffect(() => {
-    const handleColorModeChange = (matches: boolean) => {
-      if (isModeSetILocalStorage()) {
-        return;
-      }
-      setIsDarkMode(matches);
-      if (matches) {
-        document.body.classList.add('dark-mode');
-      } else {
-        document.body.classList.remove('dark-mode');
-      }
-    };
-
-    const unsubscribe = runColorMode(handleColorModeChange);
-
-    return () => {
-      if (unsubscribe) unsubscribe();
-    };
-  }, []);
-  const themes = useMemo(
-    () => (isDarkMode ? createTheme(darkTheme) : createTheme(theme)),
-    [isDarkMode]
-  );
-  const colorPalette = useMemo(
-    () => (isDarkMode ? darkColorPalette : defaultColorPalette),
-    [isDarkMode]
-  );
-  return (
-    <ThemeProvider theme={themes}>
-      <ColorModeContext.Provider
-        value={{ isDarkMode, colorPalette, switchMode }}
-      >
-        <BackgroundProvider colorPalette={colorPalette} isDarkMode={isDarkMode}>
-          {children}
-        </BackgroundProvider>
-      </ColorModeContext.Provider>
-    </ThemeProvider>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-handlers.ts b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-handlers.ts
new file mode 100644
index 0000000000..6154e23f8c
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-handlers.ts
@@ -0,0 +1,15 @@
+export const addColorSchemePrefsListener = (
+  fn: (matches: boolean) => void
+): (() => void) => {
+  const query = window.matchMedia('(prefers-color-scheme: dark)');
+  fn(query.matches);
+
+  const listener = (event: MediaQueryListEvent) => {
+    fn(event.matches);
+  };
+  query.addEventListener('change', listener);
+
+  return () => {
+    query.removeEventListener('change', listener);
+  };
+};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-settings.ts b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-settings.ts
new file mode 100644
index 0000000000..2e8b2c9134
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode-settings.ts
@@ -0,0 +1,22 @@
+const MODE_LOCAL_STORAGE_KEY = 'mode';
+
+export enum ColorMode {
+  DARK = 'dark',
+  LIGHT = 'light',
+}
+
+export const saveColorMode = (mode: ColorMode) => {
+  localStorage.setItem(MODE_LOCAL_STORAGE_KEY, mode);
+};
+
+export const isDarkColorMode = () => {
+  const mode = localStorage.getItem(MODE_LOCAL_STORAGE_KEY);
+  if (mode === ColorMode.DARK) {
+    return true;
+  }
+  return false;
+};
+
+export const hasColorMode = () => {
+  return Boolean(localStorage.getItem(MODE_LOCAL_STORAGE_KEY));
+};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode.tsx b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode.tsx
new file mode 100644
index 0000000000..faeb22e8f1
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/color-mode.tsx
@@ -0,0 +1,94 @@
+import type { ReactNode } from 'react';
+import {
+  createContext,
+  useEffect,
+  useMemo,
+  useState,
+  useCallback,
+} from 'react';
+import { ThemeProvider, createTheme } from '@mui/material';
+import { BackgroundProvider } from '@/shared/contexts/background';
+import { theme } from '@/shared/styles/theme';
+import { colorPalette as defaultColorPalette } from '@/shared/styles/color-palette';
+import { darkTheme } from '@/shared/styles/dark-theme';
+import { darkColorPalette } from '@/shared/styles/dark-color-palette';
+import {
+  ColorMode,
+  hasColorMode,
+  isDarkColorMode,
+  saveColorMode,
+} from './color-mode-settings';
+import { addColorSchemePrefsListener } from './color-mode-handlers';
+
+export interface ColorModeContextProps {
+  isDarkMode: boolean;
+  colorPalette: typeof defaultColorPalette;
+  switchMode: () => void;
+}
+
+export const ColorModeContext = createContext<
+  ColorModeContextProps | undefined
+>(undefined);
+
+interface ColorModeProviderProps {
+  children: ReactNode;
+}
+
+export function ColorModeProvider({
+  children,
+}: Readonly<ColorModeProviderProps>) {
+  const [isDarkMode, setIsDarkMode] = useState<boolean>(isDarkColorMode());
+
+  const handleColorSchemePrefsChange = (prefersDarkScheme: boolean) => {
+    if (hasColorMode()) {
+      return;
+    }
+    setIsDarkMode(prefersDarkScheme);
+    if (prefersDarkScheme) {
+      document.body.classList.add('dark-mode');
+    } else {
+      document.body.classList.remove('dark-mode');
+    }
+  };
+
+  useEffect(() => {
+    const unsubscribe = addColorSchemePrefsListener(
+      handleColorSchemePrefsChange
+    );
+
+    return () => {
+      unsubscribe();
+    };
+  }, []);
+
+  const switchMode = useCallback(() => {
+    setIsDarkMode((current) => {
+      const newMode = !current;
+      saveColorMode(newMode ? ColorMode.DARK : ColorMode.LIGHT);
+      return newMode;
+    });
+  }, []);
+
+  const themes = useMemo(
+    () => (isDarkMode ? createTheme(darkTheme) : createTheme(theme)),
+    [isDarkMode]
+  );
+  const colorPalette = useMemo(
+    () => (isDarkMode ? darkColorPalette : defaultColorPalette),
+    [isDarkMode]
+  );
+  const contextValue = useMemo(
+    () => ({ isDarkMode, colorPalette, switchMode }),
+    [isDarkMode, colorPalette, switchMode]
+  );
+
+  return (
+    <ThemeProvider theme={themes}>
+      <ColorModeContext.Provider value={contextValue}>
+        <BackgroundProvider colorPalette={colorPalette} isDarkMode={isDarkMode}>
+          {children}
+        </BackgroundProvider>
+      </ColorModeContext.Provider>
+    </ThemeProvider>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/color-mode/index.ts b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/index.ts
new file mode 100644
index 0000000000..a5d9ebc2d8
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/index.ts
@@ -0,0 +1,2 @@
+export * from './use-color-mode';
+export * from './color-mode';
diff --git a/packages/apps/human-app/frontend/src/shared/hooks/use-color-mode.tsx b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/use-color-mode.tsx
similarity index 62%
rename from packages/apps/human-app/frontend/src/shared/hooks/use-color-mode.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/color-mode/use-color-mode.tsx
index 74ba1d86f5..2e8848e973 100644
--- a/packages/apps/human-app/frontend/src/shared/hooks/use-color-mode.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/color-mode/use-color-mode.tsx
@@ -1,6 +1,5 @@
 import { useContext } from 'react';
-import type { ColorModeContextProps } from '@/shared/contexts/color-mode-context';
-import { ColorModeContext } from '@/shared/contexts/color-mode-context';
+import { type ColorModeContextProps, ColorModeContext } from './color-mode';
 
 export const useColorMode = (): ColorModeContextProps => {
   const context = useContext(ColorModeContext);
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/homepage-state.tsx b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/homepage-state.tsx
similarity index 59%
rename from packages/apps/human-app/frontend/src/shared/contexts/homepage-state.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/homepage-state/homepage-state.tsx
index b75a37f3b7..7b5f0cabba 100644
--- a/packages/apps/human-app/frontend/src/shared/contexts/homepage-state.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/homepage-state.tsx
@@ -1,8 +1,8 @@
-import React, { createContext, useState, useContext } from 'react';
+import React, { createContext, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { routerPaths } from '@/router/router-paths';
 
-export type HomePageStateType = 'welcome' | 'chooseSignUpAccountType';
+type HomePageStateType = 'welcome' | 'chooseSignUpAccountType';
 
 interface HomePageStageContextProps {
   pageView: HomePageStateType;
@@ -15,30 +15,23 @@ export const HomePageStateContext =
 
 export function HomePageStateProvider({
   children,
-}: {
+}: Readonly<{
   children: React.ReactNode;
-}) {
+}>) {
   const [pageView, setPageView] = useState<HomePageStateType>('welcome');
 
   const location = useLocation();
   const isMainPage =
     location.pathname === routerPaths.homePage && pageView === 'welcome';
 
+  const contextValue = useMemo(
+    () => ({ pageView, setPageView, isMainPage }),
+    [pageView, setPageView, isMainPage]
+  );
+
   return (
-    <HomePageStateContext.Provider
-      value={{ pageView, setPageView, isMainPage }}
-    >
+    <HomePageStateContext.Provider value={contextValue}>
       {children}
     </HomePageStateContext.Provider>
   );
 }
-
-export const useHomePageState = () => {
-  const context = useContext(HomePageStateContext);
-  if (!context) {
-    throw new Error(
-      'useHomePageState must be used within a HomePageStageProvider'
-    );
-  }
-  return context;
-};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/index.ts b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/index.ts
new file mode 100644
index 0000000000..781cb6bd33
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/index.ts
@@ -0,0 +1,2 @@
+export * from './homepage-state';
+export * from './use-homepage-state';
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/use-homepage-state.tsx b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/use-homepage-state.tsx
new file mode 100644
index 0000000000..c228db521f
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/homepage-state/use-homepage-state.tsx
@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { HomePageStateContext } from './homepage-state';
+
+export const useHomePageState = () => {
+  const context = useContext(HomePageStateContext);
+  if (!context) {
+    throw new Error(
+      'useHomePageState must be used within a HomePageStageProvider'
+    );
+  }
+  return context;
+};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/index.ts b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/index.ts
new file mode 100644
index 0000000000..8c5fb5fd81
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/index.ts
@@ -0,0 +1,2 @@
+export * from './registered-oracles';
+export * from './use-registered-oracles';
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles.tsx b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/registered-oracles.tsx
similarity index 52%
rename from packages/apps/human-app/frontend/src/shared/contexts/registered-oracles.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/registered-oracles.tsx
index 7e79b0f74b..ad1affa7ed 100644
--- a/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/registered-oracles.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react';
-import { createContext, useContext, useState } from 'react';
+import { createContext, useMemo, useState } from 'react';
 
 interface RegisteredOraclesContextProps {
   registeredOracles: string[] | undefined;
@@ -8,37 +8,27 @@ interface RegisteredOraclesContextProps {
   >;
 }
 
-const RegisteredOraclesContext = createContext<
+export const RegisteredOraclesContext = createContext<
   RegisteredOraclesContextProps | undefined
 >(undefined);
 
 export function RegisteredOraclesProvider({
   children,
-}: {
+}: Readonly<{
   children: ReactNode;
-}) {
+}>) {
   const [registeredOracles, setRegisteredOracles] = useState<
     string[] | undefined
   >(undefined);
 
+  const oraclesContextValue = useMemo(
+    () => ({ registeredOracles, setRegisteredOracles }),
+    [registeredOracles, setRegisteredOracles]
+  );
+
   return (
-    <RegisteredOraclesContext.Provider
-      value={{
-        registeredOracles,
-        setRegisteredOracles,
-      }}
-    >
+    <RegisteredOraclesContext.Provider value={oraclesContextValue}>
       {children}
     </RegisteredOraclesContext.Provider>
   );
 }
-
-export const useRegisteredOracles = () => {
-  const context = useContext(RegisteredOraclesContext);
-  if (!context) {
-    throw new Error(
-      'useRegisteredOracles must be used within a RegisteredOraclesProvider'
-    );
-  }
-  return context;
-};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/use-registered-oracles.tsx b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/use-registered-oracles.tsx
new file mode 100644
index 0000000000..76907c3efc
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/registered-oracles/use-registered-oracles.tsx
@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { RegisteredOraclesContext } from './registered-oracles';
+
+export const useRegisteredOracles = () => {
+  const context = useContext(RegisteredOraclesContext);
+  if (!context) {
+    throw new Error(
+      'useRegisteredOracles must be used within a RegisteredOraclesProvider'
+    );
+  }
+  return context;
+};
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect.tsx b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect.tsx
deleted file mode 100644
index 9c48095507..0000000000
--- a/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import type { JsonRpcSigner, BrowserProvider, Eip1193Provider } from 'ethers';
-import React, { createContext, useEffect, useState } from 'react';
-import { type UseMutationResult } from '@tanstack/react-query';
-import {
-  useAppKit,
-  useAppKitAccount,
-  useAppKitNetwork,
-  createAppKit,
-  type AppKitOptions,
-} from '@reown/appkit/react';
-import { WagmiProvider } from 'wagmi';
-import { WagmiAdapter } from '@reown/appkit-adapter-wagmi';
-import { polygonAmoy, polygon } from '@reown/appkit/networks';
-import { env } from '@/shared/env';
-import type { ResponseError } from '@/shared/types/global.type';
-import { useWeb3Provider } from '@/shared/hooks/use-web3-provider';
-import { JsonRpcError } from '@/modules/smart-contracts/json-rpc-error';
-
-const projectId = env.VITE_WALLET_CONNECT_PROJECT_ID;
-
-const metadata = {
-  name: env.VITE_DAPP_META_NAME,
-  description: env.VITE_DAPP_META_DESCRIPTION,
-  url: env.VITE_DAPP_META_URL,
-  icons: env.VITE_DAPP_ICONS,
-};
-
-const networks: AppKitOptions['networks'] = [polygon, polygonAmoy];
-
-const wagmiAdapter = new WagmiAdapter({
-  networks,
-  projectId,
-});
-
-export interface CommonWalletConnectContext {
-  openModal: () => Promise<void>;
-  web3ProviderMutation: UseMutationResult<
-    {
-      provider: BrowserProvider;
-      signer: JsonRpcSigner;
-    },
-    ResponseError,
-    Eip1193Provider
-  >;
-  initializing: boolean;
-}
-
-interface ConnectedAccount {
-  isConnected: true;
-  chainId: number;
-  address: string;
-  signMessage: (message: string) => Promise<string | undefined>;
-}
-
-interface DisconnectedAccount {
-  isConnected: false;
-  chainId?: never;
-  address?: never;
-  signMessage?: (message: string) => Promise<string | undefined>;
-}
-
-export type WalletConnectContextConnectedAccount = CommonWalletConnectContext &
-  ConnectedAccount;
-
-type WalletConnectContextDisconnectedAccount = CommonWalletConnectContext &
-  DisconnectedAccount;
-
-export const WalletConnectContext = createContext<
-  | WalletConnectContextConnectedAccount
-  | WalletConnectContextDisconnectedAccount
-  | null
->(null);
-
-createAppKit({
-  adapters: [wagmiAdapter],
-  networks,
-  projectId,
-  metadata,
-});
-
-export function WalletConnectProvider({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const [initializing, setInitializing] = useState(true);
-  const web3ProviderMutation = useWeb3Provider();
-  const { open } = useAppKit();
-  const { address, isConnected } = useAppKitAccount();
-  const { chainId } = useAppKitNetwork();
-
-  const openModal = async () => {
-    await open();
-  };
-
-  useEffect(() => {
-    if (
-      web3ProviderMutation.status === 'error' ||
-      web3ProviderMutation.status === 'success'
-    ) {
-      setInitializing(false);
-    }
-  }, [web3ProviderMutation]);
-
-  return (
-    <WagmiProvider config={wagmiAdapter.wagmiConfig}>
-      <WalletConnectContext.Provider
-        value={
-          isConnected && address && chainId && web3ProviderMutation.data
-            ? {
-                isConnected: true,
-                address,
-                chainId: Number(chainId),
-                web3ProviderMutation,
-                openModal,
-                signMessage: async (message: string) => {
-                  try {
-                    const signature =
-                      await web3ProviderMutation.data.signer.signMessage(
-                        message
-                      );
-                    return signature;
-                  } catch (error) {
-                    throw new JsonRpcError(error);
-                  }
-                },
-                initializing,
-              }
-            : {
-                isConnected: false,
-                web3ProviderMutation,
-                openModal,
-                signMessage: async (message: string) => {
-                  if (web3ProviderMutation.data) {
-                    try {
-                      const signature =
-                        await web3ProviderMutation.data.signer.signMessage(
-                          message
-                        );
-                      return signature;
-                    } catch (error) {
-                      throw new JsonRpcError(error);
-                    }
-                  }
-                  return Promise.resolve(undefined);
-                },
-                initializing,
-              }
-        }
-      >
-        {children}
-      </WalletConnectContext.Provider>
-    </WagmiProvider>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/index.ts b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/index.ts
new file mode 100644
index 0000000000..c0af686fdd
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/index.ts
@@ -0,0 +1,4 @@
+export * from './wallet-connect';
+export * from './use-wallet-connect';
+export * from './require-wallet-connect';
+export * from './use-connected-wallet';
diff --git a/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-wallet-connect.tsx b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/require-wallet-connect.tsx
similarity index 63%
rename from packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-wallet-connect.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/require-wallet-connect.tsx
index 0327362c89..66416f1930 100644
--- a/packages/apps/human-app/frontend/src/modules/auth-web3/providers/require-wallet-connect.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/require-wallet-connect.tsx
@@ -1,14 +1,16 @@
 import { useLocation, Navigate } from 'react-router-dom';
 import { createContext } from 'react';
-import { useWalletConnect } from '@/shared/hooks/use-wallet-connect';
-import type { WalletConnectContextConnectedAccount } from '@/shared/contexts/wallet-connect';
 import { routerPaths } from '@/router/router-paths';
-import { PageCardLoader } from '@/shared/components/ui/page-card-loader';
+import { PageCardLoader } from '@/shared/components/ui/page-card';
+import { type WalletConnectContextConnectedAccount } from './types';
+import { useWalletConnect } from './use-wallet-connect';
 
-export const AuthWeb3Context =
+export const ConnectedWalletContext =
   createContext<WalletConnectContextConnectedAccount | null>(null);
 
-export function RequireWalletConnect({ children }: { children: JSX.Element }) {
+export function RequireWalletConnect({
+  children,
+}: Readonly<{ children: JSX.Element }>) {
   const walletConnect = useWalletConnect();
   const location = useLocation();
 
@@ -27,8 +29,8 @@ export function RequireWalletConnect({ children }: { children: JSX.Element }) {
   }
 
   return (
-    <AuthWeb3Context.Provider value={walletConnect}>
+    <ConnectedWalletContext.Provider value={walletConnect}>
       {children}
-    </AuthWeb3Context.Provider>
+    </ConnectedWalletContext.Provider>
   );
 }
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/types.ts b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/types.ts
new file mode 100644
index 0000000000..a8c6673407
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/types.ts
@@ -0,0 +1,35 @@
+import type { JsonRpcSigner, BrowserProvider, Eip1193Provider } from 'ethers';
+import { type UseMutationResult } from '@tanstack/react-query';
+import type { ResponseError } from '@/shared/types/global.type';
+
+interface CommonWalletConnectContext {
+  openModal: () => Promise<void>;
+  web3ProviderMutation: UseMutationResult<
+    {
+      provider: BrowserProvider;
+      signer: JsonRpcSigner;
+    },
+    ResponseError,
+    Eip1193Provider
+  >;
+  initializing: boolean;
+  signMessage: (message: string) => Promise<string | undefined>;
+}
+
+interface ConnectedAccount {
+  isConnected: true;
+  chainId: number;
+  address: string;
+}
+
+interface DisconnectedAccount {
+  isConnected: false;
+  chainId?: never;
+  address?: never;
+}
+
+export type WalletConnectContextConnectedAccount = CommonWalletConnectContext &
+  ConnectedAccount;
+
+export type WalletConnectContextDisconnectedAccount =
+  CommonWalletConnectContext & DisconnectedAccount;
diff --git a/packages/apps/human-app/frontend/src/modules/auth-web3/hooks/use-connected-wallet.tsx b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-connected-wallet.tsx
similarity index 65%
rename from packages/apps/human-app/frontend/src/modules/auth-web3/hooks/use-connected-wallet.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-connected-wallet.tsx
index cecc1ce0cb..a550595d8e 100644
--- a/packages/apps/human-app/frontend/src/modules/auth-web3/hooks/use-connected-wallet.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-connected-wallet.tsx
@@ -1,8 +1,8 @@
 import { useContext } from 'react';
-import { AuthWeb3Context } from '@/modules/auth-web3/providers/require-wallet-connect';
+import { ConnectedWalletContext } from './require-wallet-connect';
 
 export const useConnectedWallet = () => {
-  const context = useContext(AuthWeb3Context);
+  const context = useContext(ConnectedWalletContext);
 
   if (!context) {
     throw new Error(
diff --git a/packages/apps/human-app/frontend/src/shared/hooks/use-wallet-connect.tsx b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-wallet-connect.tsx
similarity index 76%
rename from packages/apps/human-app/frontend/src/shared/hooks/use-wallet-connect.tsx
rename to packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-wallet-connect.tsx
index b0a24495b8..84272f5097 100644
--- a/packages/apps/human-app/frontend/src/shared/hooks/use-wallet-connect.tsx
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/use-wallet-connect.tsx
@@ -1,5 +1,5 @@
 import { useContext } from 'react';
-import { WalletConnectContext } from '@/shared/contexts/wallet-connect';
+import { WalletConnectContext } from './wallet-connect';
 
 export const useWalletConnect = () => {
   const context = useContext(WalletConnectContext);
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/wallet-connect.tsx b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/wallet-connect.tsx
new file mode 100644
index 0000000000..5ef56aa933
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/shared/contexts/wallet-connect/wallet-connect.tsx
@@ -0,0 +1,132 @@
+import React, {
+  createContext,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import {
+  useAppKit,
+  useAppKitAccount,
+  useAppKitNetwork,
+  createAppKit,
+  type AppKitOptions,
+} from '@reown/appkit/react';
+import { WagmiProvider } from 'wagmi';
+import { WagmiAdapter } from '@reown/appkit-adapter-wagmi';
+import { polygonAmoy, polygon } from '@reown/appkit/networks';
+import { env } from '@/shared/env';
+import { useWeb3Provider } from '@/shared/hooks/use-web3-provider';
+import { JsonRpcError } from '@/modules/smart-contracts/json-rpc-error';
+import {
+  type WalletConnectContextConnectedAccount,
+  type WalletConnectContextDisconnectedAccount,
+} from './types';
+
+const projectId = env.VITE_WALLET_CONNECT_PROJECT_ID;
+
+const metadata = {
+  name: env.VITE_DAPP_META_NAME,
+  description: env.VITE_DAPP_META_DESCRIPTION,
+  url: env.VITE_DAPP_META_URL,
+  icons: env.VITE_DAPP_ICONS,
+};
+
+const networks: AppKitOptions['networks'] = [polygon, polygonAmoy];
+
+const wagmiAdapter = new WagmiAdapter({
+  networks,
+  projectId,
+});
+
+createAppKit({
+  adapters: [wagmiAdapter],
+  networks,
+  projectId,
+  metadata,
+});
+
+export const WalletConnectContext = createContext<
+  | WalletConnectContextConnectedAccount
+  | WalletConnectContextDisconnectedAccount
+  | null
+>(null);
+
+export function WalletConnectProvider({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  const [initializing, setInitializing] = useState(true);
+  const web3ProviderMutation = useWeb3Provider();
+  const { open } = useAppKit();
+  const { address, isConnected } = useAppKitAccount();
+  const { chainId } = useAppKitNetwork();
+
+  useEffect(() => {
+    if (
+      web3ProviderMutation.status === 'error' ||
+      web3ProviderMutation.status === 'success'
+    ) {
+      setInitializing(false);
+    }
+  }, [web3ProviderMutation]);
+
+  const openModal = useCallback(async () => {
+    await open();
+  }, [open]);
+
+  const signMessage = useCallback(
+    async (message: string) => {
+      if (web3ProviderMutation.data) {
+        try {
+          const signature =
+            await web3ProviderMutation.data.signer.signMessage(message);
+          return signature;
+        } catch (error) {
+          throw new JsonRpcError(error);
+        }
+      }
+    },
+    [web3ProviderMutation.data]
+  );
+
+  const isReady =
+    isConnected && address && chainId && web3ProviderMutation.data;
+
+  const contextValue = useMemo(() => {
+    return isReady
+      ? ({
+          isConnected: true,
+          address,
+          chainId: Number(chainId),
+          web3ProviderMutation,
+          openModal,
+          signMessage,
+          initializing,
+        } satisfies WalletConnectContextConnectedAccount)
+      : ({
+          isConnected: false,
+          web3ProviderMutation,
+          openModal,
+          signMessage,
+          initializing,
+        } satisfies WalletConnectContextDisconnectedAccount);
+  }, [
+    isReady,
+    address,
+    chainId,
+    web3ProviderMutation,
+    openModal,
+    signMessage,
+    initializing,
+  ]);
+
+  return (
+    <WagmiProvider config={wagmiAdapter.wagmiConfig}>
+      <WalletConnectContext.Provider value={contextValue}>
+        {children}
+      </WalletConnectContext.Provider>
+    </WagmiProvider>
+  );
+}
diff --git a/packages/apps/human-app/frontend/src/shared/env.ts b/packages/apps/human-app/frontend/src/shared/env.ts
index 5ba7f86733..a65c1bb2f5 100644
--- a/packages/apps/human-app/frontend/src/shared/env.ts
+++ b/packages/apps/human-app/frontend/src/shared/env.ts
@@ -10,7 +10,6 @@ const envSchema = z.object({
   VITE_NAVBAR__LINK__HOW_IT_WORK_URL: z.string(),
   VITE_HUMAN_SUPPORT_EMAIL: z.string(),
   VITE_HUMAN_PROTOCOL_HELP_URL: z.string(),
-  VITE_WALLET_CONNECT_MODAL_LINK: z.string(),
   VITE_H_CAPTCHA_SITE_KEY: z.string(),
   VITE_HMT_DAILY_SPENT_LIMIT: z
     .string()
@@ -59,7 +58,6 @@ try {
   validEnvs = envSchema.parse(import.meta.env);
 } catch (error) {
   if (error instanceof ZodError) {
-    console.error('Invalid .env file');
     error.issues.forEach((issue) => {
       console.error('Invalid env:', issue.path.join());
       console.error(issue);
diff --git a/packages/apps/human-app/frontend/src/shared/hooks/use-background-store.tsx b/packages/apps/human-app/frontend/src/shared/hooks/use-background-store.tsx
deleted file mode 100644
index ae869639c8..0000000000
--- a/packages/apps/human-app/frontend/src/shared/hooks/use-background-store.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useContext } from 'react';
-import type { BackgroundContextProps } from '@/shared/contexts/background-color-store';
-import { BackgroundContext } from '@/shared/contexts/background-color-store';
-
-export const useBackgroundColorStore = (): BackgroundContextProps => {
-  const context = useContext(BackgroundContext);
-  if (!context) {
-    throw new Error(
-      'useBackgroundColor must be used within a BackgroundProvider'
-    );
-  }
-  return context;
-};
diff --git a/packages/apps/human-app/frontend/src/shared/hooks/use-handle-main-nav-icon-click.tsx b/packages/apps/human-app/frontend/src/shared/hooks/use-handle-main-nav-icon-click.tsx
index 0c5a01f880..1e81c7d114 100644
--- a/packages/apps/human-app/frontend/src/shared/hooks/use-handle-main-nav-icon-click.tsx
+++ b/packages/apps/human-app/frontend/src/shared/hooks/use-handle-main-nav-icon-click.tsx
@@ -1,8 +1,8 @@
 import { useNavigate } from 'react-router-dom';
 import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
-import { useHomePageState } from '@/shared/contexts/homepage-state';
 import { routerPaths } from '@/router/router-paths';
+import { useHomePageState } from '../contexts/homepage-state/use-homepage-state';
 
 export const useHandleMainNavIconClick = () => {
   const navigate = useNavigate();
diff --git a/packages/apps/human-app/frontend/src/shared/hooks/use-notification.tsx b/packages/apps/human-app/frontend/src/shared/hooks/use-notification.tsx
index 8a22eb3aee..a3e465c621 100644
--- a/packages/apps/human-app/frontend/src/shared/hooks/use-notification.tsx
+++ b/packages/apps/human-app/frontend/src/shared/hooks/use-notification.tsx
@@ -1,9 +1,8 @@
 import { useCallback } from 'react';
 import { type SnackbarKey, useSnackbar } from 'notistack';
 import CloseIcon from '@mui/icons-material/Close';
-import { useColorMode } from '@/shared/hooks/use-color-mode';
+import { useColorMode } from '@/shared/contexts/color-mode';
 import { colorPalette as lightColorPalette } from '@/shared/styles/color-palette';
-import { breakpoints } from '@/shared/styles/breakpoints';
 
 export enum TopNotificationType {
   SUCCESS = 'success',
@@ -64,9 +63,6 @@ export const useNotification = () => {
           fontSize: 14,
           fontWeight: 600,
           letterSpacing: 0.1,
-          [breakpoints.mobile]: {
-            fontSize: 14,
-          },
         },
         action,
       });
diff --git a/packages/apps/human-app/frontend/src/shared/i18n/en.json b/packages/apps/human-app/frontend/src/shared/i18n/en.json
index 3d9ea2209f..6afaf11bf1 100644
--- a/packages/apps/human-app/frontend/src/shared/i18n/en.json
+++ b/packages/apps/human-app/frontend/src/shared/i18n/en.json
@@ -39,7 +39,9 @@
     "jsonRpcError": "JSON-RPC error",
     "unsupportedNetwork": "Network selected in wallet is unsupported.",
     "unsupportedNetworkWithName": "Network '{{networkName}}' is unsupported.",
-    "invalidEscrowAddress": "Please enter a valid escrow address."
+    "invalidEscrowAddress": "Please enter a valid escrow address.",
+    "noAddress": "No wallet address found.",
+    "cannotSignMessage": "Cannot sign message."
   },
   "components": {
     "multiSelect": {
@@ -394,7 +396,7 @@
   },
   "walletConnectModal": {
     "header": "Connect Wallet",
-    "paragraph": "HUMAN App is a multichain platform, please provide a wallet address which will be compatible with different chains. <1>Learn more or FAQ link.</1>",
+    "paragraph": "HUMAN App is a multichain platform, please provide a wallet address which will be compatible with different chains.",
     "connectBtn": "Connect Wallet",
     "cancelBtn": "Cancel"
   },
diff --git a/packages/apps/human-app/frontend/src/shared/styles/breakpoints.ts b/packages/apps/human-app/frontend/src/shared/styles/breakpoints.ts
index 6842a5b2e2..bb898d161c 100644
--- a/packages/apps/human-app/frontend/src/shared/styles/breakpoints.ts
+++ b/packages/apps/human-app/frontend/src/shared/styles/breakpoints.ts
@@ -1,4 +1,4 @@
 export const breakpoints = {
-  mobile: '@media (maxWidth:900px)',
-  tablet: '@media (maxWidth:1200px)',
+  mobile: '@media (max-width:900px)',
+  tablet: '@media (max-width:1200px)',
 };
diff --git a/packages/apps/human-app/server/.dockerignore b/packages/apps/human-app/server/.dockerignore
deleted file mode 100644
index 1d7d55faac..0000000000
--- a/packages/apps/human-app/server/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Dockerfile
-.dockerignore
-node_modules
-npm-debug.log
-dist
\ No newline at end of file
diff --git a/packages/apps/human-app/server/Dockerfile b/packages/apps/human-app/server/Dockerfile
index 2d5efe5498..6e355e5ccb 100644
--- a/packages/apps/human-app/server/Dockerfile
+++ b/packages/apps/human-app/server/Dockerfile
@@ -1,17 +1,27 @@
-# Base image
-FROM node:18
+FROM node:18-slim
+ARG APP_PATH=packages/apps/human-app/server
 
 # Create app directory
 WORKDIR /usr/src/app
 
-# Bundle app source
-COPY . .
+# Copy expected yarn dist
+COPY .yarn ./.yarn
+COPY .yarnrc ./
+# Copy files for deps installation
+COPY package.json yarn.lock ./
+COPY ${APP_PATH}/package.json ./${APP_PATH}/package.json
+# Some deps are referenced as "*", so we need to build them
+COPY tsconfig.json ./
+COPY packages/core ./packages/core
+COPY packages/sdk ./packages/sdk
 
-# Install app dependencies
 RUN yarn install
 
-# Creates a "dist" folder with the production build
-RUN yarn workspace @human-protocol/human-app-server build
+# Copy everything else to ensure proper build process
+COPY . .
+
+WORKDIR ./${APP_PATH}
+RUN yarn build
 
-# Start the server using the production build
-CMD [ "node", "packages/apps/human-app/server/dist/src/main.js" ]
+# Start the server using the build
+CMD [ "yarn", "start:prod" ]
\ No newline at end of file
diff --git a/packages/apps/human-app/server/ENV.md b/packages/apps/human-app/server/ENV.md
index f96c11e2ae..d6a4dbc63a 100644
--- a/packages/apps/human-app/server/ENV.md
+++ b/packages/apps/human-app/server/ENV.md
@@ -7,79 +7,91 @@ HOST="localhost"
 PORT="5000"
 
 ### The URL of the reputation oracle service. Required
-REPUTATION_ORACLE_URL=
+GIT_HASH=
 
 ### The address of the reputation oracle service. Required
-REPUTATION_ORACLE_ADDRESS=
+REPUTATION_ORACLE_URL=
 
 ### Flag indicating if Axios request logging is enabled. Default: false
-IS_AXIOS_REQUEST_LOGGING_ENABLED="false"
+REPUTATION_ORACLE_ADDRESS="false"
 
 ### The allowed host for the application. Required
-ALLOWED_HOST=
+IS_AXIOS_REQUEST_LOGGING_ENABLED=
 
 ### The port number for the Redis cache server. Required
-REDIS_PORT=
+ALLOWED_HOST=
 
 ### The hostname or IP address of the Redis cache server. Required
+REDIS_PORT=
+
+### The DB number of the Redis cache server
 REDIS_HOST=
 
 ### The cache time-to-live (TTL) for oracle statistics. Default: 12 hours
-CACHE_TTL_ORACLE_STATS="12 hours"
+REDIS_DB="12 hours"
 
 ### The cache time-to-live (TTL) for user statistics. Default: 15 minutes
-CACHE_TTL_USER_STATS="15 minutes"
+CACHE_TTL_ORACLE_STATS="15 minutes"
 
 ### The cache time-to-live (TTL) for daily HMT spent data. Default: 24 hours
-CACHE_TTL_DAILY_HMT_SPENT="24 hours"
+CACHE_TTL_USER_STATS="24 hours"
 
 ### The cache time-to-live (TTL) for hCaptcha user statistics. Default: 12 hours
-CACHE_TTL_HCAPTCHA_USER_STATS="12 hours"
+CACHE_TTL_DAILY_HMT_SPENT="12 hours"
 
 ### The cache time-to-live (TTL) for oracle discovery. Default: 24 hours
-CACHE_TTL_ORACLE_DISCOVERY="24 hours"
+CACHE_TTL_HCAPTCHA_USER_STATS="24 hours"
+
+### Number of days without updates assignments data is retained. Default: 45 days
+CACHE_TTL_ORACLE_DISCOVERY="45 days"
 
 ### The RPC URL used for communication. Required
-RPC_URL=
+JOB_ASSIGNMENTS_DATA_RETENTION_DAYS=
 
 ### Flag indicating if CORS is enabled. Default: false
-CORS_ENABLED="false"
+RPC_URL="false"
 
 ### The allowed origin for CORS requests. Default: 'http://localhost:5173'
-CORS_ALLOWED_ORIGIN="http://localhost:5173"
+CORS_ENABLED="http://localhost:5173"
 
 ### The allowed headers for CORS requests. Default: 'Content-Type,Authorization,X-Requested-With,Accept,Origin'
-CORS_ALLOWED_HEADERS="Content-Type,Authorization,X-Requested-With,Accept,Origin"
+CORS_ALLOWED_ORIGIN="Content-Type,Authorization,X-Requested-With,Accept,Origin"
 
 ### The cache time-to-live (TTL) for exchange oracle URLs. Default: 24 hours
+CORS_ALLOWED_HEADERS="24 hours"
+
+### The cache time-to-live (TTL) for job types. Default: 24 hours
 CACHE_TTL_EXCHANGE_ORACLE_URL="24 hours"
 
 ### The cache time-to-live (TTL) for exchange oracle registration needed. Default: 24 hours
-CACHE_TTL_EXCHANGE_ORACLE_REGISTRATION_NEEDED="24 hours"
+CACHE_TTL_JOB_TYPES="24 hours"
 
 ### The API URL for hCaptcha labeling statistics. Required
-HCAPTCHA_LABELING_STATS_API_URL=
+CACHE_TTL_EXCHANGE_ORACLE_REGISTRATION_NEEDED=
 
 ### The API URL for hCaptcha labeling verification. Required
-HCAPTCHA_LABELING_VERIFY_API_URL=
+HCAPTCHA_LABELING_STATS_API_URL=
 
 ### The API key for hCaptcha labeling. Required
-HCAPTCHA_LABELING_API_KEY=
+HCAPTCHA_LABELING_VERIFY_API_URL=
 
 ### The list of enabled chain IDs. Required
-CHAIN_IDS_ENABLED=
+HCAPTCHA_LABELING_API_KEY=
 
 ### Flag indicating if the cache should be restarted. Default: false
-IS_CACHE_TO_RESTART="false"
+CHAIN_IDS_ENABLED="false"
 
 ### The email address for the human app. Required
-HUMAN_APP_EMAIL=
+IS_CACHE_TO_RESTART=
 
 ### The password for the human app. Required
-HUMAN_APP_PASSWORD=
+HUMAN_APP_EMAIL=
+
+### The maximum number of iteration to skip. Default: 5
+HUMAN_APP_PASSWORD="5"
 
-### The maximum number of retries for requests. Default: 5
-MAX_REQUEST_RETRIES="5"
+### Feature flag for job discovery
+MAX_EXECUTIONS_TO_SKIP=
 
 ### The email address used for end-to-end (E2E) testing. Default: empty string
 E2E_TESTING_EMAIL_ADDRESS="empty string"
diff --git a/packages/apps/human-app/server/package.json b/packages/apps/human-app/server/package.json
index 1889a97d7f..b8a6db3c0c 100644
--- a/packages/apps/human-app/server/package.json
+++ b/packages/apps/human-app/server/package.json
@@ -30,6 +30,8 @@
     "@nestjs/common": "^10.2.7",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.3.10",
+    "@nestjs/platform-express": "^10.3.10",
+    "@nestjs/schedule": "^4.0.1",
     "@nestjs/swagger": "^7.4.2",
     "@nestjs/terminus": "^10.2.3",
     "cache-manager": "^5.4.0",
@@ -38,7 +40,10 @@
     "class-validator": "^0.14.1",
     "ethers": "^6.12.1",
     "joi": "^17.13.3",
+    "jsonwebtoken": "^9.0.2",
+    "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
@@ -47,6 +52,8 @@
     "@nestjs/testing": "^10.4.6",
     "@types/express": "^4.17.13",
     "@types/jest": "29.5.12",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/lodash": "^4.17.14",
     "@types/node": "22.10.5",
     "@types/supertest": "^2.0.15",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
diff --git a/packages/apps/human-app/server/src/app.module.ts b/packages/apps/human-app/server/src/app.module.ts
index 35c816d192..58ec0021da 100644
--- a/packages/apps/human-app/server/src/app.module.ts
+++ b/packages/apps/human-app/server/src/app.module.ts
@@ -58,6 +58,7 @@ const JOI_BOOLEAN_STRING_SCHEMA = Joi.string().valid('true', 'false');
         REPUTATION_ORACLE_ADDRESS: Joi.string().required(),
         REDIS_PORT: Joi.number().required(),
         REDIS_HOST: Joi.string().required(),
+        REDIS_DB: Joi.number(),
         RPC_URL: Joi.string().required(),
         HCAPTCHA_LABELING_STATS_API_URL: Joi.string().required(),
         HCAPTCHA_LABELING_VERIFY_API_URL: Joi.string().required(),
diff --git a/packages/apps/human-app/server/src/common/config/cache-factory.config.ts b/packages/apps/human-app/server/src/common/config/cache-factory.config.ts
index 31f98f895a..53b06b8793 100644
--- a/packages/apps/human-app/server/src/common/config/cache-factory.config.ts
+++ b/packages/apps/human-app/server/src/common/config/cache-factory.config.ts
@@ -21,6 +21,7 @@ export const CacheFactoryConfig: CacheModuleAsyncOptions = {
         host: configService.cacheHost,
         port: configService.cachePort,
       },
+      database: configService.cacheDbNumber,
       disableOfflineQueue: true,
     });
 
diff --git a/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts b/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
index 09a419b3be..2e0b9e0a68 100644
--- a/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
+++ b/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
@@ -25,27 +25,27 @@ describe('EnvironmentConfigService', () => {
   });
 
   it('should return an array of valid ChainIds when CHAIN_IDS_ENABLED is valid', () => {
-    (configService.getOrThrow as jest.Mock).mockReturnValue('1, 4, 80002');
+    (configService.getOrThrow as jest.Mock).mockReturnValue('1, 11155111, 80002');
 
     const result = service.chainIdsEnabled;
 
     expect(result).toEqual([
       ChainId.MAINNET,
-      ChainId.RINKEBY,
+      ChainId.SEPOLIA,
       ChainId.POLYGON_AMOY,
     ]);
   });
 
   it('should ignore invalid chain IDs and only return valid ChainIds', () => {
     (configService.getOrThrow as jest.Mock).mockReturnValue(
-      '1, 4, 99999, 80002',
+      '1, 11155111, 99999, 80002',
     );
 
     const result = service.chainIdsEnabled;
 
     expect(result).toEqual([
       ChainId.MAINNET,
-      ChainId.RINKEBY,
+      ChainId.SEPOLIA,
       ChainId.POLYGON_AMOY,
     ]);
   });
diff --git a/packages/apps/human-app/server/src/common/config/environment-config.service.ts b/packages/apps/human-app/server/src/common/config/environment-config.service.ts
index 8621f011fa..fd7b513dce 100644
--- a/packages/apps/human-app/server/src/common/config/environment-config.service.ts
+++ b/packages/apps/human-app/server/src/common/config/environment-config.service.ts
@@ -92,6 +92,13 @@ export class EnvironmentConfigService {
     return this.configService.getOrThrow<string>('REDIS_HOST');
   }
 
+  /**
+   * The DB number of the Redis cache server
+   */
+  get cacheDbNumber(): number {
+    return this.configService.get<number>('REDIS_DB', 0);
+  }
+
   /**
    * The cache time-to-live (TTL) for oracle statistics.
    * Default: 12 hours
diff --git a/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.spec.ts
index a65bb4c01b..ae7a4f0bf5 100644
--- a/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -200,4 +200,38 @@ describe('TransformEnumInterceptor', () => {
     });
     expect(callHandler.handle).toHaveBeenCalled();
   });
+
+  it('should return bodyOrQuery if instance is not an object', () => {
+    // Test with `null` as the instance
+    let result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      null,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with `undefined` as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      undefined,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with a primitive value (string) as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      'some string',
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  
+    // Test with a primitive value (number) as the instance
+    result = interceptor['lowercaseEnumProperties']( 
+      { status: 'PENDING' }, 
+      123,
+      MockDto
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  });
 });
diff --git a/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.ts b/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.ts
index 62309328a1..d24d146f34 100644
--- a/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.ts
+++ b/packages/apps/human-app/server/src/common/interceptors/transform-enum.interceptor.ts
@@ -83,6 +83,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
     instance: any,
     targetClass: ClassConstructor<any>,
   ): any {
+    if (!instance || typeof instance !== 'object') {
+      return bodyOrQuery;
+    }
+
     for (const property in bodyOrQuery) {
       if (bodyOrQuery.hasOwnProperty(property)) {
         const instanceValue = instance[property];
diff --git a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.fixture.ts b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.fixture.ts
index 37dd12011d..ff121ffba7 100644
--- a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.fixture.ts
+++ b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.fixture.ts
@@ -39,7 +39,7 @@ const response3: DiscoveredOracle = {
 };
 const response4: DiscoveredOracle = {
   address: '0xd83422155c058D78e4D5fB5f50E125F06eb39d',
-  chainId: ChainId.MOONBASE_ALPHA,
+  chainId: ChainId.BSC_TESTNET,
   role: 'role3',
   url: 'common-url',
   jobTypes: ['job-type-1', 'job-type-3', 'job-type-4'],
diff --git a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
index 5bbcc85dba..7d041cc051 100644
--- a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
+++ b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
@@ -30,7 +30,7 @@ jest.mock('@human-protocol/sdk', () => {
 
 describe('OracleDiscoveryService', () => {
   const EXCHANGE_ORACLE = 'Exchange Oracle';
-  const EXPECTED_CHAIN_IDS = [ChainId.POLYGON_AMOY, ChainId.MOONBASE_ALPHA];
+  const EXPECTED_CHAIN_IDS = [ChainId.POLYGON_AMOY, ChainId.BSC_TESTNET];
   const REPUTATION_ORACLE_ADDRESS = 'the_oracle';
   const TTL = '300';
   const JOB_TYPES = 'job-type-1,job-type-2,job-type-3';
diff --git a/packages/apps/job-launcher/client/Dockerfile b/packages/apps/job-launcher/client/Dockerfile
new file mode 100644
index 0000000000..ece5e34e0b
--- /dev/null
+++ b/packages/apps/job-launcher/client/Dockerfile
@@ -0,0 +1,28 @@
+# Using bullseye instead of slim because it needs Python and build tools for node-gyp
+FROM node:18-bullseye
+ARG APP_PATH=packages/apps/job-launcher/client
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Copy expected yarn dist
+COPY .yarn ./.yarn
+COPY .yarnrc ./
+# Copy files for deps installation
+COPY package.json yarn.lock ./
+COPY ${APP_PATH}/package.json ./${APP_PATH}/package.json
+# Some deps are referenced as "*", so we need to build them
+COPY tsconfig.json ./
+COPY packages/core ./packages/core
+COPY packages/sdk ./packages/sdk
+
+RUN yarn install
+
+# Copy everything else to ensure proper build process
+COPY . .
+
+WORKDIR ./${APP_PATH}
+RUN yarn build
+
+# Start the server using the build
+CMD [ "yarn", "start:prod" ]
\ No newline at end of file
diff --git a/packages/apps/job-launcher/client/src/components/Icons/AvalancheIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/AvalancheIcon.tsx
deleted file mode 100644
index 3bc44f307e..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/AvalancheIcon.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const AvalancheIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon width="16" height="14" viewBox="0 0 16 14" fill="none" {...props}>
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M3.95284 13.9997H1.30457C0.748105 13.9997 0.473205 13.9997 0.305573 13.8923C0.12457 13.7747 0.0139269 13.58 0.000512986 13.3652C-0.00952634 13.1671 0.127903 12.9254 0.402803 12.4419L6.94173 0.898892C7.21997 0.408722 7.36077 0.163658 7.53844 0.0729996C7.72953 -0.0243332 7.95748 -0.0243332 8.14856 0.0729996C8.32623 0.163658 8.46704 0.408722 8.74527 0.898892L10.0895 3.24899L10.0964 3.26099C10.3969 3.78686 10.5493 4.05351 10.6158 4.33338C10.6896 4.6389 10.6896 4.96119 10.6158 5.2667C10.5488 5.54873 10.3979 5.81733 10.0929 6.35114L6.65814 12.4319L6.64924 12.4474C6.34672 12.9776 6.19343 13.2463 5.98095 13.4491C5.74967 13.6707 5.47144 13.8318 5.16638 13.9225C4.88814 13.9997 4.57638 13.9997 3.95284 13.9997ZM10.6406 14H14.4354C14.9953 14 15.2768 14 15.4445 13.8892C15.6255 13.7717 15.7394 13.5736 15.7495 13.3588C15.7592 13.1672 15.6247 12.9348 15.3612 12.4795C15.3522 12.464 15.3431 12.4482 15.3338 12.4322L13.4331 9.1756L13.4114 9.13898C13.1443 8.68657 13.0094 8.45816 12.8364 8.36986C12.6453 8.27249 12.4207 8.27249 12.2296 8.36986C12.0553 8.46048 11.9145 8.69887 11.6363 9.17894L9.74224 12.4355L9.73575 12.4467C9.45848 12.926 9.31991 13.1656 9.32991 13.3621C9.34333 13.577 9.45393 13.7751 9.63497 13.8926C9.79923 14 10.0808 14 10.6406 14Z"
-        fill="#320A8D"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M3.95284 13.9997H1.30457C0.748105 13.9997 0.473205 13.9997 0.305573 13.8923C0.12457 13.7747 0.0139269 13.58 0.000512986 13.3652C-0.00952634 13.1671 0.127903 12.9254 0.402803 12.4419L6.94173 0.898892C7.21997 0.408722 7.36077 0.163658 7.53844 0.0729996C7.72953 -0.0243332 7.95748 -0.0243332 8.14856 0.0729996C8.32623 0.163658 8.46704 0.408722 8.74527 0.898892L10.0895 3.24899L10.0964 3.26099C10.3969 3.78686 10.5493 4.05351 10.6158 4.33338C10.6896 4.6389 10.6896 4.96119 10.6158 5.2667C10.5488 5.54873 10.3979 5.81733 10.0929 6.35114L6.65814 12.4319L6.64924 12.4474C6.34672 12.9776 6.19343 13.2463 5.98095 13.4491C5.74967 13.6707 5.47144 13.8318 5.16638 13.9225C4.88814 13.9997 4.57638 13.9997 3.95284 13.9997ZM10.6406 14H14.4354C14.9953 14 15.2768 14 15.4445 13.8892C15.6255 13.7717 15.7394 13.5736 15.7495 13.3588C15.7592 13.1672 15.6247 12.9348 15.3612 12.4795C15.3522 12.464 15.3431 12.4482 15.3338 12.4322L13.4331 9.1756L13.4114 9.13898C13.1443 8.68657 13.0094 8.45816 12.8364 8.36986C12.6453 8.27249 12.4207 8.27249 12.2296 8.36986C12.0553 8.46048 11.9145 8.69887 11.6363 9.17894L9.74224 12.4355L9.73575 12.4467C9.45848 12.926 9.31991 13.1656 9.32991 13.3621C9.34333 13.577 9.45393 13.7751 9.63497 13.8926C9.79923 14 10.0808 14 10.6406 14Z"
-        fill="#320A8D"
-      />
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/CeloIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/CeloIcon.tsx
deleted file mode 100644
index 4e217297a5..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/CeloIcon.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const CeloIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon width="17" height="15" viewBox="0 0 17 15" fill="none" {...props}>
-      <path
-        d="M 5.921875 13.421875 C 8.320312 13.421875 10.261719 11.476562 10.261719 9.078125 C 10.261719 6.679688 8.320312 4.738281 5.921875 4.738281 C 3.523438 4.738281 1.578125 6.679688 1.578125 9.078125 C 1.578125 11.476562 3.523438 13.421875 5.921875 13.421875 Z M 5.921875 15 C 2.652344 15 0 12.347656 0 9.078125 C 0 5.808594 2.652344 3.15625 5.921875 3.15625 C 9.191406 3.15625 11.84375 5.808594 11.84375 9.078125 C 11.84375 12.347656 9.191406 15 5.921875 15 Z M 9.078125 10.261719 C 11.476562 10.261719 13.421875 8.320312 13.421875 5.921875 C 13.421875 3.523438 11.476562 1.578125 9.078125 1.578125 C 6.679688 1.578125 4.738281 3.523438 4.738281 5.921875 C 4.738281 8.320312 6.679688 10.261719 9.078125 10.261719 Z M 9.078125 11.84375 C 5.808594 11.84375 3.15625 9.191406 3.15625 5.921875 C 3.15625 2.652344 5.808594 0 9.078125 0 C 12.347656 0 15 2.652344 15 5.921875 C 15 9.191406 12.347656 11.84375 9.078125 11.84375 Z M 9.273438 11.84375 C 9.683594 11.34375 9.980469 10.761719 10.136719 10.136719 C 10.761719 9.980469 11.34375 9.683594 11.84375 9.273438 C 11.820312 10 11.664062 10.714844 11.382812 11.382812 C 10.714844 11.664062 10 11.820312 9.273438 11.84375 Z M 4.863281 4.863281 C 4.238281 5.019531 3.65625 5.316406 3.15625 5.726562 C 3.179688 5 3.335938 4.285156 3.617188 3.617188 C 4.285156 3.339844 5.003906 3.179688 5.726562 3.15625 C 5.316406 3.65625 5.019531 4.238281 4.863281 4.863281 Z M 4.863281 4.863281"
-        fill="currentColor"
-      />
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/MoonbaseAlphaIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/MoonbaseAlphaIcon.tsx
deleted file mode 100644
index 12f3e55cf8..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/MoonbaseAlphaIcon.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const MoonbaseAlphaIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon width="18" height="15" viewBox="0 0 18 15" fill="none" {...props}>
-      <path
-        d="M10.3332 5.76973C12.0285 5.76973 13.7238 5.76973 15.4189 5.76973C15.4515 5.76973 15.4843 5.76742 15.5169 5.76884C15.633 5.77433 15.7412 5.65805 15.7558 5.56089C15.769 5.474 15.7591 5.38816 15.7583 5.3018C15.7561 5.09757 15.7364 4.89422 15.7077 4.69282C15.6691 4.42187 15.6108 4.15375 15.529 3.89218C15.4636 3.68282 15.39 3.47629 15.3007 3.27506C15.2143 3.08074 15.1179 2.89226 15.0129 2.70768C14.9079 2.52256 14.7882 2.34735 14.6617 2.17693C14.5255 1.99375 14.3768 1.82103 14.218 1.65697C14.0898 1.52459 13.9544 1.40035 13.8149 1.28001C13.6293 1.11985 13.4315 0.976848 13.2265 0.843585C13.0586 0.73439 12.8826 0.639177 12.7032 0.549804C12.5571 0.477066 12.407 0.413532 12.2555 0.354068C12.1015 0.293542 11.9436 0.244696 11.7848 0.198859C11.711 0.177445 11.6373 0.153376 11.5619 0.139749C11.3785 0.106831 11.1973 0.0629413 11.0111 0.0440048C10.8416 0.0268381 10.6726 0.00613187 10.5022 0.00170746C10.2124 -0.00572555 9.92426 0.00860955 9.63634 0.0473674C9.41185 0.0774534 9.19054 0.119928 8.97134 0.176206C8.90791 0.192488 8.84623 0.214079 8.78333 0.230892C8.59408 0.281684 8.41154 0.35159 8.23145 0.428221C8.1222 0.474766 8.01542 0.52662 7.90882 0.579359C7.74142 0.662184 7.57967 0.754388 7.42337 0.855619C7.18638 1.00888 6.96224 1.17966 6.75132 1.36814C6.52314 1.57184 6.31328 1.79236 6.12139 2.03057C6.00122 2.17958 5.8895 2.33461 5.78607 2.49619C5.68299 2.65742 5.58572 2.822 5.50009 2.99314C5.4185 3.15596 5.34186 3.32126 5.27772 3.49186C5.22838 3.62318 5.17869 3.75449 5.13887 3.88882C5.09446 4.03872 5.05993 4.1918 5.0238 4.344C5.00601 4.41904 4.99121 4.49514 4.98063 4.57159C4.95297 4.77105 4.92266 4.97015 4.91385 5.17172C4.90892 5.2864 4.90381 5.40144 4.90663 5.51612C4.90909 5.61699 4.96055 5.6915 5.04882 5.74265C5.10345 5.77433 5.16142 5.76937 5.21904 5.76937C6.92365 5.76973 8.62827 5.76973 10.3327 5.76973H10.3332ZM10.3387 6.7438C8.27409 6.7438 6.20967 6.7438 4.14507 6.7438C4.10771 6.7438 4.07035 6.74469 4.03317 6.74805C3.89203 6.76062 3.78191 6.85795 3.74261 7.00307C3.70843 7.12926 3.76429 7.28075 3.87336 7.35632C3.94313 7.40463 4.02119 7.41826 4.10524 7.41826C8.26 7.41755 12.4148 7.41755 16.5695 7.41755C16.5766 7.41755 16.5836 7.41755 16.5905 7.41755C16.7438 7.4195 16.8729 7.33278 16.9212 7.17793C16.9711 7.01759 16.8756 6.82468 16.7314 6.77159C16.6682 6.74823 16.6046 6.74363 16.5392 6.74363C14.4723 6.74363 12.4054 6.74363 10.3385 6.74363L10.3387 6.7438ZM9.59722 9.77506C7.77367 9.77506 5.95012 9.77506 4.12639 9.77506C4.10295 9.77506 4.07969 9.77417 4.05643 9.77541C3.9093 9.78267 3.7923 9.87469 3.74649 10.0186C3.70702 10.1425 3.76058 10.2957 3.8693 10.3817C3.94172 10.4391 4.02436 10.4509 4.11264 10.4509C7.76909 10.4506 11.4257 10.4506 15.0822 10.4506C15.0963 10.4506 15.1102 10.4511 15.1241 10.4506C15.1949 10.4474 15.2617 10.4336 15.32 10.3876C15.428 10.3021 15.48 10.1915 15.458 10.0557C15.4395 9.94159 15.3768 9.8547 15.2665 9.80603C15.209 9.78072 15.1502 9.77506 15.0889 9.77506C13.2583 9.77541 11.4276 9.77523 9.59705 9.77523L9.59722 9.77506ZM12.4407 11.9639C13.94 11.9639 15.4395 11.9639 16.9388 11.9639C16.9714 11.9639 17.0042 11.9618 17.0368 11.9616C17.1339 11.9611 17.207 11.9161 17.2742 11.8476C17.3991 11.7207 17.3841 11.4664 17.222 11.3523C17.1506 11.302 17.0719 11.2944 16.9892 11.2944C13.9671 11.2946 10.9448 11.2946 7.92274 11.2946C7.8993 11.2946 7.87605 11.2944 7.85261 11.2948C7.81261 11.2955 7.77208 11.2992 7.73614 11.3156C7.61438 11.3712 7.54143 11.4659 7.53033 11.6013C7.51817 11.7485 7.59218 11.8515 7.71112 11.9251C7.77702 11.966 7.85367 11.9639 7.92856 11.9639C9.43265 11.9639 10.9367 11.9639 12.4408 11.9639H12.4407ZM6.09972 8.93088C7.61315 8.93088 9.12658 8.93088 10.64 8.93088C10.668 8.93088 10.696 8.93053 10.7241 8.92999C10.7549 8.92946 10.784 8.92203 10.8116 8.90823C10.9262 8.85142 10.9919 8.76364 11.0102 8.63267C11.0384 8.43163 10.87 8.26244 10.7119 8.26562C10.6816 8.26633 10.6513 8.26332 10.621 8.26332C7.60821 8.26332 4.59545 8.26332 1.58251 8.26332C1.55678 8.26332 1.53088 8.26173 1.5055 8.26474C1.46868 8.26916 1.43062 8.26598 1.3952 8.28138C1.16737 8.38048 1.10446 8.66134 1.29476 8.84752C1.36242 8.91371 1.44542 8.93176 1.53828 8.93176C3.05876 8.93053 4.57906 8.93088 6.09954 8.93088H6.09972ZM12.5221 12.8063C11.5926 12.8063 10.6631 12.8063 9.73378 12.8063C9.69872 12.8063 9.66365 12.8056 9.62912 12.8125C9.5019 12.8382 9.41608 12.9113 9.37397 13.0353C9.3315 13.1604 9.35794 13.2712 9.44604 13.3664C9.52163 13.448 9.61749 13.4795 9.72867 13.4795C11.5829 13.4785 13.4371 13.4788 15.2913 13.4788C15.3029 13.4788 15.3147 13.4786 15.3264 13.4788C15.4543 13.4811 15.6046 13.3811 15.648 13.2509C15.6978 13.101 15.6296 12.8985 15.4675 12.8353C15.402 12.8097 15.3361 12.8067 15.2684 12.8067C14.353 12.8067 13.4375 12.8067 12.5221 12.8067V12.8063ZM9.05645 14.3258C8.12943 14.3258 7.20224 14.3258 6.27522 14.326C6.24491 14.326 6.2146 14.3278 6.18447 14.3304C6.06659 14.3407 5.98589 14.4051 5.93655 14.5095C5.874 14.6419 5.89708 14.8079 6.01514 14.9056C6.09091 14.9684 6.17813 14.9992 6.27927 14.9991C7.84856 14.9978 9.41767 14.9982 10.987 14.9982C11.2765 14.9982 11.5661 14.9999 11.8557 14.9973C11.9963 14.996 12.1052 14.9314 12.1751 14.8076C12.2447 14.6842 12.2093 14.4796 12.0768 14.3856C12.0067 14.3361 11.9319 14.3257 11.8518 14.3257C10.92 14.3257 9.98822 14.3257 9.05662 14.3257L9.05645 14.3258ZM4.36039 11.2944C3.639 11.2944 2.91762 11.2944 2.19623 11.2944C2.14002 11.2944 2.08275 11.2944 2.03183 11.3197C1.90302 11.3832 1.83677 11.4873 1.83906 11.6338C1.84135 11.7763 1.9143 11.8687 2.03729 11.9299C2.10284 11.9627 2.17191 11.9637 2.24204 11.9637C3.64993 11.9637 5.05763 11.9637 6.46552 11.9637C6.48878 11.9637 6.51221 11.9634 6.53547 11.9628C6.58745 11.9618 6.63679 11.9503 6.68296 11.926C6.7885 11.8703 6.85934 11.7889 6.87026 11.6655C6.88225 11.5285 6.83555 11.4197 6.71855 11.3417C6.656 11.2999 6.58816 11.2948 6.51803 11.2948C5.79893 11.2944 5.07984 11.2948 4.36074 11.2948L4.36039 11.2944ZM8.50316 13.4802C8.69646 13.4815 8.83601 13.3263 8.83654 13.1473C8.83707 12.9559 8.69205 12.8118 8.50898 12.8072C8.34035 12.8031 8.17295 12.9415 8.17278 13.1452C8.17278 13.3316 8.32185 13.4811 8.50316 13.4801V13.4802ZM4.72267 14.6573C4.70928 14.8674 4.8994 15.0017 5.05217 14.9996C5.21816 14.9973 5.37868 14.8568 5.3845 14.6676C5.38943 14.5035 5.2504 14.3255 5.0527 14.3246C4.86909 14.3237 4.70998 14.4816 4.72249 14.6573H4.72267ZM0.983406 11.9634C1.173 11.9658 1.31538 11.8158 1.31591 11.6307C1.31661 11.4447 1.17494 11.2953 0.985521 11.2946C0.798743 11.2939 0.653549 11.4379 0.652316 11.6282C0.651259 11.8154 0.793985 11.9643 0.98323 11.9634H0.983406ZM3.21259 10.1168C3.22263 9.92602 3.06122 9.77364 2.88114 9.77647C2.70124 9.7793 2.55358 9.91504 2.55199 10.1136C2.5504 10.2993 2.69718 10.4483 2.88149 10.4502C3.0755 10.4523 3.22298 10.2814 3.21259 10.1166V10.1168ZM0.332855 8.93088C0.513642 8.94398 0.665179 8.77001 0.663417 8.59657C0.661655 8.42278 0.525448 8.26173 0.329859 8.26244C0.146605 8.26315 0.000706971 8.41145 2.14823e-06 8.59905C-0.000702675 8.79178 0.172155 8.94734 0.332855 8.93088ZM3.21276 7.08324C3.22263 6.89884 3.06404 6.74416 2.87973 6.74575C2.69965 6.74734 2.55252 6.89547 2.55199 7.0767C2.55129 7.27633 2.69771 7.41685 2.88326 7.41755C3.07779 7.41844 3.2214 7.25686 3.21276 7.08324Z"
-        fill="white"
-      />
-      <path
-        d="M10.3331 5.76977C8.62845 5.76977 6.92384 5.76977 5.2194 5.76942C5.16178 5.76942 5.10399 5.77438 5.04919 5.7427C4.96091 5.69155 4.90928 5.61704 4.90699 5.51617C4.90435 5.40149 4.90928 5.28663 4.91421 5.17177C4.92302 4.97037 4.95315 4.7711 4.98099 4.57164C4.99157 4.49519 5.00637 4.41909 5.02417 4.34405C5.06029 4.19168 5.09482 4.03877 5.13923 3.88887C5.17887 3.75454 5.22874 3.62305 5.27808 3.49191C5.34204 3.3213 5.41887 3.15601 5.50045 2.99319C5.58609 2.82205 5.68335 2.65764 5.78643 2.49624C5.88969 2.33466 6.00158 2.17963 6.12175 2.03061C6.31364 1.79258 6.5235 1.57189 6.75169 1.36819C6.9626 1.17971 7.18691 1.00893 7.42374 0.855668C7.58003 0.754437 7.74196 0.662232 7.90918 0.579407C8.01579 0.526668 8.12239 0.474637 8.23181 0.428269C8.4119 0.351639 8.59427 0.281733 8.78369 0.230941C8.8466 0.213951 8.90827 0.192537 8.9717 0.176255C9.1909 0.119976 9.41204 0.0775019 9.6367 0.0474159C9.92462 0.00883503 10.2127 -0.00567705 10.5026 0.00175596C10.673 0.00618038 10.842 0.0268866 11.0115 0.0440534C11.1977 0.0629898 11.379 0.106703 11.5623 0.139798C11.6377 0.153425 11.7113 0.177494 11.7852 0.198908C11.9439 0.244745 12.102 0.29359 12.2558 0.354116C12.4075 0.413757 12.5575 0.477115 12.7036 0.549852C12.8828 0.639225 13.059 0.734616 13.2269 0.843633C13.4318 0.97672 13.6295 1.11972 13.8152 1.28006C13.9548 1.4004 14.0901 1.52464 14.2184 1.65702C14.3773 1.82107 14.5259 1.9938 14.6621 2.17697C14.7888 2.3474 14.9082 2.52279 15.0133 2.70773C15.1181 2.89231 15.2147 3.08079 15.301 3.27511C15.3903 3.47634 15.464 3.68287 15.5294 3.89223C15.611 4.1538 15.6693 4.42192 15.708 4.69287C15.7368 4.89427 15.7563 5.09744 15.7586 5.30185C15.7595 5.38821 15.7694 5.47405 15.7562 5.56094C15.7414 5.6581 15.6332 5.77438 15.5172 5.76889C15.4846 5.7673 15.4518 5.76977 15.4192 5.76977C13.724 5.76977 12.0287 5.76977 10.3336 5.76977H10.3331Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M10.3383 6.74371C12.4052 6.74371 14.4721 6.74371 16.5389 6.74371C16.6043 6.74371 16.6678 6.74832 16.7312 6.77168C16.8753 6.82477 16.9708 7.01767 16.921 7.17801C16.8727 7.33305 16.7435 7.41959 16.5902 7.41764C16.5832 7.41764 16.5761 7.41764 16.5693 7.41764C12.4145 7.41764 8.25974 7.41764 4.10499 7.41835C4.02094 7.41835 3.94288 7.40472 3.8731 7.35641C3.76403 7.28084 3.70835 7.12935 3.74236 7.00316C3.78165 6.85804 3.89195 6.7607 4.03292 6.74814C4.0701 6.74478 4.10745 6.74389 4.14481 6.74389C6.20941 6.74371 8.27384 6.74389 10.3384 6.74389L10.3383 6.74371Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M9.5969 9.77513C11.4275 9.77513 13.2581 9.77513 15.0887 9.77495C15.15 9.77495 15.2087 9.78061 15.2663 9.80592C15.3766 9.85459 15.4394 9.94149 15.4579 10.0556C15.4799 10.1914 15.4281 10.302 15.3199 10.3875C15.2616 10.4337 15.195 10.4473 15.1239 10.4505C15.11 10.4512 15.0959 10.4505 15.082 10.4505C11.4256 10.4505 7.76894 10.4505 4.1125 10.4508C4.02422 10.4508 3.94158 10.439 3.86916 10.3816C3.76044 10.2956 3.70687 10.1424 3.74634 10.0185C3.79216 9.87441 3.90916 9.78256 4.05629 9.7753C4.07955 9.77424 4.10298 9.77495 4.12624 9.77495C5.9498 9.77495 7.77335 9.77495 9.59708 9.77495L9.5969 9.77513Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M12.4401 11.964C10.936 11.964 9.4319 11.964 7.92781 11.964C7.85292 11.964 7.77645 11.9661 7.71037 11.9252C7.59161 11.8516 7.5176 11.7486 7.52959 11.6014C7.54069 11.466 7.61364 11.3713 7.73539 11.3157C7.77134 11.2993 7.81204 11.2957 7.85187 11.2948C7.8753 11.2945 7.89856 11.2947 7.922 11.2947C10.9441 11.2947 13.9664 11.2947 16.9885 11.2945C17.0711 11.2945 17.1499 11.3023 17.2213 11.3524C17.3834 11.4665 17.3983 11.7207 17.2734 11.8477C17.2063 11.916 17.1332 11.9612 17.0361 11.9617C17.0035 11.9617 16.9707 11.964 16.9381 11.964C15.4388 11.964 13.9392 11.964 12.4399 11.964H12.4401Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M6.09988 8.93098C4.5794 8.93098 3.0591 8.93062 1.53862 8.93186C1.44576 8.93186 1.36276 8.91381 1.2951 8.84762C1.1048 8.66144 1.16771 8.3804 1.39554 8.28147C1.43096 8.26608 1.46902 8.26926 1.50584 8.26484C1.53122 8.26183 1.55712 8.26342 1.58285 8.26342C4.59561 8.26342 7.60838 8.26342 10.6213 8.26342C10.6516 8.26342 10.6819 8.26625 10.7122 8.26572C10.8703 8.26236 11.0387 8.43173 11.0106 8.63277C10.9921 8.76373 10.9265 8.85151 10.812 8.90832C10.7841 8.92213 10.7552 8.92938 10.7244 8.93009C10.6964 8.93062 10.6684 8.93098 10.6404 8.93098C9.12692 8.93098 7.61349 8.93098 6.10006 8.93098H6.09988Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M12.5215 12.8063C13.4368 12.8063 14.3524 12.8063 15.2678 12.8063C15.3355 12.8063 15.4014 12.8095 15.4669 12.835C15.629 12.8982 15.6972 13.1007 15.6473 13.2506C15.604 13.3808 15.4537 13.481 15.3258 13.4785C15.3141 13.4783 15.3023 13.4785 15.2907 13.4785C13.4365 13.4785 11.5823 13.4781 9.72807 13.4792C9.61688 13.4792 9.52102 13.4479 9.44543 13.3661C9.35733 13.2711 9.3309 13.1601 9.37336 13.035C9.41548 12.9109 9.50129 12.8378 9.62851 12.8122C9.66322 12.8053 9.69811 12.806 9.73318 12.806C10.6627 12.806 11.5921 12.806 12.5215 12.806V12.8063Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M9.05612 14.326C9.9879 14.326 10.9197 14.326 11.8513 14.326C11.9314 14.326 12.0063 14.3363 12.0763 14.386C12.2088 14.4798 12.2444 14.6846 12.1746 14.808C12.1047 14.9318 11.9958 14.9964 11.8552 14.9977C11.5656 15.0003 11.276 14.9986 10.9865 14.9986C9.41717 14.9986 7.84806 14.9982 6.27877 14.9994C6.17763 14.9994 6.09041 14.9688 6.01464 14.906C5.89676 14.8081 5.87367 14.6423 5.93605 14.5099C5.98539 14.4053 6.06591 14.3409 6.18397 14.3308C6.2141 14.3282 6.24441 14.3264 6.27472 14.3264C7.20173 14.3262 8.12893 14.3262 9.05595 14.3262L9.05612 14.326Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M4.36061 11.2947C5.0797 11.2947 5.7988 11.2947 6.51789 11.2947C6.58802 11.2947 6.65586 11.2998 6.71841 11.3416C6.83559 11.4198 6.88229 11.5286 6.87013 11.6654C6.8592 11.7888 6.78837 11.8702 6.68282 11.9259C6.63648 11.9504 6.58714 11.9617 6.53534 11.9628C6.51208 11.9633 6.48864 11.9636 6.46538 11.9636C5.0575 11.9636 3.64979 11.9636 2.24191 11.9636C2.17195 11.9636 2.10288 11.9624 2.03716 11.9298C1.91416 11.8686 1.84104 11.7762 1.83892 11.6338C1.83663 11.4872 1.90289 11.3832 2.03169 11.3196C2.08262 11.2945 2.13988 11.2943 2.19609 11.2943C2.91748 11.2945 3.63887 11.2943 4.36025 11.2943L4.36061 11.2947Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M8.50324 13.4804C8.32192 13.4815 8.17285 13.3318 8.17285 13.1456C8.17285 12.9419 8.34042 12.8035 8.50905 12.8076C8.69213 12.812 8.83697 12.9562 8.83662 13.1477C8.83609 13.3267 8.69671 13.4817 8.50324 13.4806V13.4804Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M4.72239 14.6576C4.7097 14.4819 4.86899 14.3242 5.0526 14.3249C5.2503 14.3258 5.3895 14.5038 5.38439 14.6679C5.37858 14.8571 5.21806 14.9976 5.05207 14.9999C4.89912 15.002 4.70917 14.8677 4.72257 14.6576H4.72239Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M0.983266 11.9634C0.794021 11.9643 0.651118 11.8155 0.652352 11.6282C0.653409 11.438 0.798779 11.2939 0.985557 11.2946C1.17498 11.2953 1.31665 11.4449 1.31594 11.6307C1.31524 11.8158 1.17304 11.9659 0.983442 11.9634H0.983266Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M3.21236 10.1169C3.22258 10.2816 3.07528 10.4526 2.88127 10.4505C2.69714 10.4483 2.55036 10.2995 2.55177 10.1139C2.55335 9.91511 2.70101 9.77937 2.88092 9.77671C3.061 9.77388 3.22241 9.92626 3.21236 10.117V10.1169Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M0.332855 8.93096C0.172155 8.94742 -0.000702675 8.79185 2.14823e-06 8.59913C0.000706971 8.41153 0.146605 8.26322 0.329859 8.26252C0.525271 8.26163 0.661478 8.42268 0.663417 8.59665C0.665179 8.77026 0.513642 8.94405 0.332855 8.93096Z"
-        fill="#320A8D"
-      />
-      <path
-        d="M3.21253 7.08329C3.22134 7.25691 3.07773 7.41849 2.88303 7.4176C2.69748 7.4169 2.55106 7.2762 2.55176 7.07675C2.55229 6.89552 2.69942 6.74739 2.8795 6.7458C3.06381 6.74421 3.2224 6.89906 3.21253 7.08329Z"
-        fill="#320A8D"
-      />
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/MoonbeamIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/MoonbeamIcon.tsx
deleted file mode 100644
index 920a23e75a..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/MoonbeamIcon.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const MoonbeamIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon width="20" height="17" viewBox="0 0 20 17" fill="none" {...props}>
-      <g clipPath="url(#clip0_291_7076)">
-        <path
-          d="M11.711 6.53923C13.6323 6.53923 15.5536 6.53923 17.4747 6.53923C17.5117 6.53923 17.5488 6.53662 17.5858 6.53823C17.7174 6.54444 17.84 6.41267 17.8566 6.30255C17.8715 6.20407 17.8604 6.10679 17.8594 6.00891C17.857 5.77745 17.8346 5.54699 17.802 5.31874C17.7583 5.01166 17.6922 4.70779 17.5995 4.41135C17.5255 4.17407 17.442 3.94 17.3407 3.71195C17.2429 3.49172 17.1336 3.27811 17.0146 3.06891C16.8956 2.85911 16.76 2.66054 16.6166 2.46739C16.4623 2.2598 16.2937 2.06404 16.1138 1.87811C15.9684 1.72808 15.815 1.58727 15.6569 1.45088C15.4466 1.26937 15.2223 1.1073 14.9901 0.95627C14.7998 0.832516 14.6003 0.724608 14.397 0.623318C14.2314 0.540883 14.0613 0.468877 13.8895 0.401484C13.715 0.332888 13.5361 0.27753 13.3561 0.225581C13.2725 0.201312 13.189 0.174034 13.1035 0.15859C12.8956 0.121283 12.6903 0.071541 12.4792 0.0500797C12.2871 0.0306241 12.0956 0.00715698 11.9025 0.00214264C11.574 -0.00628144 11.2475 0.009965 10.9212 0.0538906C10.6668 0.087988 10.4159 0.136126 10.1675 0.199908C10.0956 0.218361 10.0257 0.242831 9.95444 0.261885C9.73996 0.31945 9.53307 0.398676 9.32898 0.485524C9.20516 0.538275 9.08415 0.597043 8.96333 0.656814C8.77361 0.750682 8.59029 0.855181 8.41316 0.969909C8.14456 1.14361 7.89054 1.33716 7.6515 1.55077C7.39289 1.78163 7.15505 2.03154 6.93757 2.30152C6.80138 2.4704 6.67477 2.6461 6.55755 2.82922C6.44072 3.01195 6.33049 3.19848 6.23343 3.39243C6.14097 3.57696 6.0541 3.7643 5.98141 3.95765C5.9255 4.10647 5.86918 4.2553 5.82405 4.40754C5.77372 4.57742 5.73458 4.75092 5.69364 4.92341C5.67347 5.00845 5.6567 5.0947 5.64472 5.18135C5.61336 5.40739 5.57902 5.63304 5.56903 5.86149C5.56344 5.99146 5.55765 6.12184 5.56084 6.25181C5.56364 6.36613 5.62195 6.45058 5.722 6.50854C5.78391 6.54444 5.84961 6.53883 5.91491 6.53883C7.84681 6.53923 9.7787 6.53923 11.7104 6.53923H11.711ZM11.7172 7.64319C9.37731 7.64319 7.03762 7.64319 4.69774 7.64319C4.6554 7.64319 4.61307 7.64419 4.57093 7.648C4.41097 7.66224 4.28616 7.77255 4.24163 7.93703C4.20288 8.08003 4.26619 8.25173 4.3898 8.33737C4.46888 8.39213 4.55735 8.40757 4.65261 8.40757C9.36133 8.40677 14.0701 8.40677 18.7788 8.40677C18.7868 8.40677 18.7948 8.40677 18.8025 8.40677C18.9763 8.40897 19.1227 8.31069 19.1774 8.13519C19.2339 7.95347 19.1257 7.73485 18.9623 7.67468C18.8906 7.6482 18.8185 7.64298 18.7444 7.64298C16.4019 7.64298 14.0595 7.64298 11.717 7.64298L11.7172 7.64319ZM10.8769 11.0786C8.81016 11.0786 6.74347 11.0786 4.67657 11.0786C4.65001 11.0786 4.62365 11.0776 4.59729 11.079C4.43054 11.0872 4.29794 11.1915 4.24602 11.3546C4.20129 11.495 4.262 11.6687 4.38521 11.7662C4.46729 11.8312 4.56095 11.8446 4.661 11.8446C8.80497 11.8442 12.9491 11.8442 17.0931 11.8442C17.1091 11.8442 17.1249 11.8448 17.1406 11.8442C17.2209 11.8406 17.2966 11.8249 17.3627 11.7728C17.4851 11.6759 17.544 11.5506 17.5191 11.3967C17.4981 11.2673 17.427 11.1689 17.302 11.1137C17.2369 11.085 17.1702 11.0786 17.1007 11.0786C15.026 11.079 12.9513 11.0788 10.8767 11.0788L10.8769 11.0786ZM14.0994 13.5593C15.7987 13.5593 17.4981 13.5593 19.1973 13.5593C19.2343 13.5593 19.2714 13.5569 19.3084 13.5567C19.4184 13.5561 19.5013 13.5051 19.5774 13.4275C19.719 13.2837 19.702 12.9955 19.5183 12.8661C19.4374 12.8092 19.3481 12.8005 19.2545 12.8005C15.8294 12.8007 12.4042 12.8007 8.9791 12.8007C8.95255 12.8007 8.92618 12.8005 8.89962 12.8009C8.85429 12.8017 8.80836 12.8059 8.76762 12.8246C8.62963 12.8876 8.54695 12.9949 8.53437 13.1483C8.52059 13.3152 8.60447 13.4319 8.73927 13.5154C8.81395 13.5617 8.90082 13.5593 8.98569 13.5593C10.6903 13.5593 12.395 13.5593 14.0996 13.5593H14.0994ZM6.91301 10.1219C8.62823 10.1219 10.3435 10.1219 12.0587 10.1219C12.0904 10.1219 12.1222 10.1215 12.1539 10.1209C12.1889 10.1203 12.2218 10.1118 12.2532 10.0962C12.383 10.0318 12.4575 9.93233 12.4782 9.78391C12.5102 9.55605 12.3193 9.36431 12.1402 9.36792C12.1058 9.36872 12.0715 9.36531 12.0371 9.36531C8.62264 9.36531 5.20817 9.36531 1.79351 9.36531C1.76435 9.36531 1.73499 9.3635 1.70624 9.36691C1.6645 9.37193 1.62137 9.36832 1.58123 9.38577C1.32301 9.49809 1.25172 9.8164 1.4674 10.0274C1.54408 10.1024 1.63814 10.1229 1.74338 10.1229C3.46659 10.1215 5.1896 10.1219 6.91281 10.1219H6.91301ZM14.1917 14.514C13.1383 14.514 12.0848 14.514 11.0316 14.514C10.9919 14.514 10.9521 14.5132 10.913 14.521C10.7688 14.5501 10.6716 14.633 10.6238 14.7736C10.5757 14.9154 10.6057 15.0409 10.7055 15.1488C10.7912 15.2413 10.8998 15.277 11.0258 15.277C13.1273 15.2758 15.2287 15.2762 17.3302 15.2762C17.3433 15.2762 17.3567 15.276 17.3699 15.2762C17.5149 15.2788 17.6852 15.1655 17.7343 15.0179C17.7909 14.848 17.7136 14.6185 17.5299 14.5469C17.4556 14.5178 17.3809 14.5144 17.3042 14.5144C16.2668 14.5144 15.2291 14.5144 14.1917 14.5144V14.514ZM10.264 16.2361C9.21335 16.2361 8.16253 16.2361 7.11191 16.2363C7.07756 16.2363 7.04322 16.2384 7.00907 16.2414C6.87547 16.253 6.784 16.326 6.72809 16.4443C6.6572 16.5944 6.68336 16.7825 6.81715 16.8932C6.90303 16.9644 7.00188 16.9993 7.1165 16.9991C8.89503 16.9977 10.6734 16.9981 12.4519 16.9981C12.78 16.9981 13.1083 17.0001 13.4364 16.9971C13.5958 16.9957 13.7192 16.9225 13.7985 16.7821C13.8773 16.6423 13.8372 16.4104 13.687 16.3039C13.6075 16.2478 13.5229 16.2359 13.432 16.2359C12.376 16.2359 11.32 16.2359 10.2642 16.2359L10.264 16.2361ZM4.94177 12.8005C4.1242 12.8005 3.30663 12.8005 2.48906 12.8005C2.42536 12.8005 2.36045 12.8005 2.30274 12.8292C2.15676 12.9012 2.08167 13.0192 2.08427 13.1852C2.08687 13.3467 2.16954 13.4514 2.30893 13.5208C2.38322 13.5579 2.4615 13.5591 2.54098 13.5591C4.13658 13.5591 5.73199 13.5591 7.32759 13.5591C7.35395 13.5591 7.38051 13.5587 7.40687 13.5581C7.46578 13.5569 7.5217 13.5439 7.57402 13.5164C7.69364 13.4532 7.77392 13.3609 7.7863 13.2211C7.79988 13.0659 7.74696 12.9425 7.61436 12.8541C7.54346 12.8067 7.46658 12.8009 7.3871 12.8009C6.57212 12.8005 5.75715 12.8009 4.94217 12.8009L4.94177 12.8005ZM9.63692 15.2778C9.85599 15.2792 10.0141 15.1033 10.0147 14.9005C10.0153 14.6835 9.85099 14.5202 9.64351 14.515C9.45239 14.5104 9.26268 14.6673 9.26248 14.8981C9.26248 15.1093 9.43143 15.2788 9.63692 15.2776V15.2778ZM5.35236 16.6118C5.33718 16.8499 5.55266 17.0021 5.7258 16.9997C5.91391 16.9971 6.09584 16.8379 6.10243 16.6235C6.10802 16.4375 5.95046 16.2357 5.72639 16.2347C5.51831 16.2337 5.33798 16.4127 5.35216 16.6118H5.35236ZM1.11453 13.5587C1.3294 13.5615 1.49076 13.3914 1.49136 13.1816C1.49216 12.9708 1.3316 12.8015 1.11692 12.8007C0.905242 12.7999 0.740689 12.9632 0.739291 13.1788C0.738093 13.391 0.89985 13.5597 1.11433 13.5587H1.11453ZM3.64093 11.4659C3.65231 11.2497 3.46939 11.077 3.26529 11.0802C3.0614 11.0834 2.89405 11.2373 2.89225 11.4623C2.89046 11.6727 3.05681 11.8416 3.26569 11.8438C3.48556 11.8462 3.65271 11.6524 3.64093 11.4657V11.4659ZM0.377235 10.1219C0.582127 10.1367 0.753869 9.93955 0.751872 9.74299C0.749875 9.54603 0.595507 9.3635 0.37384 9.36431C0.166153 9.36511 0.000801234 9.53319 2.43466e-06 9.7458C-0.000796365 9.96422 0.195109 10.1405 0.377235 10.1219ZM3.64113 8.02788C3.65231 7.81889 3.47258 7.64359 3.2637 7.64539C3.0596 7.6472 2.89285 7.81508 2.89225 8.02046C2.89146 8.24671 3.05741 8.40597 3.26769 8.40677C3.48816 8.40777 3.65091 8.22465 3.64113 8.02788Z"
-          fill="white"
-        />
-        <path
-          d="M11.7109 6.53922C9.77904 6.53922 7.84715 6.53922 5.91545 6.53882C5.85015 6.53882 5.78465 6.54443 5.72254 6.50853C5.62249 6.45056 5.56398 6.36612 5.56138 6.25179C5.55839 6.12182 5.56398 5.99165 5.56957 5.86148C5.57956 5.63323 5.61371 5.40738 5.64526 5.18133C5.65724 5.09469 5.67401 5.00844 5.69418 4.9234C5.73512 4.7507 5.77426 4.57741 5.82459 4.40752C5.86952 4.25529 5.92604 4.10626 5.98195 3.95764C6.05444 3.76428 6.14151 3.57695 6.23397 3.39242C6.33103 3.19847 6.44126 3.01213 6.55809 2.82921C6.67511 2.64609 6.80192 2.47038 6.93811 2.3015C7.15559 2.03173 7.39343 1.78162 7.65204 1.55076C7.89108 1.33714 8.1453 1.14359 8.4137 0.969895C8.59083 0.855167 8.77435 0.750668 8.96387 0.6568C9.08469 0.597029 9.20551 0.538061 9.32952 0.48551C9.53361 0.398662 9.7403 0.319436 9.95498 0.261871C10.0263 0.242616 10.0962 0.218347 10.1681 0.199894C10.4165 0.136111 10.6671 0.0879739 10.9217 0.0538764C11.248 0.0101514 11.5745 -0.00629564 11.9031 0.00212844C12.0962 0.00714277 12.2877 0.0306099 12.4798 0.0500655C12.6909 0.0715268 12.8964 0.121068 13.104 0.158576C13.1895 0.17402 13.273 0.201298 13.3567 0.225567C13.5366 0.277516 13.7157 0.332874 13.8901 0.40147C14.062 0.469063 14.232 0.540869 14.3975 0.623304C14.6006 0.724594 14.8003 0.832703 14.9906 0.956256C15.2229 1.10709 15.4469 1.26915 15.6574 1.45087C15.8156 1.58726 15.9689 1.72806 16.1143 1.87809C16.2944 2.06402 16.4628 2.25978 16.6172 2.46738C16.7607 2.66053 16.8961 2.8593 17.0152 3.0689C17.134 3.27809 17.2434 3.4917 17.3413 3.71193C17.4425 3.93999 17.526 4.17406 17.6001 4.41133C17.6925 4.70778 17.7586 5.01165 17.8026 5.31873C17.8351 5.54698 17.8573 5.77724 17.8599 6.0089C17.8609 6.10678 17.8721 6.20406 17.8571 6.30254C17.8403 6.41265 17.7177 6.54443 17.5863 6.53821C17.5494 6.53641 17.5122 6.53922 17.4753 6.53922C15.554 6.53922 13.6327 6.53922 11.7115 6.53922H11.7109Z"
-          fill="currentColor"
-        />
-        <path
-          d="M11.717 7.64307C14.0594 7.64307 16.4019 7.64307 18.7444 7.64307C18.8185 7.64307 18.8904 7.64828 18.9623 7.67476C19.1256 7.73493 19.2339 7.95355 19.1774 8.13527C19.1226 8.31098 18.9763 8.40906 18.8025 8.40685C18.7945 8.40685 18.7865 8.40685 18.7788 8.40685C14.07 8.40685 9.36131 8.40685 4.65259 8.40765C4.55733 8.40765 4.46886 8.39221 4.38978 8.33745C4.26617 8.25181 4.20306 8.08012 4.24161 7.93711C4.28614 7.77264 4.41115 7.66232 4.57091 7.64808C4.61305 7.64427 4.65538 7.64327 4.69772 7.64327C7.0376 7.64307 9.37729 7.64327 11.7172 7.64327L11.717 7.64307Z"
-          fill="currentColor"
-        />
-        <path
-          d="M10.8766 11.0786C12.9513 11.0786 15.026 11.0786 17.1007 11.0784C17.1702 11.0784 17.2367 11.0848 17.302 11.1135C17.427 11.1686 17.4981 11.2671 17.519 11.3965C17.544 11.5503 17.4853 11.6757 17.3627 11.7726C17.2966 11.8249 17.2211 11.8404 17.1406 11.844C17.1248 11.8448 17.1089 11.844 17.0931 11.844C12.9491 11.844 8.80494 11.844 4.66097 11.8444C4.56092 11.8444 4.46726 11.8309 4.38519 11.766C4.26197 11.6685 4.20126 11.4948 4.246 11.3544C4.29792 11.1911 4.43052 11.087 4.59727 11.0788C4.62363 11.0776 4.65019 11.0784 4.67655 11.0784C6.74324 11.0784 8.80993 11.0784 10.8768 11.0784L10.8766 11.0786Z"
-          fill="currentColor"
-        />
-        <path
-          d="M14.0993 13.5596C12.3946 13.5596 10.69 13.5596 8.98535 13.5596C8.90048 13.5596 8.81381 13.562 8.73892 13.5156C8.60432 13.4322 8.52045 13.3155 8.53403 13.1486C8.54661 12.9951 8.62928 12.8878 8.76728 12.8249C8.80802 12.8062 8.85415 12.8022 8.89928 12.8012C8.92584 12.8008 8.9522 12.801 8.97876 12.801C12.4038 12.801 15.8291 12.801 19.2541 12.8008C19.3478 12.8008 19.437 12.8096 19.5179 12.8664C19.7016 12.9957 19.7186 13.2838 19.577 13.4278C19.5009 13.5052 19.4181 13.5563 19.308 13.5569C19.2711 13.5569 19.2339 13.5596 19.197 13.5596C17.4978 13.5596 15.7983 13.5596 14.0991 13.5596H14.0993Z"
-          fill="currentColor"
-        />
-        <path
-          d="M6.91286 10.1218C5.18965 10.1218 3.46664 10.1214 1.74343 10.1228C1.63819 10.1228 1.54413 10.1023 1.46745 10.0273C1.25177 9.81631 1.32307 9.4978 1.58128 9.38568C1.62142 9.36823 1.66455 9.37184 1.70629 9.36683C1.73505 9.36342 1.7644 9.36522 1.79356 9.36522C5.20803 9.36522 8.62249 9.36522 12.0372 9.36522C12.0715 9.36522 12.1059 9.36843 12.1402 9.36783C12.3193 9.36402 12.5102 9.55597 12.4783 9.78382C12.4573 9.93224 12.383 10.0317 12.2532 10.0961C12.2217 10.1118 12.1889 10.12 12.154 10.1208C12.1222 10.1214 12.0905 10.1218 12.0587 10.1218C10.3435 10.1218 8.62829 10.1218 6.91306 10.1218H6.91286Z"
-          fill="currentColor"
-        />
-        <path
-          d="M14.1915 14.5141C15.229 14.5141 16.2666 14.5141 17.304 14.5141C17.3807 14.5141 17.4554 14.5177 17.5297 14.5466C17.7134 14.6182 17.7907 14.8476 17.7342 15.0175C17.6851 15.1652 17.5147 15.2787 17.3698 15.2759C17.3566 15.2757 17.3432 15.2759 17.33 15.2759C15.2286 15.2759 13.1271 15.2755 11.0257 15.2767C10.8997 15.2767 10.791 15.2412 10.7054 15.1485C10.6055 15.0408 10.5756 14.915 10.6237 14.7732C10.6714 14.6326 10.7687 14.5498 10.9129 14.5207C10.9522 14.5129 10.9917 14.5137 11.0315 14.5137C12.0849 14.5137 13.1383 14.5137 14.1915 14.5137V14.5141Z"
-          fill="currentColor"
-        />
-        <path
-          d="M10.2637 16.2363C11.3198 16.2363 12.3758 16.2363 13.4316 16.2363C13.5224 16.2363 13.6073 16.248 13.6866 16.3043C13.8368 16.4106 13.8771 16.6427 13.798 16.7825C13.7187 16.9229 13.5953 16.9961 13.436 16.9975C13.1079 17.0005 12.7796 16.9985 12.4514 16.9985C10.6729 16.9985 8.8946 16.9981 7.11607 16.9995C7.00144 16.9995 6.90259 16.9648 6.81672 16.8936C6.68312 16.7827 6.65696 16.5948 6.72765 16.4447C6.78357 16.3262 6.87483 16.2532 7.00863 16.2417C7.04278 16.2387 7.07713 16.2367 7.11148 16.2367C8.1621 16.2365 9.21292 16.2365 10.2635 16.2365L10.2637 16.2363Z"
-          fill="currentColor"
-        />
-        <path
-          d="M4.94183 12.8007C5.75681 12.8007 6.57178 12.8007 7.38676 12.8007C7.46624 12.8007 7.54312 12.8065 7.61402 12.8538C7.74682 12.9425 7.79974 13.0659 7.78596 13.2209C7.77358 13.3607 7.6933 13.453 7.57368 13.5161C7.52115 13.5438 7.46524 13.5567 7.40653 13.5579C7.38017 13.5585 7.35361 13.5589 7.32725 13.5589C5.73164 13.5589 4.13624 13.5589 2.54064 13.5589C2.46136 13.5589 2.38308 13.5575 2.30859 13.5206C2.1692 13.4512 2.08632 13.3465 2.08393 13.185C2.08133 13.0189 2.15642 12.901 2.3024 12.829C2.36011 12.8005 2.42501 12.8003 2.48872 12.8003C3.30629 12.8005 4.12386 12.8003 4.94143 12.8003L4.94183 12.8007Z"
-          fill="currentColor"
-        />
-        <path
-          d="M9.63689 15.2778C9.4314 15.279 9.26245 15.1093 9.26245 14.8983C9.26245 14.6675 9.45237 14.5106 9.64348 14.5152C9.85097 14.5203 10.0151 14.6837 10.0147 14.9007C10.0141 15.1035 9.85616 15.2792 9.63689 15.278V15.2778Z"
-          fill="currentColor"
-        />
-        <path
-          d="M5.35237 16.6119C5.33799 16.4128 5.51852 16.2341 5.7266 16.2349C5.95067 16.2359 6.10843 16.4376 6.10264 16.6236C6.09605 16.838 5.91412 16.9972 5.72601 16.9999C5.55267 17.0023 5.33739 16.85 5.35257 16.6119H5.35237Z"
-          fill="currentColor"
-        />
-        <path
-          d="M1.11455 13.5588C0.90007 13.5598 0.738113 13.3911 0.739511 13.1789C0.740709 12.9632 0.905462 12.8 1.11714 12.8008C1.33182 12.8016 1.49238 12.9711 1.49158 13.1817C1.49078 13.3915 1.32962 13.5616 1.11475 13.5588H1.11455Z"
-          fill="currentColor"
-        />
-        <path
-          d="M3.64114 11.4661C3.65272 11.6528 3.48578 11.8466 3.26591 11.8442C3.05722 11.8418 2.89087 11.6731 2.89247 11.4627C2.89426 11.2375 3.06161 11.0836 3.26551 11.0806C3.4696 11.0774 3.65253 11.2501 3.64114 11.4663V11.4661Z"
-          fill="currentColor"
-        />
-        <path
-          d="M0.377235 10.1218C0.195109 10.1405 -0.000796365 9.96418 2.43466e-06 9.74575C0.000801234 9.53315 0.166153 9.36506 0.37384 9.36426C0.595308 9.36326 0.749676 9.54578 0.751872 9.74294C0.753869 9.93971 0.582127 10.1367 0.377235 10.1218Z"
-          fill="currentColor"
-        />
-        <path
-          d="M3.64109 8.02801C3.65107 8.22478 3.48832 8.4079 3.26765 8.4069C3.05737 8.4061 2.89142 8.24664 2.89221 8.02059C2.89281 7.81521 3.05956 7.64733 3.26366 7.64552C3.47254 7.64372 3.65227 7.81922 3.64109 8.02801Z"
-          fill="currentColor"
-        />
-      </g>
-      <defs>
-        <clipPath id="clip0_291_7076">
-          <rect width="19.6714" height="17" fill="white" />
-        </clipPath>
-      </defs>
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/OkxIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/OkxIcon.tsx
deleted file mode 100644
index 45bd036fde..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/OkxIcon.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const OkxIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon width="17" height="15" viewBox="0 0 17 15" fill="none" {...props}>
-      <path
-        d="M12.3951 4.42362C12.2384 4.33332 12.0607 4.28579 11.8799 4.28579C11.699 4.28579 11.5214 4.33332 11.3647 4.42362L9.00084 5.83178L7.39466 6.75017L5.03082 8.15839C4.87413 8.24867 4.69647 8.2962 4.51563 8.2962C4.3348 8.2962 4.15714 8.24867 4.00045 8.15839L2.12152 7.05633C1.96733 6.96426 1.83913 6.83445 1.74899 6.67912C1.65886 6.5238 1.60976 6.34808 1.60632 6.16853V3.99503C1.60333 3.81419 1.64972 3.63596 1.7405 3.47952C1.83128 3.32309 1.96302 3.19438 2.12152 3.10726L3.97015 2.03581C4.12684 1.94552 4.3045 1.89799 4.48535 1.89799C4.66619 1.89799 4.84386 1.94552 5.00055 2.03581L6.84918 3.10726C7.00335 3.19933 7.13154 3.32914 7.22167 3.48446C7.3118 3.63978 7.3609 3.81549 7.36434 3.99503V5.40322L8.97052 4.45423V3.04602C8.97353 2.86518 8.92714 2.68694 8.83636 2.53051C8.74559 2.37408 8.61385 2.24537 8.45536 2.15825L5.03082 0.137821C4.87413 0.0475279 4.69647 0 4.51563 0C4.3348 0 4.15713 0.0475279 4.00045 0.137821L0.515322 2.15827C0.356826 2.24539 0.225095 2.37409 0.134315 2.53052C0.0435349 2.68695 -0.0028564 2.86518 0.000136415 3.04602V7.11754C-0.00285917 7.29837 0.0435316 7.47661 0.134314 7.63304C0.225096 7.78947 0.35683 7.91817 0.515331 8.00529L4.00046 10.0257C4.15714 10.116 4.3348 10.1636 4.51564 10.1636C4.69649 10.1636 4.87415 10.116 5.03083 10.0257L7.39467 8.64815L9.00085 7.69917L11.3647 6.32159C11.5214 6.23131 11.699 6.18378 11.8799 6.18378C12.0607 6.18378 12.2384 6.23131 12.3951 6.32159L14.2437 7.39306C14.3979 7.48513 14.5261 7.61494 14.6162 7.77025C14.7063 7.92557 14.7554 8.10127 14.7589 8.28081V10.4543C14.7619 10.6352 14.7155 10.8134 14.6247 10.9698C14.5339 11.1263 14.4022 11.255 14.2437 11.3421L12.3951 12.4442C12.2384 12.5345 12.0607 12.582 11.8799 12.582C11.699 12.582 11.5214 12.5345 11.3647 12.4442L9.51606 11.3727C9.36187 11.2807 9.23366 11.1508 9.14353 10.9955C9.05339 10.8402 9.00428 10.6645 9.00085 10.4849V9.07675L7.39467 10.0257V11.4339C7.39167 11.6148 7.43805 11.793 7.52883 11.9494C7.61961 12.1059 7.75134 12.2346 7.90984 12.3217L11.395 14.3422C11.5517 14.4325 11.7293 14.48 11.9102 14.48C12.091 14.48 12.2687 14.4325 12.4253 14.3422L15.9105 12.3217C16.0647 12.2296 16.1929 12.0998 16.283 11.9445C16.3731 11.7892 16.4222 11.6135 16.4257 11.4339V7.36243C16.4287 7.18159 16.3823 7.00335 16.2915 6.84692C16.2007 6.69049 16.069 6.56179 15.9105 6.47467L12.3951 4.42362Z"
-        fill="currentColor"
-      />
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/XLayerIcon.tsx b/packages/apps/job-launcher/client/src/components/Icons/XLayerIcon.tsx
deleted file mode 100644
index 433dc6da35..0000000000
--- a/packages/apps/job-launcher/client/src/components/Icons/XLayerIcon.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
-import { FC } from 'react';
-
-export const XLayerIcon: FC<SvgIconProps> = (props) => {
-  return (
-    <SvgIcon {...props} viewBox="0 0 832 316" fill="none">
-      <path
-        d="M261.67 46H47.6308C46.3108 46 45.0448 46.524 44.1118 47.458C43.1778 48.391 42.6538 49.657 42.6538 50.978V265.017C42.6538 266.337 43.1778 267.603 44.1118 268.536C45.0448 269.47 46.3108 269.994 47.6308 269.994H261.67C262.991 269.994 264.257 269.47 265.19 268.536C266.124 267.603 266.648 266.337 266.648 265.017V50.978C266.648 49.657 266.124 48.391 265.19 47.458C264.257 46.524 262.991 46 261.67 46ZM191.983 190.352C191.983 191.672 191.459 192.938 190.525 193.872C189.592 194.805 188.326 195.33 187.006 195.33H122.296C120.976 195.33 119.71 194.805 118.776 193.872C117.843 192.938 117.319 191.672 117.319 190.352V125.642C117.319 124.322 117.843 123.056 118.776 122.123C119.71 121.189 120.976 120.665 122.296 120.665H187.006C188.326 120.665 189.592 121.189 190.525 122.123C191.459 123.056 191.983 124.322 191.983 125.642V190.352Z"
-        fill="black"
-      />
-      <path
-        d="M709.783 120.673H645.074C642.325 120.673 640.096 122.901 640.096 125.65V190.36C640.096 193.109 642.325 195.338 645.074 195.338H709.783C712.532 195.338 714.761 193.109 714.761 190.36V125.65C714.761 122.901 712.532 120.673 709.783 120.673Z"
-        fill="black"
-      />
-      <path
-        d="M635.088 46.0059H570.379C567.63 46.0059 565.401 48.2339 565.401 50.9839V115.693C565.401 118.442 567.63 120.671 570.379 120.671H635.088C637.838 120.671 640.066 118.442 640.066 115.693V50.9839C640.066 48.2339 637.838 46.0059 635.088 46.0059Z"
-        fill="black"
-      />
-      <path
-        d="M784.418 46.0059H719.708C716.959 46.0059 714.73 48.2339 714.73 50.9839V115.693C714.73 118.442 716.959 120.671 719.708 120.671H784.418C787.167 120.671 789.395 118.442 789.395 115.693V50.9839C789.395 48.2339 787.167 46.0059 784.418 46.0059Z"
-        fill="black"
-      />
-      <path
-        d="M635.088 195.334H570.379C567.63 195.334 565.401 197.562 565.401 200.311V265.021C565.401 267.77 567.63 269.999 570.379 269.999H635.088C637.838 269.999 640.066 267.77 640.066 265.021V200.311C640.066 197.562 637.838 195.334 635.088 195.334Z"
-        fill="black"
-      />
-      <path
-        d="M784.418 195.334H719.708C716.959 195.334 714.73 197.562 714.73 200.311V265.021C714.73 267.77 716.959 269.999 719.708 269.999H784.418C787.167 269.999 789.395 267.77 789.395 265.021V200.311C789.395 197.562 787.167 195.334 784.418 195.334Z"
-        fill="black"
-      />
-      <path
-        d="M522.997 46.0059H458.288C455.539 46.0059 453.31 48.2339 453.31 50.9839V115.693C453.31 118.442 455.539 120.671 458.288 120.671H522.997C525.746 120.671 527.975 118.442 527.975 115.693V50.9839C527.975 48.2339 525.746 46.0059 522.997 46.0059Z"
-        fill="black"
-      />
-      <path
-        d="M522.997 195.334H458.288C455.539 195.334 453.31 197.562 453.31 200.311V265.021C453.31 267.77 455.539 269.999 458.288 269.999H522.997C525.746 269.999 527.975 267.77 527.975 265.021V200.311C527.975 197.562 525.746 195.334 522.997 195.334Z"
-        fill="black"
-      />
-      <path
-        d="M453.31 125.586C453.31 124.266 452.785 123 451.852 122.067C450.918 121.133 449.652 120.609 448.332 120.609H378.645V50.978C378.645 49.657 378.12 48.391 377.187 47.458C376.253 46.524 374.987 46 373.667 46H308.958C307.637 46 306.371 46.524 305.438 47.458C304.504 48.391 303.98 49.657 303.98 50.978V264.905C303.98 266.225 304.504 267.491 305.438 268.424C306.371 269.358 307.637 269.882 308.958 269.882H373.667C374.987 269.882 376.253 269.358 377.187 268.424C378.12 267.491 378.645 266.225 378.645 264.905V195.274H448.332C449.652 195.274 450.918 194.749 451.852 193.816C452.785 192.882 453.31 191.616 453.31 190.296V125.586Z"
-        fill="black"
-      />
-    </SvgIcon>
-  );
-};
diff --git a/packages/apps/job-launcher/client/src/components/Icons/chains.tsx b/packages/apps/job-launcher/client/src/components/Icons/chains.tsx
index 96fa949352..10b628ef7a 100644
--- a/packages/apps/job-launcher/client/src/components/Icons/chains.tsx
+++ b/packages/apps/job-launcher/client/src/components/Icons/chains.tsx
@@ -1,35 +1,19 @@
 import { ChainId } from '@human-protocol/sdk';
 import { ReactElement } from 'react';
 
-import { AvalancheIcon } from './AvalancheIcon';
 import { BinanceSmartChainIcon } from './BinanceSmartChainIcon';
-import { CeloIcon } from './CeloIcon';
 import { EthereumIcon } from './EthereumIcon';
 import { HumanIcon } from './HumanIcon';
-import { MoonbaseAlphaIcon } from './MoonbaseAlphaIcon';
-import { MoonbeamIcon } from './MoonbeamIcon';
-import { OkxIcon } from './OkxIcon';
 import { PolygonIcon } from './PolygonIcon';
-import { XLayerIcon } from './XLayerIcon';
 
 export const CHAIN_ICONS: { [chainId in ChainId]?: ReactElement } = {
   [ChainId.ALL]: <HumanIcon />,
   [ChainId.MAINNET]: <EthereumIcon />,
-  [ChainId.GOERLI]: <EthereumIcon />,
   [ChainId.SEPOLIA]: <EthereumIcon />,
   [ChainId.POLYGON]: <PolygonIcon />,
-  [ChainId.POLYGON_MUMBAI]: <PolygonIcon />,
   [ChainId.POLYGON_AMOY]: <PolygonIcon />,
   [ChainId.BSC_MAINNET]: <BinanceSmartChainIcon />,
   [ChainId.BSC_TESTNET]: <BinanceSmartChainIcon />,
-  [ChainId.MOONBEAM]: <MoonbeamIcon />,
-  [ChainId.MOONBASE_ALPHA]: <MoonbaseAlphaIcon />,
-  [ChainId.AVALANCHE]: <AvalancheIcon />,
-  [ChainId.AVALANCHE_TESTNET]: <AvalancheIcon />,
-  [ChainId.CELO]: <CeloIcon />,
-  [ChainId.CELO_ALFAJORES]: <CeloIcon />,
-  [ChainId.XLAYER_TESTNET]: <OkxIcon />,
-  [ChainId.XLAYER]: <XLayerIcon />,
 };
 
 export const TOKEN_ICONS: Record<string, ReactElement> = {
diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx
index c756b4cd7c..62f7cf290a 100644
--- a/packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx
+++ b/packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx
@@ -481,7 +481,10 @@ export const FiatPayForm = ({
 
             <BillingDetailsModal
               open={isBillingDetailsOpen}
-              onClose={() => setIsBillingDetailsOpen(false)}
+              onClose={() => {
+                setIsBillingDetailsOpen(false);
+                setOpenBillingAfterAddCard(false);
+              }}
               billingInfo={{
                 name: '',
                 email: '',
diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/LaunchJobProgress.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/LaunchJobProgress.tsx
index c2831726e4..a6640c3103 100644
--- a/packages/apps/job-launcher/client/src/components/Jobs/Create/LaunchJobProgress.tsx
+++ b/packages/apps/job-launcher/client/src/components/Jobs/Create/LaunchJobProgress.tsx
@@ -1,4 +1,4 @@
-import { Box, Typography } from '@mui/material';
+import { Box, Typography, CircularProgress } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import React from 'react';
 import { CheckFilledIcon } from '../../../components/Icons/CheckFilledIcon';
@@ -6,9 +6,9 @@ import { CheckFilledIcon } from '../../../components/Icons/CheckFilledIcon';
 const ProgressText = styled(Typography)({
   display: 'flex',
   alignItems: 'center',
-  width: '300px',
   position: 'relative',
   paddingLeft: '30px',
+  paddingTop: 10,
 });
 
 const CheckedIcon = styled(CheckFilledIcon)({
@@ -16,6 +16,11 @@ const CheckedIcon = styled(CheckFilledIcon)({
   left: '0px',
 });
 
+const ProgressIcon = styled(CircularProgress)({
+  position: 'absolute',
+  left: '0px',
+});
+
 export const LaunchJobProgress = () => {
   return (
     <Box
@@ -36,7 +41,9 @@ export const LaunchJobProgress = () => {
       <ProgressText>
         <CheckedIcon /> Setting Up Job
       </ProgressText>
-      <ProgressText>Paying Job</ProgressText>
+      <ProgressText>
+        <ProgressIcon size={20} /> Paying Job
+      </ProgressText>
     </Box>
   );
 };
diff --git a/packages/apps/job-launcher/client/src/constants/chains.ts b/packages/apps/job-launcher/client/src/constants/chains.ts
index 1e30ac8658..cf7f021d19 100644
--- a/packages/apps/job-launcher/client/src/constants/chains.ts
+++ b/packages/apps/job-launcher/client/src/constants/chains.ts
@@ -15,7 +15,6 @@ switch (import.meta.env.VITE_APP_ENVIRONMENT.toLowerCase()) {
       ChainId.BSC_TESTNET,
       ChainId.POLYGON_AMOY,
       ChainId.SEPOLIA,
-      ChainId.XLAYER_TESTNET,
     ];
     break;
   case 'localhost':
@@ -77,28 +76,7 @@ export const NETWORK_TOKENS: Record<
   },
   [ChainId.ALL]: { hmt: NETWORKS[ChainId.ALL]?.hmtAddress },
   [ChainId.MAINNET]: { hmt: NETWORKS[ChainId.MAINNET]?.hmtAddress },
-  [ChainId.RINKEBY]: { hmt: NETWORKS[ChainId.RINKEBY]?.hmtAddress },
-  [ChainId.GOERLI]: { hmt: NETWORKS[ChainId.GOERLI]?.hmtAddress },
   [ChainId.BSC_MAINNET]: { hmt: NETWORKS[ChainId.BSC_MAINNET]?.hmtAddress },
   [ChainId.BSC_TESTNET]: { hmt: NETWORKS[ChainId.BSC_TESTNET]?.hmtAddress },
-  [ChainId.POLYGON_MUMBAI]: {
-    hmt: NETWORKS[ChainId.POLYGON_MUMBAI]?.hmtAddress,
-  },
-  [ChainId.MOONBEAM]: { hmt: NETWORKS[ChainId.MOONBEAM]?.hmtAddress },
-  [ChainId.MOONBASE_ALPHA]: {
-    hmt: NETWORKS[ChainId.MOONBASE_ALPHA]?.hmtAddress,
-  },
-  [ChainId.AVALANCHE_TESTNET]: {
-    hmt: NETWORKS[ChainId.AVALANCHE_TESTNET]?.hmtAddress,
-  },
-  [ChainId.AVALANCHE]: { hmt: NETWORKS[ChainId.AVALANCHE]?.hmtAddress },
-  [ChainId.CELO]: { hmt: NETWORKS[ChainId.CELO]?.hmtAddress },
-  [ChainId.CELO_ALFAJORES]: {
-    hmt: NETWORKS[ChainId.CELO_ALFAJORES]?.hmtAddress,
-  },
-  [ChainId.XLAYER_TESTNET]: {
-    hmt: NETWORKS[ChainId.XLAYER_TESTNET]?.hmtAddress,
-  },
   [ChainId.LOCALHOST]: { hmt: NETWORKS[ChainId.LOCALHOST]?.hmtAddress },
-  [ChainId.XLAYER]: { hmt: NETWORKS[ChainId.XLAYER]?.hmtAddress },
 };
diff --git a/packages/apps/job-launcher/client/src/pages/Profile/Settings/index.tsx b/packages/apps/job-launcher/client/src/pages/Profile/Settings/index.tsx
index bfd32d1e4b..070263c786 100644
--- a/packages/apps/job-launcher/client/src/pages/Profile/Settings/index.tsx
+++ b/packages/apps/job-launcher/client/src/pages/Profile/Settings/index.tsx
@@ -226,7 +226,10 @@ const Settings = () => {
 
       <BillingDetailsModal
         open={isEditBillingOpen}
-        onClose={() => setIsEditBillingOpen(false)}
+        onClose={() => {
+          setIsEditBillingOpen(false);
+          setOpenBillingAfterAddCard(false);
+        }}
         billingInfo={billingInfo}
         setBillingInfo={(info) => {
           setBillingInfo(info);
diff --git a/packages/apps/job-launcher/server/.env.example b/packages/apps/job-launcher/server/.env.example
index 45eabf1bc0..84e8cb920e 100644
--- a/packages/apps/job-launcher/server/.env.example
+++ b/packages/apps/job-launcher/server/.env.example
@@ -68,6 +68,3 @@ STRIPE_APP_INFO_URL=
 
 # Sendgrid 
 SENDGRID_API_KEY=
-
-# Cron Job Secret
-CRON_SECRET="cron-secret"
diff --git a/packages/apps/job-launcher/server/Dockerfile b/packages/apps/job-launcher/server/Dockerfile
index 51a61a583a..63a89f533d 100644
--- a/packages/apps/job-launcher/server/Dockerfile
+++ b/packages/apps/job-launcher/server/Dockerfile
@@ -1,17 +1,27 @@
-# Base image
-FROM node:18
+FROM node:18-slim
+ARG APP_PATH=packages/apps/job-launcher/server
 
 # Create app directory
 WORKDIR /usr/src/app
 
-# Bundle app source
-COPY . .
+# Copy expected yarn dist
+COPY .yarn ./.yarn
+COPY .yarnrc ./
+# Copy files for deps installation
+COPY package.json yarn.lock ./
+COPY ${APP_PATH}/package.json ./${APP_PATH}/package.json
+# Some deps are referenced as "*", so we need to build them
+COPY tsconfig.json ./
+COPY packages/core ./packages/core
+COPY packages/sdk ./packages/sdk
 
-# Install app dependencies
 RUN yarn install
 
-# Creates a "dist" folder with the production build
-RUN yarn workspace @human-protocol/job-launcher-server build
+# Copy everything else to ensure proper build process
+COPY . .
+
+WORKDIR ./${APP_PATH}
+RUN yarn build
 
-# Start the server using the production build
-CMD [ "node", "packages/apps/job-launcher/server/dist/src/main.js" ]
+# Start the server using the build
+CMD [ "yarn", "start:prod" ]
\ No newline at end of file
diff --git a/packages/apps/job-launcher/server/ENV.md b/packages/apps/job-launcher/server/ENV.md
index ee63793a32..276c9af3db 100644
--- a/packages/apps/job-launcher/server/ENV.md
+++ b/packages/apps/job-launcher/server/ENV.md
@@ -84,15 +84,6 @@ RPC_URL_BSC_MAINNET=
 ### The RPC URL for the BSC Testnet network.
 RPC_URL_BSC_TESTNET=
 
-### The RPC URL for the Moonbeam network.
-RPC_URL_MOONBEAM=
-
-### The RPC URL for the XLayer Testnet network.
-RPC_URL_XLAYER_TESTNET=
-
-### The RPC URL for the XLayer network.
-RPC_URL_XLAYER=
-
 ### The RPC URL for the Localhost network.
 RPC_URL_LOCALHOST=
 
@@ -159,6 +150,9 @@ COINMARKETCAP_API_KEY=
 ### The API key for accessing CoinGecko data.
 COINGECKO_API_KEY=
 
+### The amount to charge abusive users.
+ABUSE_AMOUNT=
+
 ### The secret key used for authenticating requests to the Stripe API. Required
 STRIPE_SECRET_KEY=
 
diff --git a/packages/apps/job-launcher/server/package.json b/packages/apps/job-launcher/server/package.json
index 3844b2d54e..875d27aa6f 100644
--- a/packages/apps/job-launcher/server/package.json
+++ b/packages/apps/job-launcher/server/package.json
@@ -36,6 +36,7 @@
     "@nestjs/core": "^10.3.10",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.0",
+    "@nestjs/platform-express": "^10.3.10",
     "@nestjs/schedule": "^4.0.1",
     "@nestjs/serve-static": "^4.0.1",
     "@nestjs/swagger": "^7.4.2",
@@ -43,10 +44,14 @@
     "@nestjs/typeorm": "^10.0.1",
     "@sendgrid/mail": "^8.1.3",
     "@types/passport-jwt": "^4.0.1",
+    "@types/uuid": "^10.0.0",
     "async-mutex": "^0.5.0",
     "bcrypt": "^5.1.1",
+    "body-parser": "^1.20.3",
     "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
     "decimal.js": "^10.4.3",
+    "helmet": "^7.1.0",
     "joi": "^17.13.3",
     "json-stable-stringify": "^1.1.1",
     "nestjs-minio-client": "^2.2.0",
@@ -71,7 +76,7 @@
     "@types/json-stable-stringify": "^1.0.36",
     "@types/node": "22.10.5",
     "@types/supertest": "^6.0.2",
-    "@types/xml2js": "0.4.13",
+    "@types/xml2js": "0.4.14",
     "@types/zxcvbn": "4.4.5",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
diff --git a/packages/apps/job-launcher/server/src/common/config/network-config.service.ts b/packages/apps/job-launcher/server/src/common/config/network-config.service.ts
index d03d3007b4..33e8530efc 100644
--- a/packages/apps/job-launcher/server/src/common/config/network-config.service.ts
+++ b/packages/apps/job-launcher/server/src/common/config/network-config.service.ts
@@ -90,42 +90,6 @@ export class NetworkConfigService {
           },
         },
       }),
-      ...(this.configService.get<string>('RPC_URL_MOONBEAM') && {
-        moonbeam: {
-          chainId: ChainId.MOONBEAM,
-          /**
-           * The RPC URL for the Moonbeam network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_MOONBEAM'),
-          tokens: {
-            hmt: NETWORKS[ChainId.MOONBEAM]?.hmtAddress,
-          },
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER_TESTNET') && {
-        xlayertestnet: {
-          chainId: ChainId.XLAYER_TESTNET,
-          /**
-           * The RPC URL for the XLayer Testnet network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER_TESTNET'),
-          tokens: {
-            hmt: NETWORKS[ChainId.XLAYER_TESTNET]?.hmtAddress,
-          },
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER') && {
-        xlayer: {
-          chainId: ChainId.XLAYER,
-          /**
-           * The RPC URL for the XLayer network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER'),
-          tokens: {
-            hmt: NETWORKS[ChainId.XLAYER]?.hmtAddress,
-          },
-        },
-      }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
           chainId: ChainId.LOCALHOST,
diff --git a/packages/apps/job-launcher/server/src/common/constants/index.ts b/packages/apps/job-launcher/server/src/common/constants/index.ts
index 8ccdf69672..dc14428789 100644
--- a/packages/apps/job-launcher/server/src/common/constants/index.ts
+++ b/packages/apps/job-launcher/server/src/common/constants/index.ts
@@ -18,13 +18,8 @@ export const TESTNET_CHAIN_IDS = [
   ChainId.BSC_TESTNET,
   ChainId.POLYGON_AMOY,
   ChainId.SEPOLIA,
-  ChainId.XLAYER_TESTNET,
-];
-export const MAINNET_CHAIN_IDS = [
-  ChainId.BSC_MAINNET,
-  ChainId.POLYGON,
-  ChainId.MOONBEAM,
 ];
+export const MAINNET_CHAIN_IDS = [ChainId.BSC_MAINNET, ChainId.POLYGON];
 
 export const SENDGRID_API_KEY_REGEX =
   /^SG\.[A-Za-z0-9-_]{22}\.[A-Za-z0-9-_]{43}$/;
diff --git a/packages/apps/job-launcher/server/src/common/guards/signature.auth.ts b/packages/apps/job-launcher/server/src/common/guards/signature.auth.ts
index 997819b001..9374641e5b 100644
--- a/packages/apps/job-launcher/server/src/common/guards/signature.auth.ts
+++ b/packages/apps/job-launcher/server/src/common/guards/signature.auth.ts
@@ -27,17 +27,17 @@ export class SignatureAuthGuard implements CanActivate {
       );
       if (
         this.role.includes(Role.Exchange) &&
-        escrowData.exchangeOracle?.length
+        escrowData?.exchangeOracle?.length
       )
         oracleAdresses.push(escrowData.exchangeOracle);
       if (
         this.role.includes(Role.Recording) &&
-        escrowData.recordingOracle?.length
+        escrowData?.recordingOracle?.length
       )
         oracleAdresses.push(escrowData.recordingOracle);
       if (
         this.role.includes(Role.Reputation) &&
-        escrowData.reputationOracle?.length
+        escrowData?.reputationOracle?.length
       )
         oracleAdresses.push(escrowData.reputationOracle);
 
diff --git a/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.spec.ts
index 8a82f9907b..0710491f89 100644
--- a/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -221,4 +221,38 @@ describe('TransformEnumInterceptor', () => {
     });
     expect(callHandler.handle).toHaveBeenCalled();
   });
+
+  it('should return bodyOrQuery if instance is not an object', () => {
+    // Test with `null` as the instance
+    let result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      null,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with `undefined` as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      undefined,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (string) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      'some string',
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (number) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      123,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  });
 });
diff --git a/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.ts b/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.ts
index 62309328a1..d24d146f34 100644
--- a/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.ts
+++ b/packages/apps/job-launcher/server/src/common/interceptors/transform-enum.interceptor.ts
@@ -83,6 +83,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
     instance: any,
     targetClass: ClassConstructor<any>,
   ): any {
+    if (!instance || typeof instance !== 'object') {
+      return bodyOrQuery;
+    }
+
     for (const property in bodyOrQuery) {
       if (bodyOrQuery.hasOwnProperty(property)) {
         const instanceValue = instance[property];
diff --git a/packages/apps/job-launcher/server/src/common/utils/storage.ts b/packages/apps/job-launcher/server/src/common/utils/storage.ts
index 0126cb1388..a71ead25d1 100644
--- a/packages/apps/job-launcher/server/src/common/utils/storage.ts
+++ b/packages/apps/job-launcher/server/src/common/utils/storage.ts
@@ -80,26 +80,32 @@ export async function listObjectsInBucket(url: URL): Promise<string[]> {
       let nextContinuationToken: string | undefined;
       const baseUrl = `${url.protocol}//${url.host}`;
       do {
-        let requestOptions = `${baseUrl}`;
+        let requestUrl = `${baseUrl}`;
+        if (['localhost', 'minio'].includes(url.hostname)) {
+          const pathname = url.pathname.replace(/^\//, '');
+          const [bucketName, ...folderParts] = pathname.split('/');
 
-        if (url.hostname !== 'localhost') {
-          requestOptions += `?list-type=2${
-            nextContinuationToken
-              ? `&continuation-token=${encodeURIComponent(
-                  nextContinuationToken,
-                )}`
-              : ''
-          }${url.pathname ? `&prefix=${url.pathname.replace(/^\//, '')}` : ''}`;
+          requestUrl += `/${bucketName}?list-type=2`;
+
+          const folderPrefix = folderParts.join('/');
+          if (folderPrefix) {
+            requestUrl += `&prefix=${folderPrefix}`;
+          }
         } else {
-          requestOptions += `${url.pathname ? `${url.pathname.replace(/^\//, '')}` : ''}?list-type=2${
-            nextContinuationToken
-              ? `&continuation-token=${encodeURIComponent(
-                  nextContinuationToken,
-                )}`
-              : ''
-          }`;
+          requestUrl += `?list-type=2`;
+
+          if (url.pathname) {
+            requestUrl += `&prefix=${url.pathname.replace(/^\//, '')}`;
+          }
         }
-        const response = await axios.get(requestOptions);
+
+        if (nextContinuationToken) {
+          requestUrl += `&continuation-token=${encodeURIComponent(
+            nextContinuationToken,
+          )}`;
+        }
+
+        const response = await axios.get(requestUrl);
 
         if (response.status === HttpStatus.OK && response.data) {
           parseString(response.data, (err: any, result: any) => {
diff --git a/packages/apps/job-launcher/server/src/modules/job/job.dto.ts b/packages/apps/job-launcher/server/src/modules/job/job.dto.ts
index 2f2f557091..5b543451d4 100644
--- a/packages/apps/job-launcher/server/src/modules/job/job.dto.ts
+++ b/packages/apps/job-launcher/server/src/modules/job/job.dto.ts
@@ -191,6 +191,7 @@ export class JobCvatDto extends JobDto {
   @ApiProperty({ name: 'min_quality' })
   @IsNumber()
   @IsPositive()
+  @Max(1)
   public minQuality: number;
 
   @ApiProperty({ name: 'ground_truth' })
diff --git a/packages/apps/job-launcher/server/src/modules/job/job.repository.ts b/packages/apps/job-launcher/server/src/modules/job/job.repository.ts
index 162445c015..c054f14d56 100644
--- a/packages/apps/job-launcher/server/src/modules/job/job.repository.ts
+++ b/packages/apps/job-launcher/server/src/modules/job/job.repository.ts
@@ -170,9 +170,9 @@ export class JobRepository extends BaseRepository<JobEntity> {
 
     const result = await queryBuilder.getRawOne();
     return {
-      average: parseFloat(result.average),
-      maximum: parseFloat(result.maximum),
-      minimum: parseFloat(result.minimum),
+      average: parseFloat(result.average) || 0,
+      maximum: parseFloat(result.maximum) || 0,
+      minimum: parseFloat(result.minimum) || 0,
     };
   }
 
@@ -199,11 +199,11 @@ export class JobRepository extends BaseRepository<JobEntity> {
 
     const result = await queryBuilder.getRawOne();
     return {
-      totalJobs: parseInt(result.totalJobs, 10),
-      launched: parseInt(result.totalJobs, 10),
-      partial: parseInt(result.partial, 10),
-      completed: parseInt(result.completed, 10),
-      canceled: parseInt(result.canceled, 10),
+      totalJobs: parseInt(result.totalJobs, 10) || 0,
+      launched: parseInt(result.totalJobs, 10) || 0,
+      partial: parseInt(result.partial, 10) || 0,
+      completed: parseInt(result.completed, 10) || 0,
+      canceled: parseInt(result.canceled, 10) || 0,
     };
   }
 
diff --git a/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts b/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts
index 5887ffa6cc..52d79d96b5 100644
--- a/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts
+++ b/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts
@@ -562,7 +562,7 @@ describe('JobService', () => {
 
       jest
         .spyOn(routingProtocolService, 'selectNetwork')
-        .mockReturnValue(ChainId.MOONBEAM);
+        .mockReturnValue(ChainId.POLYGON);
 
       KVStoreUtils.get = jest.fn().mockResolvedValue(MOCK_ORACLE_FEE);
       KVStoreUtils.getPublicKey = jest
@@ -576,7 +576,7 @@ describe('JobService', () => {
 
       expect(paymentService.getUserBalance).toHaveBeenCalledWith(userMock.id);
       expect(jobRepository.createUnique).toHaveBeenCalledWith({
-        chainId: ChainId.MOONBEAM,
+        chainId: ChainId.POLYGON,
         userId: userMock.id,
         manifestUrl: expect.any(String),
         manifestHash: expect.any(String),
@@ -1696,7 +1696,7 @@ describe('JobService', () => {
 
       jest
         .spyOn(routingProtocolService, 'selectNetwork')
-        .mockReturnValue(ChainId.MOONBEAM);
+        .mockReturnValue(ChainId.POLYGON);
 
       KVStoreUtils.get = jest.fn().mockResolvedValue(MOCK_ORACLE_FEE);
       KVStoreUtils.getPublicKey = jest
@@ -1722,7 +1722,7 @@ describe('JobService', () => {
 
       expect(paymentService.getUserBalance).toHaveBeenCalledWith(userMock.id);
       expect(jobRepository.createUnique).toHaveBeenCalledWith({
-        chainId: ChainId.MOONBEAM,
+        chainId: ChainId.POLYGON,
         userId: userMock.id,
         manifestUrl: expect.any(String),
         manifestHash: expect.any(String),
@@ -1888,7 +1888,7 @@ describe('JobService', () => {
 
       jest
         .spyOn(routingProtocolService, 'selectNetwork')
-        .mockReturnValue(ChainId.MOONBEAM);
+        .mockReturnValue(ChainId.POLYGON);
 
       await jobService.createJob(userMock, JobRequestType.HCAPTCHA, {
         ...hCaptchaJobDto,
@@ -1897,7 +1897,7 @@ describe('JobService', () => {
 
       expect(paymentService.getUserBalance).toHaveBeenCalledWith(userMock.id);
       expect(jobRepository.createUnique).toHaveBeenCalledWith({
-        chainId: ChainId.MOONBEAM,
+        chainId: ChainId.POLYGON,
         userId: userMock.id,
         manifestUrl: expect.any(String),
         manifestHash: expect.any(String),
diff --git a/packages/apps/job-launcher/server/src/modules/payment/payment.controller.ts b/packages/apps/job-launcher/server/src/modules/payment/payment.controller.ts
index 22791e70b4..154aa5ced8 100644
--- a/packages/apps/job-launcher/server/src/modules/payment/payment.controller.ts
+++ b/packages/apps/job-launcher/server/src/modules/payment/payment.controller.ts
@@ -85,8 +85,8 @@ export class PaymentController {
   @UseGuards(WhitelistAuthGuard)
   @Post('/crypto')
   public async createCryptoPayment(
-    @Headers(HEADER_SIGNATURE_KEY) signature: string,
     @Body() data: PaymentCryptoCreateDto,
+    @Headers(HEADER_SIGNATURE_KEY) signature: string,
     @Request() req: RequestWithUser,
   ): Promise<boolean> {
     return this.paymentService.createCryptoPayment(
diff --git a/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.spec.ts b/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.spec.ts
index 9585a0dbf5..ef91574786 100644
--- a/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.spec.ts
+++ b/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.spec.ts
@@ -159,7 +159,6 @@ describe('WebhookController', () => {
           reason: 'Invalid manifest URL',
         },
       };
-      const mockSignature = 'Human-Signature';
 
       jest
         .spyOn(jobService, 'escrowFailedWebhook')
@@ -171,7 +170,7 @@ describe('WebhookController', () => {
         });
 
       await expect(
-        webhookController.processWebhook(mockSignature, invalidDto),
+        webhookController.processWebhook(invalidDto),
       ).rejects.toThrow(
         new ControlledError('Invalid manifest URL', HttpStatus.BAD_REQUEST),
       );
@@ -188,7 +187,6 @@ describe('WebhookController', () => {
           reason: 'Manifest cannot be downloaded',
         },
       };
-      const mockSignature = 'Human-Signature';
 
       jest
         .spyOn(jobService, 'escrowFailedWebhook')
@@ -197,10 +195,7 @@ describe('WebhookController', () => {
         });
 
       await expect(
-        webhookController.processWebhook(
-          mockSignature,
-          manifestCannotBeDownloadedDto,
-        ),
+        webhookController.processWebhook(manifestCannotBeDownloadedDto),
       ).rejects.toThrow(BadRequestException);
 
       expect(jobService.escrowFailedWebhook).toHaveBeenCalledWith(
diff --git a/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.ts b/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.ts
index 14d4e9fc36..8c6ce339c8 100644
--- a/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.ts
+++ b/packages/apps/job-launcher/server/src/modules/webhook/webhook.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Headers, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Post, UseGuards } from '@nestjs/common';
 import {
   ApiBody,
   ApiResponse,
@@ -54,10 +54,7 @@ export class WebhookController {
     description: 'Not Found. Could not find the requested content.',
   })
   @Post()
-  public async processWebhook(
-    @Headers(HEADER_SIGNATURE_KEY) _: string,
-    @Body() body: WebhookDataDto,
-  ): Promise<any> {
+  public async processWebhook(@Body() body: WebhookDataDto): Promise<any> {
     await this.webhookService.handleWebhook(body);
     return;
   }
diff --git a/packages/apps/job-launcher/server/test/e2e/env-setup.ts b/packages/apps/job-launcher/server/test/e2e/env-setup.ts
index f9c9ee98bf..8dec352553 100644
--- a/packages/apps/job-launcher/server/test/e2e/env-setup.ts
+++ b/packages/apps/job-launcher/server/test/e2e/env-setup.ts
@@ -59,9 +59,6 @@ t86lkzfAep9bfBxbaCBbUhJ1s9+9eeLMG/nUMAaGxWeOwJ92L/KvzN6RFw==
   process.env.S3_BUCKET = 'bucket';
   process.env.S3_USE_SSL = 'false';
 
-  process.env.MINIO_ROOT_USER = 'access-key';
-  process.env.MINIO_ROOT_PASSWORD = 'secrets-key';
-
   process.env.STRIPE_API_VERSION = '2022-11-15';
   process.env.STRIPE_APP_NAME = 'Staging Launcher Server';
   process.env.STRIPE_APP_VERSION = '1.0.0';
@@ -69,6 +66,4 @@ t86lkzfAep9bfBxbaCBbUhJ1s9+9eeLMG/nUMAaGxWeOwJ92L/KvzN6RFw==
     'https://github.com/humanprotocol/human-protocol/tree/main/packages/apps/job-launcher/server';
 
   process.env.SENDGRID_API_KEY = 'sendgrid-disabled';
-
-  process.env.CRON_SECRET = 'test';
 }
diff --git a/packages/apps/reputation-oracle/server/.dockerignore b/packages/apps/reputation-oracle/server/.dockerignore
deleted file mode 100644
index aa3a93b8dd..0000000000
--- a/packages/apps/reputation-oracle/server/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Dockerfile
-.dockerignore
-node_modules
-npm-debug.log
-dist
diff --git a/packages/apps/reputation-oracle/server/Dockerfile b/packages/apps/reputation-oracle/server/Dockerfile
index e1c1bf2423..8e81ef1787 100644
--- a/packages/apps/reputation-oracle/server/Dockerfile
+++ b/packages/apps/reputation-oracle/server/Dockerfile
@@ -1,17 +1,27 @@
-# Base image
-FROM node:18
+FROM node:18-slim
+ARG APP_PATH=packages/apps/reputation-oracle/server
 
 # Create app directory
 WORKDIR /usr/src/app
 
-# Bundle app source
-COPY . .
+# Copy expected yarn dist
+COPY .yarn ./.yarn
+COPY .yarnrc ./
+# Copy files for deps installation
+COPY package.json yarn.lock ./
+COPY ${APP_PATH}/package.json ./${APP_PATH}/package.json
+# Some deps are referenced as "*", so we need to build them
+COPY tsconfig.json ./
+COPY packages/core ./packages/core
+COPY packages/sdk ./packages/sdk
 
-# Install app dependencies
 RUN yarn install
 
-# Creates a "dist" folder with the production build
-RUN yarn workspace @human-protocol/reputation-oracle build
+# Copy everything else to ensure proper build process
+COPY . .
+
+WORKDIR ./${APP_PATH}
+RUN yarn build
 
-# Start the server using the production build
-CMD [ "node", "packages/apps/reputation-oracle/server/dist/src/main.js" ]
+# Start the server using the build
+CMD [ "yarn", "start:prod" ]
\ No newline at end of file
diff --git a/packages/apps/reputation-oracle/server/ENV.md b/packages/apps/reputation-oracle/server/ENV.md
index 6c848d9932..df141c4294 100644
--- a/packages/apps/reputation-oracle/server/ENV.md
+++ b/packages/apps/reputation-oracle/server/ENV.md
@@ -18,6 +18,9 @@ VERIFY_EMAIL_TOKEN_EXPIRES_IN="86400"
 ### The expiration time (in seconds) for forgot password tokens. Default: 86400
 FORGOT_PASSWORD_TOKEN_EXPIRES_IN="86400"
 
+### Human APP email.
+HUMAN_APP_EMAIL=
+
 ### The URL for connecting to the PostgreSQL database.
 POSTGRES_URL=
 
@@ -84,15 +87,6 @@ RPC_URL_BSC_MAINNET=
 ### The RPC URL for the BSC Testnet network.
 RPC_URL_BSC_TESTNET=
 
-### The RPC URL for the Moonbeam network.
-RPC_URL_MOONBEAM=
-
-### The RPC URL for the XLayer Testnet network.
-RPC_URL_XLAYER_TESTNET=
-
-### The RPC URL for the XLayer network.
-RPC_URL_XLAYER=
-
 ### The RPC URL for the Localhost network.
 RPC_URL_LOCALHOST=
 
diff --git a/packages/apps/reputation-oracle/server/package.json b/packages/apps/reputation-oracle/server/package.json
index c236638728..3a246b25c5 100644
--- a/packages/apps/reputation-oracle/server/package.json
+++ b/packages/apps/reputation-oracle/server/package.json
@@ -38,18 +38,26 @@
     "@nestjs/core": "^10.3.10",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.0",
+    "@nestjs/platform-express": "^10.3.10",
     "@nestjs/schedule": "^4.0.1",
+    "@nestjs/serve-static": "^4.0.2",
     "@nestjs/swagger": "^7.4.2",
     "@nestjs/terminus": "^10.2.1",
     "@nestjs/typeorm": "^10.0.1",
+    "@sendgrid/mail": "^8.1.3",
+    "@types/json-stable-stringify": "^1.0.36",
     "@types/passport-jwt": "^4.0.1",
     "bcrypt": "^5.1.1",
+    "body-parser": "^1.20.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "dotenv": "^16.3.2",
+    "ethers": "^6.13.1",
     "helmet": "^7.1.0",
     "joi": "^17.13.3",
+    "json-stable-stringify": "^1.1.1",
     "lodash": "^4.17.21",
-    "nestjs-minio-client": "^2.2.0",
+    "minio": "7.1.3",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "pg": "8.13.1",
@@ -67,6 +75,8 @@
     "@types/bcrypt": "^5.0.2",
     "@types/express": "^4.17.13",
     "@types/jest": "29.5.12",
+    "@types/json-stable-stringify": "^1.0.36",
+    "@types/lodash": "^4.17.14",
     "@types/node": "22.10.5",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
diff --git a/packages/apps/reputation-oracle/server/scripts/setup-kv-store.ts b/packages/apps/reputation-oracle/server/scripts/setup-kv-store.ts
new file mode 100644
index 0000000000..cd51e5822d
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/scripts/setup-kv-store.ts
@@ -0,0 +1,165 @@
+import 'dotenv/config';
+import { KVStoreClient, KVStoreKeys, Role } from '@human-protocol/sdk';
+import { Wallet, ethers } from 'ethers';
+import * as Minio from 'minio';
+
+async function setupCommonValues(kvStoreClient: KVStoreClient): Promise<void> {
+  const { SUPPORTED_JOB_TYPES = '', SERVER_URL = '', FEE = '' } = process.env;
+
+  if (!SUPPORTED_JOB_TYPES || SUPPORTED_JOB_TYPES.split(',').length === 0) {
+    throw new Error('SUPPORTED_JOB_TYPES should be comma-separated list');
+  }
+  try {
+    new URL(SERVER_URL || '');
+  } catch (noop) {
+    throw new Error('Invalid SERVER_URL');
+  }
+  let url = SERVER_URL.endsWith('/') ? SERVER_URL.slice(0, -1) : SERVER_URL;
+  if (!url.startsWith('http')) {
+    url = `http://${url}`;
+  }
+
+  const fee = Number(FEE);
+  if (!Number.isInteger(fee) || fee < 1) {
+    throw new Error('Fee must be positive integer');
+  }
+
+  await kvStoreClient.setBulk(
+    [
+      KVStoreKeys.role,
+      KVStoreKeys.fee,
+      KVStoreKeys.url,
+      KVStoreKeys.webhookUrl,
+      KVStoreKeys.jobTypes,
+    ],
+    [
+      Role.ReputationOracle,
+      `${fee}`,
+      url,
+      `${url}/webhook`,
+      SUPPORTED_JOB_TYPES,
+    ],
+  );
+}
+
+type SetupPublicKeyFileMeta = {
+  keyName: string;
+  publicKey: string;
+  s3Bucket: string;
+  s3Endpoint: string;
+  s3Port: string;
+  kvKey: string;
+};
+
+async function setupPublicKeyFile(
+  kvStoreClient: KVStoreClient,
+  minioClient: Minio.Client,
+  meta: SetupPublicKeyFileMeta,
+): Promise<void> {
+  const { keyName, kvKey, publicKey, s3Bucket, s3Endpoint, s3Port } = meta;
+  const exists = await minioClient.bucketExists(s3Bucket);
+  if (!exists) {
+    throw new Error('Bucket does not exists');
+  }
+
+  await minioClient.putObject(s3Bucket, keyName, publicKey, {
+    'Content-Type': 'text/plain',
+    'Cache-Control': 'no-store',
+  });
+  /**
+   * Protocol is required for 'setFileUrlAndHash'
+   */
+  const _s3Endpoint = s3Endpoint.startsWith('http')
+    ? s3Endpoint
+    : `http://${s3Endpoint}`;
+  const fileUrl = `${_s3Endpoint}:${s3Port}/${s3Bucket}/${keyName}`;
+  await kvStoreClient.setFileUrlAndHash(fileUrl, kvKey);
+}
+
+async function setup(): Promise<void> {
+  const { WEB3_PRIVATE_KEY, RPC_URL } = process.env;
+  if (!WEB3_PRIVATE_KEY) {
+    throw new Error('Private key is empty');
+  }
+  if (!RPC_URL) {
+    throw new Error('RPC url is empty');
+  }
+
+  const provider = new ethers.JsonRpcProvider(RPC_URL);
+  const wallet = new Wallet(WEB3_PRIVATE_KEY, provider);
+
+  const kvStoreClient = await KVStoreClient.build(wallet);
+
+  await setupCommonValues(kvStoreClient);
+
+  const {
+    S3_ENDPOINT,
+    S3_PORT,
+    S3_USE_SSL,
+    S3_ACCESS_KEY,
+    S3_SECRET_KEY,
+    S3_BUCKET,
+  } = process.env;
+
+  if (
+    [S3_ENDPOINT, S3_PORT, S3_ACCESS_KEY, S3_SECRET_KEY, S3_BUCKET].some(
+      (value) => !value,
+    )
+  ) {
+    throw new Error('Missing S3 config value');
+  }
+  if (!S3_ACCESS_KEY || !S3_SECRET_KEY) {
+    throw new Error('S3 key is missing');
+  }
+  if (!S3_BUCKET) {
+    throw new Error('S3 bucket is missing');
+  }
+
+  const s3Endpoint = S3_ENDPOINT || 'localhost';
+  const s3Port = S3_PORT || '9000';
+  const minioClient = new Minio.Client({
+    endPoint: s3Endpoint,
+    port: parseInt(s3Port, 10),
+    useSSL: S3_USE_SSL === 'true',
+    accessKey: S3_ACCESS_KEY,
+    secretKey: S3_SECRET_KEY,
+  });
+
+  const { PGP_ENCRYPT, PGP_PUBLIC_KEY } = process.env;
+  if (PGP_ENCRYPT && PGP_ENCRYPT === 'true') {
+    if (!PGP_PUBLIC_KEY) {
+      throw new Error('PGP public key is empty');
+    }
+    await setupPublicKeyFile(kvStoreClient, minioClient, {
+      s3Endpoint,
+      s3Port,
+      s3Bucket: S3_BUCKET,
+      publicKey: PGP_PUBLIC_KEY,
+      keyName: 'pgp-public-key',
+      kvKey: KVStoreKeys.publicKey,
+    });
+  }
+
+  const { JWT_PUBLIC_KEY } = process.env;
+  if (!JWT_PUBLIC_KEY) {
+    throw new Error('JWT_PUBLIC_KEY is missing');
+  }
+  await setupPublicKeyFile(kvStoreClient, minioClient, {
+    s3Endpoint,
+    s3Port,
+    s3Bucket: S3_BUCKET,
+    publicKey: JWT_PUBLIC_KEY,
+    keyName: 'jwt-public-key',
+    kvKey: 'jwt_public_key',
+  });
+}
+
+(async () => {
+  try {
+    await setup();
+    process.exit(0);
+  } catch (error) {
+    console.error('Failed to setup KV', error);
+    process.exit(1);
+  }
+})();
diff --git a/packages/apps/reputation-oracle/server/src/common/config/auth-config.service.ts b/packages/apps/reputation-oracle/server/src/common/config/auth-config.service.ts
index 2cca2a6bee..81c24aa0e1 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/auth-config.service.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/auth-config.service.ts
@@ -61,4 +61,11 @@ export class AuthConfigService {
       86400,
     );
   }
+
+  /**
+   * Human APP email.
+   */
+  get humanAppEmail(): string {
+    return this.configService.getOrThrow<string>('HUMAN_APP_EMAIL');
+  }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts b/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
index 1a1a8a05c7..98609817c7 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
@@ -69,4 +69,7 @@ export const envValidator = Joi.object({
   KYC_API_KEY: Joi.string(),
   KYC_API_PRIVATE_KEY: Joi.string().required(),
   KYC_BASE_URL: Joi.string(),
+
+  // Human App
+  HUMAN_APP_EMAIL: Joi.string().email().required(),
 });
diff --git a/packages/apps/reputation-oracle/server/src/common/config/network-config.service.ts b/packages/apps/reputation-oracle/server/src/common/config/network-config.service.ts
index 8658598c7e..15079cbd64 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/network-config.service.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/network-config.service.ts
@@ -71,33 +71,6 @@ export class NetworkConfigService {
           rpcUrl: this.configService.get<string>('RPC_URL_BSC_TESTNET'),
         },
       }),
-      ...(this.configService.get<string>('RPC_URL_MOONBEAM') && {
-        moonbeam: {
-          chainId: ChainId.MOONBEAM,
-          /**
-           * The RPC URL for the Moonbeam network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_MOONBEAM'),
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER_TESTNET') && {
-        xlayertestnet: {
-          chainId: ChainId.XLAYER_TESTNET,
-          /**
-           * The RPC URL for the XLayer Testnet network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER_TESTNET'),
-        },
-      }),
-      ...(this.configService.get<string>('RPC_URL_XLAYER') && {
-        xlayer: {
-          chainId: ChainId.XLAYER,
-          /**
-           * The RPC URL for the XLayer network.
-           */
-          rpcUrl: this.configService.get<string>('RPC_URL_XLAYER'),
-        },
-      }),
       ...(this.configService.get<string>('RPC_URL_LOCALHOST') && {
         localhost: {
           chainId: ChainId.LOCALHOST,
diff --git a/packages/apps/reputation-oracle/server/src/common/constants/errors.ts b/packages/apps/reputation-oracle/server/src/common/constants/errors.ts
deleted file mode 100644
index 44fc676bf0..0000000000
--- a/packages/apps/reputation-oracle/server/src/common/constants/errors.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Represents error messages related to escrow completion.
- */
-export enum ErrorEscrowCompletion {
-  NotFound = 'Escrow completion not found',
-  NotCreated = 'Escrow completion has not been created',
-  PendingProcessingFailed = 'Failed to process pending escrow completion',
-  PaidProcessingFailed = 'Failed to process paid escrow completion',
-  AwaitingPayoutsProcessingFailed = 'Failed to process payouts for escrow completion',
-}
-
-/**
- * Represents error messages related to results.
- */
-export enum ErrorResults {
-  IntermediateResultsURLNotSet = 'Intermediate results URL is not set',
-  NoIntermediateResultsFound = 'No intermediate results found',
-  NoAnnotationsMetaFound = 'No annotations meta found',
-  NoResultsHaveBeenVerified = 'No results have been verified',
-  NotAllRequiredSolutionsHaveBeenSent = 'Not all required solutions have been sent',
-}
-
-/**
- * Represents error messages related to manifest.
- */
-export enum ErrorManifest {
-  ManifestUrlDoesNotExist = 'Manifest url does not exist',
-  UnsupportedManifestType = 'Unsupported manifest type',
-}
-
-/**
- * Represents error messages related to signature.
- */
-export enum ErrorSignature {
-  SignatureNotVerified = 'Signature not verified',
-  InvalidSignature = 'Invalid signature',
-}
-
-/**
- * Represents error messages related to user.
- */
-export enum ErrorUser {
-  NotFound = 'User not found.',
-  AccountCannotBeRegistered = 'Account cannot be registered.',
-  BalanceCouldNotBeRetreived = 'User balance could not be retrieved.',
-  InvalidCredentials = 'Invalid credentials.',
-  AlreadyAssigned = 'User already has an address assigned.',
-  NoWalletAddresRegistered = 'No wallet address registered on your account.',
-  KycNotApproved = 'KYC not approved.',
-  LabelingEnableFailed = 'Failed to enable labeling for this account.',
-  InvalidType = 'User has invalid type.',
-  DuplicatedAddress = 'The address you are trying to use already exists. Please check that the address is correct or use a different address.',
-}
-
-/**
- * Represents error messages related to captcha.
- */
-export enum ErrorCapthca {
-  InvalidToken = 'Invalid captcha token provided',
-  VerificationFailed = 'Captcha verification failed',
-}
-
-/**
- * Represents error messages related to send grid.
- */
-export enum ErrorSendGrid {
-  EmailNotSent = 'Email was not sent',
-  InvalidApiKey = 'Invalid SendGrid API key',
-}
-
-/**
- * Represents error messages associated with a cron job.
- */
-export enum ErrorCronJob {
-  NotCreated = 'Cron job has not been created',
-  NotCompleted = 'Cron job is not completed',
-  Completed = 'Cron job is completed',
-}
-
-/**
- * Represents error messages related to web3.
- */
-export enum ErrorWeb3 {
-  NoValidNetworks = 'No valid networks found',
-  InvalidChainId = 'Invalid chain id provided for the configured environment',
-  GasPriceError = 'Error calculating gas price',
-}
-
-/**
- * Represents error messages related to operator.
- */
-export enum ErrorOperator {
-  OperatorAlreadyActive = 'Operator is already active',
-  OperatorNotActive = 'Operator not active',
-}
diff --git a/packages/apps/reputation-oracle/server/src/common/constants/networks.ts b/packages/apps/reputation-oracle/server/src/common/constants/networks.ts
index 9f128d0b71..9868bed377 100644
--- a/packages/apps/reputation-oracle/server/src/common/constants/networks.ts
+++ b/packages/apps/reputation-oracle/server/src/common/constants/networks.ts
@@ -6,10 +6,6 @@ export const TESTNET_CHAIN_IDS = [
   ChainId.SEPOLIA,
 ];
 
-export const MAINNET_CHAIN_IDS = [
-  ChainId.BSC_MAINNET,
-  ChainId.POLYGON,
-  ChainId.MOONBEAM,
-];
+export const MAINNET_CHAIN_IDS = [ChainId.BSC_MAINNET, ChainId.POLYGON];
 
 export const LOCALHOST_CHAIN_IDS = [ChainId.LOCALHOST];
diff --git a/packages/apps/reputation-oracle/server/src/common/enums/credential.ts b/packages/apps/reputation-oracle/server/src/common/enums/credential.ts
deleted file mode 100644
index fb07f83a49..0000000000
--- a/packages/apps/reputation-oracle/server/src/common/enums/credential.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export enum CredentialStatus {
-  ACTIVE = 'active',
-  EXPIRED = 'expired',
-  VALIDATED = 'validated',
-  ON_CHAIN = 'on_chain',
-}
-
-export enum CredentialValidationStatus {
-  VALIDATED = 'validated',
-  ON_CHAIN = 'on_chain',
-}
diff --git a/packages/apps/reputation-oracle/server/src/common/enums/web3.ts b/packages/apps/reputation-oracle/server/src/common/enums/web3.ts
index e3fee4c9fc..d99650b26e 100644
--- a/packages/apps/reputation-oracle/server/src/common/enums/web3.ts
+++ b/packages/apps/reputation-oracle/server/src/common/enums/web3.ts
@@ -9,6 +9,5 @@ export enum SignatureType {
   SIGNIN = 'signin',
   ENABLE_OPERATOR = 'enable_operator',
   DISABLE_OPERATOR = 'disable_operator',
-  CERTIFICATE_AUTHENTICATION = 'certificate_authentication',
   REGISTER_ADDRESS = 'register_address',
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/errors/controlled.ts b/packages/apps/reputation-oracle/server/src/common/errors/controlled.ts
deleted file mode 100644
index 32cc401c90..0000000000
--- a/packages/apps/reputation-oracle/server/src/common/errors/controlled.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { HttpStatus } from '@nestjs/common';
-
-export class ControlledError extends Error {
-  status: HttpStatus;
-
-  constructor(message: string, status: HttpStatus, stack?: string) {
-    super(message);
-    this.name = this.constructor.name;
-    this.status = status;
-    if (stack) this.stack = stack;
-    else Error.captureStackTrace(this, this.constructor);
-  }
-}
diff --git a/packages/apps/reputation-oracle/server/src/common/errors/manifest.ts b/packages/apps/reputation-oracle/server/src/common/errors/manifest.ts
new file mode 100644
index 0000000000..3ae3256d42
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/common/errors/manifest.ts
@@ -0,0 +1,15 @@
+import { BaseError } from './base';
+
+class ManifestError extends BaseError {}
+
+export class MissingManifestUrlError extends ManifestError {
+  constructor(public readonly escrowAddress: string) {
+    super('Manifest url is missing for escrow');
+  }
+}
+
+export class UnsupportedManifestTypeError extends ManifestError {
+  constructor(public readonly manifestType: unknown) {
+    super('Unsupported manifest type');
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts b/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
index 312f11689b..294d36cb0d 100644
--- a/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
@@ -8,7 +8,6 @@ import {
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 import { DatabaseError } from '../errors/database';
-import { ControlledError } from '../errors/controlled';
 
 @Catch()
 export class ExceptionFilter implements IExceptionFilter {
@@ -22,12 +21,7 @@ export class ExceptionFilter implements IExceptionFilter {
     let status = HttpStatus.INTERNAL_SERVER_ERROR;
     let message = 'Internal server error';
 
-    if (exception instanceof ControlledError) {
-      status = exception.status;
-      message = exception.message;
-
-      this.logger.error(`Reputation Oracle error: ${message}`, exception.stack);
-    } else if (exception instanceof DatabaseError) {
+    if (exception instanceof DatabaseError) {
       status = HttpStatus.UNPROCESSABLE_ENTITY;
       message = exception.message;
 
@@ -37,6 +31,10 @@ export class ExceptionFilter implements IExceptionFilter {
       );
       // Temp hack for the in progress exception handling refactoring
     } else if (exception instanceof HttpException) {
+      /**
+       * TODO: align this with common response schema
+       * to avoid missing properties
+       */
       return response
         .status(exception.getStatus())
         .json(exception.getResponse());
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts b/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts
new file mode 100644
index 0000000000..02cc60a07e
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts
@@ -0,0 +1,64 @@
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  HttpStatus,
+  HttpException,
+  Logger,
+} from '@nestjs/common';
+import { Request } from 'express';
+import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
+import { AuthConfigService } from '../config/auth-config.service';
+
+@Injectable()
+export class HCaptchaGuard implements CanActivate {
+  logger = new Logger(HCaptchaGuard.name);
+  constructor(
+    private readonly hCaptchaService: HCaptchaService,
+    private readonly authConfigSerice: AuthConfigService,
+  ) {}
+  public async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request: Request = context.switchToHttp().getRequest();
+
+    const { body } = request;
+    const hCaptchaToken = body['h_captcha_token'];
+
+    // TODO: Remove 27-45 lines once we figure out how to replace human app user
+    if (request.path === '/auth/signin') {
+      const email = body['email'];
+      // Checking email here to avoid unnecessary db calls
+      if (email === this.authConfigSerice.humanAppEmail) {
+        return true;
+      }
+    }
+
+    if (!hCaptchaToken) {
+      const message = 'hCaptcha token not provided';
+      this.logger.error(message, request.path);
+      throw new HttpException(
+        {
+          statusCode: HttpStatus.BAD_REQUEST,
+          message,
+          timestamp: new Date().toISOString(),
+        },
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
+      token: hCaptchaToken,
+    });
+    if (!captchaVerificationResult.success) {
+      throw new HttpException(
+        {
+          statusCode: HttpStatus.BAD_REQUEST,
+          message: 'Invalid hCaptcha token',
+          timestamp: new Date().toISOString(),
+        },
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    return true;
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
index 3745ed6a06..d7d4e1378b 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
@@ -1,12 +1,12 @@
 import {
   CanActivate,
   ExecutionContext,
+  HttpException,
   HttpStatus,
   Injectable,
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { ControlledError } from '../errors/controlled';
 import { JWT_STRATEGY_NAME } from '../constants';
 
 @Injectable()
@@ -31,8 +31,14 @@ export class JwtAuthGuard
         return true;
       }
 
-      console.error(e);
-      throw new ControlledError('Unauthorized', HttpStatus.UNAUTHORIZED);
+      throw new HttpException(
+        {
+          statusCode: HttpStatus.UNAUTHORIZED,
+          message: 'Unauthorized',
+          timestamp: new Date().toISOString(),
+        },
+        HttpStatus.UNAUTHORIZED,
+      );
     });
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
index 4e11b72508..aed6c26f3e 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
@@ -26,6 +26,7 @@ export class KycWebhookAuthGuard implements CanActivate {
       this.logger.error(message, request.path);
       throw new HttpException(
         {
+          statusCode: HttpStatus.UNAUTHORIZED,
           message,
           timestamp: new Date().toISOString(),
         },
@@ -48,6 +49,7 @@ export class KycWebhookAuthGuard implements CanActivate {
       this.logger.error(message, request.path);
       throw new HttpException(
         {
+          statusCode: HttpStatus.UNAUTHORIZED,
           message,
           timestamp: new Date().toISOString(),
         },
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
index 18c61336b7..379bf35ec1 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
@@ -3,11 +3,11 @@ import {
   CanActivate,
   ExecutionContext,
   HttpStatus,
+  HttpException,
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Role } from '../enums/user';
 import { ROLES_KEY } from '../decorators';
-import { ControlledError } from '../errors/controlled';
 
 @Injectable()
 export class RolesAuthGuard implements CanActivate {
@@ -30,6 +30,13 @@ export class RolesAuthGuard implements CanActivate {
       return true;
     }
 
-    throw new ControlledError('Unauthorized', HttpStatus.UNAUTHORIZED);
+    throw new HttpException(
+      {
+        statusCode: HttpStatus.UNAUTHORIZED,
+        message: 'Unauthorized',
+        timestamp: new Date().toISOString(),
+      },
+      HttpStatus.UNAUTHORIZED,
+    );
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
index 7d23cb7138..c32d407d86 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
@@ -1,22 +1,15 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { ExecutionContext, HttpStatus } from '@nestjs/common';
+import { ExecutionContext, HttpException, HttpStatus } from '@nestjs/common';
 import { SignatureAuthGuard } from './signature.auth';
-import { verifySignature } from '../utils/signature';
+import { signMessage } from '../utils/signature';
 import { ChainId, EscrowUtils } from '@human-protocol/sdk';
-import { MOCK_ADDRESS } from '../../../test/constants';
+import { MOCK_ADDRESS, MOCK_PRIVATE_KEY } from '../../../test/constants';
 import { AuthSignatureRole } from '../enums/role';
-import { ControlledError } from '../errors/controlled';
-
-jest.mock('../../common/utils/signature');
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
   EscrowUtils: {
-    getEscrow: jest.fn().mockResolvedValue({
-      launcher: '0x1234567890123456789012345678901234567890',
-      exchangeOracle: '0x1234567890123456789012345678901234567891',
-      reputationOracle: '0x1234567890123456789012345678901234567892',
-    }),
+    getEscrow: jest.fn(),
   },
 }));
 
@@ -38,6 +31,11 @@ describe('SignatureAuthGuard', () => {
     }).compile();
 
     guard = module.get<SignatureAuthGuard>(SignatureAuthGuard);
+    EscrowUtils.getEscrow = jest.fn().mockResolvedValueOnce({
+      launcher: MOCK_ADDRESS,
+      exchangeOracle: MOCK_ADDRESS,
+      reputationOracle: MOCK_ADDRESS,
+    });
   });
 
   it('should be defined', () => {
@@ -63,13 +61,13 @@ describe('SignatureAuthGuard', () => {
     });
 
     it('should return true if signature is verified', async () => {
-      mockRequest.headers['header-signature-key'] = 'validSignature';
-      mockRequest.body = {
+      const body = {
         escrow_address: MOCK_ADDRESS,
         chain_id: ChainId.LOCALHOST,
       };
-      (verifySignature as jest.Mock).mockReturnValue(true);
-
+      const signature = await signMessage(body, MOCK_PRIVATE_KEY);
+      mockRequest.headers['human-signature'] = signature;
+      mockRequest.body = body;
       const result = await guard.canActivate(context as any);
       expect(result).toBeTruthy();
       expect(EscrowUtils.getEscrow).toHaveBeenCalledWith(
@@ -79,18 +77,36 @@ describe('SignatureAuthGuard', () => {
     });
 
     it('should throw unauthorized exception if signature is not verified', async () => {
-      (verifySignature as jest.Mock).mockReturnValue(false);
-
-      await expect(guard.canActivate(context as any)).rejects.toThrow(
-        new ControlledError('Unauthorized', HttpStatus.UNAUTHORIZED),
+      let catchedError;
+      try {
+        await guard.canActivate(context as any);
+      } catch (error) {
+        catchedError = error;
+      }
+      expect(catchedError).toBeInstanceOf(HttpException);
+      expect(catchedError.response).toHaveProperty(
+        'message',
+        'Invalid web3 signature',
       );
+      expect(catchedError.response).toHaveProperty('timestamp');
+      expect(catchedError).toHaveProperty('status', HttpStatus.UNAUTHORIZED);
     });
 
     it('should throw unauthorized exception for unrecognized oracle type', async () => {
       mockRequest.originalUrl = '/some/random/path';
-      await expect(guard.canActivate(context as any)).rejects.toThrow(
-        new ControlledError('Unauthorized', HttpStatus.UNAUTHORIZED),
+      let catchedError;
+      try {
+        await guard.canActivate(context as any);
+      } catch (error) {
+        catchedError = error;
+      }
+      expect(catchedError).toBeInstanceOf(HttpException);
+      expect(catchedError.response).toHaveProperty(
+        'message',
+        'Invalid web3 signature',
       );
+      expect(catchedError.response).toHaveProperty('timestamp');
+      expect(catchedError).toHaveProperty('status', HttpStatus.UNAUTHORIZED);
     });
   });
 });
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
index 3e7015c8d9..6df42fbf22 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
@@ -1,17 +1,19 @@
 import {
   CanActivate,
   ExecutionContext,
+  HttpException,
   HttpStatus,
   Injectable,
+  Logger,
 } from '@nestjs/common';
 import { verifySignature } from '../utils/signature';
 import { HEADER_SIGNATURE_KEY } from '../constants';
 import { EscrowUtils } from '@human-protocol/sdk';
 import { AuthSignatureRole } from '../enums/role';
-import { ControlledError } from '../errors/controlled';
 
 @Injectable()
 export class SignatureAuthGuard implements CanActivate {
+  logger = new Logger(SignatureAuthGuard.name);
   constructor(private role: AuthSignatureRole[]) {}
 
   public async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -20,36 +22,40 @@ export class SignatureAuthGuard implements CanActivate {
     const data = request.body;
     const signature = request.headers[HEADER_SIGNATURE_KEY];
     const oracleAdresses: string[] = [];
-    try {
-      const escrowData = await EscrowUtils.getEscrow(
-        data.chain_id,
-        data.escrow_address,
-      );
-      if (
-        this.role.includes(AuthSignatureRole.JobLauncher) &&
-        escrowData.launcher.length
-      )
-        oracleAdresses.push(escrowData.launcher);
-      if (
-        this.role.includes(AuthSignatureRole.Exchange) &&
-        escrowData.exchangeOracle?.length
-      )
-        oracleAdresses.push(escrowData.exchangeOracle);
-      if (
-        this.role.includes(AuthSignatureRole.Recording) &&
-        escrowData.recordingOracle?.length
-      )
-        oracleAdresses.push(escrowData.recordingOracle);
+    const escrowData = await EscrowUtils.getEscrow(
+      data.chain_id,
+      data.escrow_address,
+    );
+    if (
+      this.role.includes(AuthSignatureRole.JobLauncher) &&
+      escrowData.launcher.length
+    )
+      oracleAdresses.push(escrowData.launcher);
+    if (
+      this.role.includes(AuthSignatureRole.Exchange) &&
+      escrowData.exchangeOracle?.length
+    )
+      oracleAdresses.push(escrowData.exchangeOracle);
+    if (
+      this.role.includes(AuthSignatureRole.Recording) &&
+      escrowData.recordingOracle?.length
+    )
+      oracleAdresses.push(escrowData.recordingOracle);
 
-      const isVerified = verifySignature(data, signature, oracleAdresses);
+    const isVerified = verifySignature(data, signature, oracleAdresses);
 
-      if (isVerified) {
-        return true;
-      }
-    } catch (error) {
-      console.error(error);
+    if (!isVerified) {
+      const message = 'Invalid web3 signature';
+      this.logger.error(message, request.path);
+      throw new HttpException(
+        {
+          statusCode: HttpStatus.UNAUTHORIZED,
+          message,
+          timestamp: new Date().toISOString(),
+        },
+        HttpStatus.UNAUTHORIZED,
+      );
     }
-
-    throw new ControlledError('Unauthorized', HttpStatus.UNAUTHORIZED);
+    return true;
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
index ea8f381fc3..7dee960c9e 100644
--- a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -200,4 +200,38 @@ describe('TransformEnumInterceptor', () => {
     });
     expect(callHandler.handle).toHaveBeenCalled();
   });
+
+  it('should return bodyOrQuery if instance is not an object', () => {
+    // Test with `null` as the instance
+    let result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      null,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with `undefined` as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      undefined,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (string) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      'some string',
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+
+    // Test with a primitive value (number) as the instance
+    result = interceptor['lowercaseEnumProperties'](
+      { status: 'PENDING' },
+      123,
+      MockDto,
+    );
+    expect(result).toEqual({ status: 'PENDING' });
+  });
 });
diff --git a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.ts b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
index 62309328a1..d24d146f34 100644
--- a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
+++ b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.ts
@@ -83,6 +83,10 @@ export class TransformEnumInterceptor implements NestInterceptor {
     instance: any,
     targetClass: ClassConstructor<any>,
   ): any {
+    if (!instance || typeof instance !== 'object') {
+      return bodyOrQuery;
+    }
+
     for (const property in bodyOrQuery) {
       if (bodyOrQuery.hasOwnProperty(property)) {
         const instanceValue = instance[property];
diff --git a/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts b/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
index 2e8d648406..702e9fe044 100644
--- a/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
+++ b/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
@@ -1,26 +1,31 @@
 import {
+  HttpException,
   HttpStatus,
   Injectable,
   ValidationError,
   ValidationPipe,
   ValidationPipeOptions,
 } from '@nestjs/common';
-import { ControlledError } from '../errors/controlled';
 
 // TODO: Revisit validation options
 @Injectable()
 export class HttpValidationPipe extends ValidationPipe {
   constructor(options?: ValidationPipeOptions) {
     super({
-      exceptionFactory: (errors: ValidationError[]): ControlledError => {
+      exceptionFactory: (errors: ValidationError[]) => {
         const errorMessages = errors
           .map(
             (error) =>
               Object.values((error as any).constraints) as unknown as string,
           )
           .flat();
-        throw new ControlledError(
-          errorMessages.join(', '),
+
+        return new HttpException(
+          {
+            statusCode: HttpStatus.BAD_REQUEST,
+            message: errorMessages.join(', '),
+            timestamp: new Date().toISOString(),
+          },
           HttpStatus.BAD_REQUEST,
         );
       },
diff --git a/packages/apps/reputation-oracle/server/src/common/utils/index.ts b/packages/apps/reputation-oracle/server/src/common/utils/index.ts
index 8e09c0d290..0178818dac 100644
--- a/packages/apps/reputation-oracle/server/src/common/utils/index.ts
+++ b/packages/apps/reputation-oracle/server/src/common/utils/index.ts
@@ -1,10 +1,8 @@
 import * as crypto from 'crypto';
 import { Readable } from 'stream';
-import { ErrorManifest } from '../constants/errors';
 import { CvatManifestDto, FortuneManifestDto } from '../dto/manifest';
 import { JobRequestType } from '../enums';
-import { ControlledError } from '../errors/controlled';
-import { HttpStatus } from '@nestjs/common';
+import { UnsupportedManifestTypeError } from '../errors/manifest';
 
 export function hashStream(stream: Readable): Promise<string> {
   return new Promise((resolve, reject) => {
@@ -30,19 +28,23 @@ export function getRequestType(
   const requestType =
     (manifest as FortuneManifestDto).requestType ||
     ((manifest as CvatManifestDto).annotation &&
-      (manifest as CvatManifestDto).annotation.type) ||
-    null;
+      (manifest as CvatManifestDto).annotation.type);
 
   if (!requestType) {
-    throw new ControlledError(
-      ErrorManifest.UnsupportedManifestType,
-      HttpStatus.BAD_REQUEST,
-    );
+    throw new UnsupportedManifestTypeError(requestType);
   }
 
   return requestType;
 }
 
-export function isValidJobRequestType(value: string): value is JobRequestType {
-  return Object.values(JobRequestType).includes(value as JobRequestType);
+export function assertValidJobRequestType(
+  value: string,
+): asserts value is JobRequestType {
+  const validValues = Object.values<string>(JobRequestType);
+
+  if (validValues.includes(value)) {
+    return;
+  }
+
+  throw new Error(`Unsupported request type: ${value}`);
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/utils/signature.spec.ts b/packages/apps/reputation-oracle/server/src/common/utils/signature.spec.ts
index 31e868621b..8f51eb4974 100644
--- a/packages/apps/reputation-oracle/server/src/common/utils/signature.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/common/utils/signature.spec.ts
@@ -1,27 +1,5 @@
 import { verifySignature, recoverSigner, signMessage } from './signature';
 import { MOCK_ADDRESS, MOCK_PRIVATE_KEY } from '../../../test/constants';
-import { ErrorSignature } from '../constants/errors';
-import { ControlledError } from '../errors/controlled';
-import { HttpStatus } from '@nestjs/common';
-
-jest.doMock('ethers', () => {
-  return {
-    utils: {
-      get verifyMessage() {
-        return jest.fn((message, signature) => {
-          if (message === 'valid-message' && signature === 'valid-signature') {
-            return 'recovered-address';
-          } else {
-            throw new ControlledError(
-              ErrorSignature.InvalidSignature,
-              HttpStatus.UNAUTHORIZED,
-            );
-          }
-        });
-      },
-    },
-  };
-});
 
 describe('Signature utility', () => {
   describe('verifySignature', () => {
@@ -34,24 +12,24 @@ describe('Signature utility', () => {
       expect(result).toBe(true);
     });
 
-    it('should throw conflict exception for signature not verified', async () => {
+    it('should return false for signature not verified', async () => {
       const message = 'Hello, this is a signed message!';
 
       const invalidSignature = await signMessage(message, MOCK_PRIVATE_KEY);
       const invalidAddress = '0x1234567890123456789012345678901234567892';
 
-      expect(() => {
-        verifySignature(message, invalidSignature, [invalidAddress]);
-      }).toThrow(ErrorSignature.SignatureNotVerified);
+      const result = verifySignature(message, invalidSignature, [
+        invalidAddress,
+      ]);
+      expect(result).toBe(false);
     });
 
-    it('should throw conflict exception for invalid signature', () => {
+    it('should return false in case of invalid signature', () => {
       const message = 'Hello, this is a signed message!';
       const invalidSignature = '0xInvalidSignature';
 
-      expect(() => {
-        verifySignature(message, invalidSignature, [MOCK_ADDRESS]);
-      }).toThrow(ErrorSignature.InvalidSignature);
+      const result = verifySignature(message, invalidSignature, [MOCK_ADDRESS]);
+      expect(result).toBe(false);
     });
   });
 
@@ -69,9 +47,8 @@ describe('Signature utility', () => {
       const message = 'Hello, this is a signed message!';
       const invalidSignature = '0xInvalidSignature';
 
-      expect(() => {
-        recoverSigner(message, invalidSignature);
-      }).toThrow(ErrorSignature.InvalidSignature);
+      const signer = recoverSigner(message, invalidSignature);
+      expect(signer).toBe('');
     });
 
     it('should stringify message object if it is not already a string', async () => {
diff --git a/packages/apps/reputation-oracle/server/src/common/utils/signature.ts b/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
index cec11ad4bc..a6d06bdef4 100644
--- a/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
+++ b/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
@@ -1,7 +1,4 @@
-import { HttpStatus } from '@nestjs/common';
 import { ethers } from 'ethers';
-import { ErrorSignature } from '../constants/errors';
-import { ControlledError } from '../errors/controlled';
 
 export function verifySignature(
   message: object | string,
@@ -10,16 +7,9 @@ export function verifySignature(
 ): boolean {
   const signer = recoverSigner(message, signature);
 
-  if (
-    !addresses.some((address) => address.toLowerCase() === signer.toLowerCase())
-  ) {
-    throw new ControlledError(
-      ErrorSignature.SignatureNotVerified,
-      HttpStatus.CONFLICT,
-    );
-  }
-
-  return true;
+  return addresses.some(
+    (address) => address.toLowerCase() === signer.toLowerCase(),
+  );
 }
 
 export async function signMessage(
@@ -47,13 +37,30 @@ export function recoverSigner(
   try {
     return ethers.verifyMessage(message, signature);
   } catch (e) {
-    throw new ControlledError(
-      ErrorSignature.InvalidSignature,
-      HttpStatus.CONFLICT,
-    );
+    return '';
   }
 }
 
 export function generateNonce(): string {
   return Buffer.from(ethers.randomBytes(16)).toString('hex');
 }
+
+type SignatureBody = {
+  from: string;
+  to: string;
+  contents: string;
+  nonce?: string;
+};
+export function prepareSignatureBody({
+  from,
+  to,
+  contents,
+  nonce,
+}: SignatureBody): SignatureBody {
+  return {
+    from: from.toLowerCase(),
+    to: to.toLowerCase(),
+    contents,
+    nonce: nonce ?? undefined,
+  };
+}
diff --git a/packages/apps/reputation-oracle/server/src/database/database.module.ts b/packages/apps/reputation-oracle/server/src/database/database.module.ts
index cc4a9269f9..88d7fd3d19 100644
--- a/packages/apps/reputation-oracle/server/src/database/database.module.ts
+++ b/packages/apps/reputation-oracle/server/src/database/database.module.ts
@@ -15,8 +15,6 @@ import { LoggerOptions } from 'typeorm';
 import { DatabaseConfigService } from '../common/config/database-config.service';
 import { ServerConfigService } from '../common/config/server-config.service';
 import { SiteKeyEntity } from '../modules/user/site-key.entity';
-import { CredentialValidationEntity } from '../modules/credentials/credential.entity';
-import { CredentialEntity } from '../modules/credentials/credential.entity';
 import { QualificationEntity } from '../modules/qualification/qualification.entity';
 import { UserQualificationEntity } from '../modules/qualification/user-qualification.entity';
 import { WebhookIncomingEntity } from '../modules/webhook/webhook-incoming.entity';
@@ -53,8 +51,6 @@ import { EscrowPayoutsBatchEntity } from '../modules/escrow-completion/escrow-pa
             EscrowCompletionEntity,
             EscrowPayoutsBatchEntity,
             ReputationEntity,
-            CredentialEntity,
-            CredentialValidationEntity,
             TokenEntity,
             UserEntity,
             KycEntity,
diff --git a/packages/apps/reputation-oracle/server/src/database/migrations/1738163861072-deleteCredentials.ts b/packages/apps/reputation-oracle/server/src/database/migrations/1738163861072-deleteCredentials.ts
new file mode 100644
index 0000000000..367a491108
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/database/migrations/1738163861072-deleteCredentials.ts
@@ -0,0 +1,59 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class DeleteCredentials1738163861072 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."credential_validations" DROP CONSTRAINT "FK_d1896792b36ed073631703df40a"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."credential_validations" DROP CONSTRAINT "FK_a546350ec2c97f067c802ff672a"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "hmt"."reputation_type_enum_old" AS ENUM('worker', 'job_launcher', 'exchange_oracle', 'recording_oracle', 'reputation_oracle')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."reputation" ALTER COLUMN "type" TYPE "hmt"."reputation_type_enum_old" USING "type"::"text"::"hmt"."reputation_type_enum_old"`,
+    );
+    await queryRunner.query(`DROP TYPE "hmt"."reputation_type_enum"`);
+    await queryRunner.query(
+      `ALTER TYPE "hmt"."reputation_type_enum_old" RENAME TO "reputation_type_enum"`,
+    );
+    await queryRunner.query(`DROP TABLE "hmt"."credential_validations"`);
+    await queryRunner.query(
+      `DROP TYPE "hmt"."credential_validations_status_enum"`,
+    );
+    await queryRunner.query(`DROP TABLE "hmt"."credentials"`);
+    await queryRunner.query(`DROP TYPE "hmt"."credentials_status_enum"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TYPE "hmt"."credentials_status_enum" AS ENUM('active', 'expired', 'validated', 'on_chain')`,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "hmt"."credentials" ("id" SERIAL NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL, "updated_at" TIMESTAMP WITH TIME ZONE NOT NULL, "reference" character varying NOT NULL, "description" text NOT NULL, "url" character varying NOT NULL, "status" "hmt"."credentials_status_enum" NOT NULL, "starts_at" TIMESTAMP WITH TIME ZONE NOT NULL, "expires_at" TIMESTAMP WITH TIME ZONE, CONSTRAINT "UQ_481aa1ff346d6eee7656880c568" UNIQUE ("reference"), CONSTRAINT "PK_1e38bc43be6697cdda548ad27a6" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "hmt"."credential_validations_status_enum" AS ENUM('validated', 'on_chain')`,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "hmt"."credential_validations" ("id" SERIAL NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL, "updated_at" TIMESTAMP WITH TIME ZONE NOT NULL, "status" "hmt"."credential_validations_status_enum" NOT NULL, "certificate" character varying, "credential_id" integer, "user_id" integer, CONSTRAINT "PK_ea03b6fbdfcddca7c2625f6a091" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `ALTER TYPE "hmt"."reputation_type_enum" RENAME TO "reputation_type_enum_old"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "hmt"."reputation_type_enum" AS ENUM('worker', 'job_launcher', 'exchange_oracle', 'recording_oracle', 'reputation_oracle', 'credential_validator')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."reputation" ALTER COLUMN "type" TYPE "hmt"."reputation_type_enum" USING "type"::"text"::"hmt"."reputation_type_enum"`,
+    );
+    await queryRunner.query(`DROP TYPE "hmt"."reputation_type_enum_old"`);
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."credential_validations" ADD CONSTRAINT "FK_a546350ec2c97f067c802ff672a" FOREIGN KEY ("credential_id") REFERENCES "hmt"."credentials"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "hmt"."credential_validations" ADD CONSTRAINT "FK_d1896792b36ed073631703df40a" FOREIGN KEY ("user_id") REFERENCES "hmt"."users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
index a9c1763451..7576ea81a6 100644
--- a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
@@ -23,7 +23,6 @@ jest.mock('rxjs', () => {
 describe('hCaptchaService', () => {
   let hcaptchaService: HCaptchaService;
   let httpService: HttpService;
-  let configService: ConfigService;
 
   beforeAll(async () => {
     const mockHttpService: DeepPartial<HttpService> = {
@@ -57,7 +56,6 @@ describe('hCaptchaService', () => {
     }).compile();
 
     httpService = moduleRef.get<HttpService>(HttpService);
-    configService = moduleRef.get<ConfigService>(ConfigService);
     hcaptchaService = moduleRef.get<HCaptchaService>(HCaptchaService);
   });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
index 9fa0ba1a90..4a3105f660 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
@@ -32,10 +32,11 @@ import {
 } from './auth.dto';
 import { AuthService } from './auth.service';
 import { JwtAuthGuard } from '../../common/guards';
+import { HCaptchaGuard } from '../../common/guards/hcaptcha';
 import { RequestWithUser } from '../../common/types';
 import { TokenRepository } from './token.repository';
 import { TokenType } from './token.entity';
-import { AuthControllerErrorsFilter } from './auth.error-filter';
+import { AuthControllerErrorsFilter } from './auth.error.filter';
 
 @ApiTags('Auth')
 @ApiResponse({
@@ -66,6 +67,7 @@ export class AuthJwtController {
 
   @Public()
   @Post('/signup')
+  @UseGuards(HCaptchaGuard)
   @UseInterceptors(ClassSerializerInterceptor)
   @ApiOperation({
     summary: 'User Signup',
@@ -87,6 +89,7 @@ export class AuthJwtController {
 
   @Public()
   @Post('/signin')
+  @UseGuards(HCaptchaGuard)
   @HttpCode(200)
   @ApiOperation({
     summary: 'User Signin',
@@ -188,6 +191,7 @@ export class AuthJwtController {
 
   @Public()
   @Post('/forgot-password')
+  @UseGuards(HCaptchaGuard)
   @HttpCode(204)
   @ApiOperation({
     summary: 'Forgot Password',
@@ -212,6 +216,7 @@ export class AuthJwtController {
 
   @Public()
   @Post('/restore-password')
+  @UseGuards(HCaptchaGuard)
   @HttpCode(204)
   @ApiOperation({
     summary: 'Restore Password',
@@ -251,7 +256,7 @@ export class AuthJwtController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(HCaptchaGuard, JwtAuthGuard)
   @HttpCode(204)
   @Post('/resend-email-verification')
   @ApiOperation({
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.error-filter.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
similarity index 76%
rename from packages/apps/reputation-oracle/server/src/modules/auth/auth.error-filter.ts
rename to packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
index 8be962b18b..64f6072ed2 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.error-filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
@@ -9,16 +9,23 @@ import { Request, Response } from 'express';
 
 import {
   AuthError,
-  DuplicatedUserError,
+  DuplicatedUserAddressError,
+  DuplicatedUserEmailError,
   InvalidOperatorSignupDataError,
-} from './auth.errors';
+} from './auth.error';
 
 type AuthControllerError =
   | AuthError
-  | DuplicatedUserError
-  | InvalidOperatorSignupDataError;
+  | DuplicatedUserEmailError
+  | InvalidOperatorSignupDataError
+  | DuplicatedUserAddressError;
 
-@Catch(AuthError, DuplicatedUserError, InvalidOperatorSignupDataError)
+@Catch(
+  AuthError,
+  DuplicatedUserEmailError,
+  DuplicatedUserAddressError,
+  InvalidOperatorSignupDataError,
+)
 export class AuthControllerErrorsFilter implements ExceptionFilter {
   private logger = new Logger(AuthControllerErrorsFilter.name);
   catch(exception: AuthControllerError, host: ArgumentsHost) {
@@ -28,7 +35,7 @@ export class AuthControllerErrorsFilter implements ExceptionFilter {
     let status = HttpStatus.UNAUTHORIZED;
 
     let logContext: string | undefined;
-    if (exception instanceof DuplicatedUserError) {
+    if (exception instanceof DuplicatedUserEmailError) {
       status = HttpStatus.CONFLICT;
       logContext = exception.email;
     } else if (exception instanceof InvalidOperatorSignupDataError) {
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.errors.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.ts
similarity index 78%
rename from packages/apps/reputation-oracle/server/src/modules/auth/auth.errors.ts
rename to packages/apps/reputation-oracle/server/src/modules/auth/auth.error.ts
index edf8e651e1..f9c643dd5a 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.errors.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.ts
@@ -1,4 +1,3 @@
-import { ErrorCapthca } from '../../common/constants/errors';
 import { BaseError } from '../../common/errors/base';
 
 export enum AuthErrorMessage {
@@ -6,10 +5,11 @@ export enum AuthErrorMessage {
   INVALID_REFRESH_TOKEN = 'Refresh token is not valid',
   REFRESH_TOKEN_EXPIRED = 'Refresh token expired',
   INVALID_WEB3_SIGNATURE = 'Invalid signature',
+  INVALID_ADDRESS = 'Invalid address',
 }
 
 export class AuthError extends BaseError {
-  constructor(message: AuthErrorMessage | ErrorCapthca) {
+  constructor(message: AuthErrorMessage) {
     super(message);
   }
 }
@@ -44,10 +44,18 @@ export class InvalidOperatorJobTypesError extends InvalidOperatorSignupDataError
   }
 }
 
-export class DuplicatedUserError extends BaseError {
+export class DuplicatedUserEmailError extends BaseError {
   constructor(public readonly email: string) {
     super(
       'The email you are trying to use already exists. Please check that the email is correct or use a different email.',
     );
   }
 }
+
+export class DuplicatedUserAddressError extends BaseError {
+  constructor(public readonly address: string) {
+    super(
+      'The address you are trying to use already exists. Please, use a different address.',
+    );
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
index a026ddddbc..20d7f3d23f 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
@@ -7,7 +7,6 @@ import { UserRepository } from '../user/user.repository';
 import { JwtService } from '@nestjs/jwt';
 import { UserService } from '../user/user.service';
 import { UserEntity } from '../user/user.entity';
-import { ErrorSignature, ErrorUser } from '../../common/constants/errors';
 import {
   MOCK_ACCESS_TOKEN,
   MOCK_ADDRESS,
@@ -24,12 +23,15 @@ import { TokenEntity, TokenType } from './token.entity';
 import { v4 } from 'uuid';
 import { UserStatus, Role } from '../../common/enums/user';
 import { SendGridService } from '../sendgrid/sendgrid.service';
-import { HttpStatus } from '@nestjs/common';
 import { SENDGRID_TEMPLATES, SERVICE_NAME } from '../../common/constants';
-import { generateNonce, signMessage } from '../../common/utils/signature';
+import {
+  generateNonce,
+  signMessage,
+  prepareSignatureBody,
+} from '../../common/utils/signature';
 import { Web3Service } from '../web3/web3.service';
 import { ChainId, KVStoreClient, KVStoreUtils } from '@human-protocol/sdk';
-import { PrepareSignatureDto, SignatureBodyDto } from '../user/user.dto';
+import { PrepareSignatureDto } from '../user/user.dto';
 import { SignatureType } from '../../common/enums/web3';
 import { AuthConfigService } from '../../common/config/auth-config.service';
 import { ServerConfigService } from '../../common/config/server-config.service';
@@ -38,18 +40,17 @@ import { ConfigService } from '@nestjs/config';
 import { SiteKeyRepository } from '../user/site-key.repository';
 import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
 import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
-import { ControlledError } from '../../common/errors/controlled';
 import { NetworkConfigService } from '../../common/config/network-config.service';
 import { JobRequestType } from '../../common/enums';
 import {
   AuthError,
   AuthErrorMessage,
-  DuplicatedUserError,
+  DuplicatedUserEmailError,
   InvalidOperatorFeeError,
   InvalidOperatorJobTypesError,
   InvalidOperatorRoleError,
   InvalidOperatorUrlError,
-} from './auth.errors';
+} from './auth.error';
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
@@ -129,9 +130,7 @@ describe('AuthService', () => {
         {
           provide: Web3Service,
           useValue: {
-            prepareSignatureBody: jest.fn(),
             getSigner: jest.fn().mockReturnValue(signerMock),
-            signMessage: jest.fn(),
             getOperatorAddress: jest.fn().mockReturnValue(MOCK_ADDRESS),
           },
         },
@@ -263,7 +262,7 @@ describe('AuthService', () => {
         .mockResolvedValue(userEntity as any);
 
       await expect(authService.signup(userCreateDto)).rejects.toThrow(
-        new DuplicatedUserError(userEntity.email),
+        new DuplicatedUserEmailError(userEntity.email),
       );
 
       expect(userRepository.findOneByEmail).toHaveBeenCalledWith(
@@ -641,7 +640,7 @@ describe('AuthService', () => {
         let updateNonceMock: any;
 
         beforeEach(() => {
-          getByAddressMock = jest.spyOn(userService, 'getByAddress');
+          getByAddressMock = jest.spyOn(userRepository, 'findOneByAddress');
           updateNonceMock = jest.spyOn(userService, 'updateNonce');
 
           jest.spyOn(authService, 'auth').mockResolvedValue({
@@ -677,7 +676,9 @@ describe('AuthService', () => {
             signature,
           });
 
-          expect(userService.getByAddress).toHaveBeenCalledWith(MOCK_ADDRESS);
+          expect(userRepository.findOneByAddress).toHaveBeenCalledWith(
+            MOCK_ADDRESS,
+          );
           expect(userService.updateNonce).toHaveBeenCalledWith(userEntity);
 
           expect(authService.auth).toHaveBeenCalledWith(userEntity);
@@ -699,10 +700,7 @@ describe('AuthService', () => {
               signature: invalidSignature,
             }),
           ).rejects.toThrow(
-            new ControlledError(
-              ErrorSignature.SignatureNotVerified,
-              HttpStatus.CONFLICT,
-            ),
+            new AuthError(AuthErrorMessage.INVALID_WEB3_SIGNATURE),
           );
         });
       });
@@ -721,12 +719,12 @@ describe('AuthService', () => {
           nonce,
         };
 
-        const preSignUpDataMock: SignatureBodyDto = {
-          from: MOCK_ADDRESS.toLowerCase(),
-          to: MOCK_ADDRESS.toLowerCase(),
-          contents: 'signup',
-          nonce: undefined,
-        };
+        const preSignUpData = prepareSignatureBody({
+          from: web3PreSignUpDto.address,
+          to: MOCK_ADDRESS,
+          contents: SignatureType.SIGNUP,
+        });
+
         let createUserMock: any;
 
         beforeEach(() => {
@@ -738,39 +736,15 @@ describe('AuthService', () => {
             accessToken: MOCK_ACCESS_TOKEN,
             refreshToken: MOCK_REFRESH_TOKEN,
           });
-
           jest
-            .spyOn(web3Service as any, 'prepareSignatureBody')
-            .mockReturnValue(preSignUpDataMock);
+            .spyOn(userRepository, 'findOneByAddress')
+            .mockResolvedValue(null);
         });
 
         afterEach(() => {
           jest.clearAllMocks();
         });
 
-        it('should prepare the signature body and return it', async () => {
-          const signatureType = SignatureType.SIGNUP;
-          const address = '0xCf88b3f1992458C2f5a229573c768D0E9F70C44e';
-
-          const expectedResult = {
-            from: address,
-            to: '0xCf88b3f1992458C2f5a229573c768D0E9F70C44e',
-            contents: 'signup',
-            nonce: undefined,
-          };
-
-          jest
-            .spyOn(userService, 'prepareSignatureBody')
-            .mockResolvedValue(expectedResult);
-
-          const result = await userService.prepareSignatureBody(
-            signatureType,
-            address,
-          );
-
-          expect(result).toEqual(expectedResult);
-        });
-
         it('should create a new web3 user and return the token', async () => {
           (KVStoreClient.build as any).mockImplementationOnce(() => ({
             set: jest.fn(),
@@ -782,10 +756,7 @@ describe('AuthService', () => {
             .mockResolvedValueOnce(1)
             .mockResolvedValueOnce(JobRequestType.FORTUNE);
 
-          const signature = await signMessage(
-            preSignUpDataMock,
-            MOCK_PRIVATE_KEY,
-          );
+          const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
           const result = await authService.web3Signup({
             address: web3PreSignUpDto.address,
@@ -817,18 +788,13 @@ describe('AuthService', () => {
               signature: invalidSignature,
             }),
           ).rejects.toThrow(
-            new ControlledError(
-              ErrorSignature.SignatureNotVerified,
-              HttpStatus.CONFLICT,
-            ),
+            new AuthError(AuthErrorMessage.INVALID_WEB3_SIGNATURE),
           );
         });
         it('should throw if role is not in KVStore', async () => {
           KVStoreUtils.get = jest.fn().mockResolvedValueOnce('');
-          const signature = await signMessage(
-            preSignUpDataMock,
-            MOCK_PRIVATE_KEY,
-          );
+
+          const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
           await expect(
             authService.web3Signup({
@@ -840,10 +806,8 @@ describe('AuthService', () => {
         });
         it('should throw if fee is not in KVStore', async () => {
           KVStoreUtils.get = jest.fn().mockResolvedValueOnce('Job Launcher');
-          const signature = await signMessage(
-            preSignUpDataMock,
-            MOCK_PRIVATE_KEY,
-          );
+
+          const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
           await expect(
             authService.web3Signup({
@@ -859,10 +823,7 @@ describe('AuthService', () => {
             .mockResolvedValueOnce('Job Launcher')
             .mockResolvedValueOnce('url');
 
-          const signature = await signMessage(
-            preSignUpDataMock,
-            MOCK_PRIVATE_KEY,
-          );
+          const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
           await expect(
             authService.web3Signup({
@@ -879,10 +840,7 @@ describe('AuthService', () => {
             .mockResolvedValueOnce('url')
             .mockResolvedValueOnce(1);
 
-          const signature = await signMessage(
-            preSignUpDataMock,
-            MOCK_PRIVATE_KEY,
-          );
+          const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
           await expect(
             authService.web3Signup({
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
index 69faa8e82a..fce62a5e1d 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 
-import { ErrorCapthca } from '../../common/constants/errors';
 import {
   OperatorStatus,
   Role as UserRole,
@@ -35,21 +34,22 @@ import {
   Role,
 } from '@human-protocol/sdk';
 import { SignatureType, Web3Env } from '../../common/enums/web3';
+import { prepareSignatureBody } from '../../common/utils/signature';
 import { UserRepository } from '../user/user.repository';
 import { AuthConfigService } from '../../common/config/auth-config.service';
 import { ServerConfigService } from '../../common/config/server-config.service';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
-import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
 import { SiteKeyType } from '../../common/enums';
 import {
   AuthError,
   AuthErrorMessage,
-  DuplicatedUserError,
+  DuplicatedUserAddressError,
+  DuplicatedUserEmailError,
   InvalidOperatorFeeError,
   InvalidOperatorJobTypesError,
   InvalidOperatorRoleError,
   InvalidOperatorUrlError,
-} from './auth.errors';
+} from './auth.error';
 
 @Injectable()
 export class AuthService {
@@ -65,14 +65,9 @@ export class AuthService {
     private readonly sendgridService: SendGridService,
     private readonly web3Service: Web3Service,
     private readonly userRepository: UserRepository,
-    private readonly hCaptchaService: HCaptchaService,
   ) {}
 
-  public async signin({
-    email,
-    password,
-    hCaptchaToken,
-  }: SignInDto): Promise<AuthDto> {
+  public async signin({ email, password }: SignInDto): Promise<AuthDto> {
     const userEntity = await this.userRepository.findOneByEmail(email);
     if (!userEntity) {
       throw new AuthError(AuthErrorMessage.INVALID_CREDENTIALS);
@@ -82,36 +77,13 @@ export class AuthService {
       throw new AuthError(AuthErrorMessage.INVALID_CREDENTIALS);
     }
 
-    if (userEntity.role !== UserRole.HUMAN_APP) {
-      if (!hCaptchaToken) {
-        throw new AuthError(ErrorCapthca.InvalidToken);
-      }
-
-      const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-        token: hCaptchaToken,
-      });
-      if (!captchaVerificationResult.success) {
-        throw new AuthError(ErrorCapthca.VerificationFailed);
-      }
-    }
-
     return this.auth(userEntity);
   }
 
   public async signup(data: UserCreateDto): Promise<UserEntity> {
-    if (!data.hCaptchaToken) {
-      throw new AuthError(ErrorCapthca.InvalidToken);
-    }
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-      token: data.hCaptchaToken,
-    });
-    if (!captchaVerificationResult.success) {
-      throw new AuthError(ErrorCapthca.VerificationFailed);
-    }
-
     const storedUser = await this.userRepository.findOneByEmail(data.email);
     if (storedUser) {
-      throw new DuplicatedUserError(data.email);
+      throw new DuplicatedUserEmailError(data.email);
     }
     const userEntity = await this.userService.create(data);
 
@@ -237,16 +209,6 @@ export class AuthService {
   }
 
   public async forgotPassword(data: ForgotPasswordDto): Promise<void> {
-    if (!data.hCaptchaToken) {
-      throw new AuthError(ErrorCapthca.InvalidToken);
-    }
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-      token: data.hCaptchaToken,
-    });
-    if (!captchaVerificationResult.success) {
-      throw new AuthError(ErrorCapthca.VerificationFailed);
-    }
-
     const userEntity = await this.userRepository.findOneByEmail(data.email);
 
     if (!userEntity) {
@@ -287,16 +249,6 @@ export class AuthService {
   }
 
   public async restorePassword(data: RestorePasswordDto): Promise<void> {
-    if (!data.hCaptchaToken) {
-      throw new AuthError(ErrorCapthca.InvalidToken);
-    }
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-      token: data.hCaptchaToken,
-    });
-    if (!captchaVerificationResult.success) {
-      throw new AuthError(ErrorCapthca.VerificationFailed);
-    }
-
     const tokenEntity = await this.tokenRepository.findOneByUuidAndType(
       data.token,
       TokenType.PASSWORD,
@@ -347,16 +299,6 @@ export class AuthService {
   public async resendEmailVerification(
     data: ResendEmailVerificationDto,
   ): Promise<void> {
-    if (!data.hCaptchaToken) {
-      throw new AuthError(ErrorCapthca.InvalidToken);
-    }
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-      token: data.hCaptchaToken,
-    });
-    if (!captchaVerificationResult.success) {
-      throw new AuthError(ErrorCapthca.VerificationFailed);
-    }
-
     const userEntity = await this.userRepository.findOneByEmail(data.email);
     if (!userEntity || userEntity.status !== UserStatus.PENDING) {
       return;
@@ -396,10 +338,11 @@ export class AuthService {
   }
 
   public async web3Signup(data: Web3SignUpDto): Promise<AuthDto> {
-    const preSignUpData = await this.userService.prepareSignatureBody(
-      SignatureType.SIGNUP,
-      data.address,
-    );
+    const preSignUpData = prepareSignatureBody({
+      from: data.address,
+      to: this.web3Service.getOperatorAddress(),
+      contents: SignatureType.SIGNUP,
+    });
 
     const verified = verifySignature(preSignUpData, data.signature, [
       data.address,
@@ -468,6 +411,11 @@ export class AuthService {
       throw new InvalidOperatorJobTypesError(jobTypes);
     }
 
+    const user = await this.userRepository.findOneByAddress(data.address);
+
+    if (user) {
+      throw new DuplicatedUserAddressError(data.address);
+    }
     const userEntity = await this.userService.createWeb3User(data.address);
 
     await kvstore.set(data.address.toLowerCase(), OperatorStatus.ACTIVE);
@@ -476,16 +424,21 @@ export class AuthService {
   }
 
   public async web3Signin(data: Web3SignInDto): Promise<AuthDto> {
-    const userEntity = await this.userService.getByAddress(data.address);
+    const userEntity = await this.userRepository.findOneByAddress(data.address);
 
-    const verified = verifySignature(
-      await this.userService.prepareSignatureBody(
-        SignatureType.SIGNIN,
-        data.address,
-      ),
-      data.signature,
-      [data.address],
-    );
+    if (!userEntity) {
+      throw new AuthError(AuthErrorMessage.INVALID_ADDRESS);
+    }
+
+    const preSigninData = prepareSignatureBody({
+      from: data.address,
+      to: this.web3Service.getOperatorAddress(),
+      contents: SignatureType.SIGNIN,
+      nonce: (await this.userRepository.findOneByAddress(data.address))?.nonce,
+    });
+    const verified = verifySignature(preSigninData, data.signature, [
+      data.address,
+    ]);
 
     if (!verified) {
       throw new AuthError(AuthErrorMessage.INVALID_WEB3_SIGNATURE);
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.dto.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.dto.ts
deleted file mode 100644
index 7b2cba0123..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.dto.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { IsString, IsOptional, IsDateString } from 'class-validator';
-
-export class CreateCredentialDto {
-  @IsString()
-  public reference: string;
-
-  @IsString()
-  public description: string;
-
-  @IsString()
-  public url: string;
-
-  @IsDateString()
-  public startsAt: Date;
-
-  @IsOptional()
-  @IsDateString()
-  public expiresAt?: Date;
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.entity.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.entity.ts
deleted file mode 100644
index 7bb8540fd3..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.entity.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Column, Entity, ManyToOne } from 'typeorm';
-import { NS } from '../../common/constants';
-import { BaseEntity } from '../../database/base.entity';
-import {
-  CredentialStatus,
-  CredentialValidationStatus,
-} from '../../common/enums/credential';
-import { UserEntity } from '../user/user.entity';
-
-@Entity({ schema: NS, name: 'credentials' })
-export class CredentialEntity extends BaseEntity {
-  @Column({ type: 'varchar', unique: true })
-  public reference: string;
-
-  @Column({ type: 'text' })
-  public description: string;
-
-  @Column({ type: 'varchar' })
-  public url: string;
-
-  @Column({
-    type: 'enum',
-    enum: CredentialStatus,
-  })
-  public status: CredentialStatus;
-
-  @Column({ type: 'timestamptz' })
-  public startsAt: Date;
-
-  @Column({ type: 'timestamptz', nullable: true })
-  public expiresAt?: Date;
-}
-
-@Entity({ schema: NS, name: 'credential_validations' })
-export class CredentialValidationEntity extends BaseEntity {
-  @ManyToOne(() => CredentialEntity, { eager: true })
-  credential: CredentialEntity;
-
-  @ManyToOne(() => UserEntity, { eager: true })
-  user: UserEntity;
-
-  @Column({ type: 'enum', enum: CredentialValidationStatus })
-  status: CredentialValidationStatus;
-
-  @Column({ nullable: true })
-  certificate: string;
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.module.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.module.ts
deleted file mode 100644
index 2113180f66..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Logger, Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-
-import { CredentialService } from './credential.service';
-import { CredentialRepository } from './credential.repository';
-import { Web3Module } from '../web3/web3.module'; // Assuming integration with blockchain
-import { UserModule } from '../user/user.module';
-
-@Module({
-  imports: [ConfigModule, Web3Module, UserModule],
-  providers: [Logger, CredentialService, CredentialRepository],
-  exports: [CredentialService],
-})
-export class CredentialModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.repository.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.repository.ts
deleted file mode 100644
index 0127af471d..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.repository.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { BaseRepository } from '../../database/base.repository';
-import { DataSource } from 'typeorm';
-import { CredentialEntity } from './credential.entity';
-
-@Injectable()
-export class CredentialRepository extends BaseRepository<CredentialEntity> {
-  private readonly logger = new Logger(CredentialRepository.name);
-
-  constructor(private dataSource: DataSource) {
-    super(CredentialEntity, dataSource);
-  }
-
-  async findByReference(reference: string): Promise<CredentialEntity | null> {
-    const credentialEntity = this.findOne({ where: { reference } });
-    return credentialEntity;
-  }
-
-  async getCredentials(status?: string): Promise<CredentialEntity[]> {
-    let queryBuilder = this.createQueryBuilder('credential');
-    if (status) {
-      queryBuilder = queryBuilder.where('credential.status = :status', {
-        status,
-      });
-    }
-    const credentials = await queryBuilder.getMany();
-    return credentials;
-  }
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.spec.ts
deleted file mode 100644
index 1bf34f7f1c..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.spec.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { Test } from '@nestjs/testing';
-import { CredentialService } from './credential.service';
-import { CredentialRepository } from './credential.repository';
-import { Web3ConfigService } from '../../common/config/web3-config.service';
-import { createMock } from '@golevelup/ts-jest';
-import { CredentialEntity } from './credential.entity';
-import { MOCK_ADDRESS } from '../../../test/constants';
-import { Web3Service } from '../web3/web3.service';
-import { SelectQueryBuilder } from 'typeorm';
-import { CredentialStatus } from '../../common/enums/credential';
-import { CreateCredentialDto } from './credential.dto';
-import { UserService } from '../user/user.service';
-import { ControlledError } from '../../common/errors/controlled';
-import { HttpStatus } from '@nestjs/common';
-
-jest.mock('@human-protocol/sdk', () => ({
-  ...jest.requireActual('@human-protocol/sdk'),
-  EscrowClient: {
-    build: jest.fn().mockImplementation(() => ({
-      getReputationOracleAddress: jest.fn().mockResolvedValue('MOCK_ADDRESS'),
-    })),
-  },
-  KVStoreClient: {
-    build: jest.fn().mockImplementation(() => ({
-      set: jest.fn(),
-    })),
-  },
-  KVStoreUtils: {
-    get: jest.fn(),
-  },
-}));
-
-describe('CredentialService', () => {
-  let credentialService: CredentialService;
-  let credentialRepository: CredentialRepository;
-
-  beforeEach(async () => {
-    const moduleRef = await Test.createTestingModule({
-      providers: [
-        CredentialService,
-        {
-          provide: CredentialRepository,
-          useValue: createMock<CredentialRepository>(),
-        },
-        {
-          provide: Web3Service,
-          useValue: {
-            getSigner: jest.fn().mockReturnValue({ address: MOCK_ADDRESS }),
-            signMessage: jest.fn(),
-            prepareSignatureBody: jest.fn(),
-          },
-        },
-        {
-          provide: Web3ConfigService,
-          useValue: createMock<Web3ConfigService>(),
-        },
-        {
-          provide: UserService,
-          useValue: createMock<UserService>(),
-        },
-      ],
-    }).compile();
-
-    credentialService = moduleRef.get<CredentialService>(CredentialService);
-    credentialRepository = moduleRef.get(CredentialRepository);
-  });
-
-  describe('createCredential', () => {
-    it('should create a new credential and return a credential entity', async () => {
-      const startsAtDate = new Date('2024-05-12T13:48:35.938Z');
-      const createCredentialDto: CreateCredentialDto = {
-        reference: 'bbe5b21336ce',
-        description: 'expertise skill',
-        url: 'https://credentials-validator.com?credential_id=1',
-        startsAt: startsAtDate,
-      };
-
-      const createdCredential = new CredentialEntity();
-      createdCredential.reference = createCredentialDto.reference;
-      createdCredential.description = createCredentialDto.description;
-      createdCredential.url = createCredentialDto.url;
-      createdCredential.startsAt = startsAtDate;
-      createdCredential.status = CredentialStatus.ACTIVE;
-
-      jest
-        .spyOn(credentialRepository, 'createUnique')
-        .mockResolvedValue(createdCredential);
-
-      const result =
-        await credentialService.createCredential(createdCredential);
-
-      expect(credentialRepository.createUnique).toHaveBeenCalledWith(
-        createdCredential,
-      );
-
-      expect(result).toMatchObject(createdCredential);
-    });
-
-    describe('getCredentials', () => {
-      it('should return a list of credentials for a user', async () => {
-        const credentials = [new CredentialEntity()];
-        const mockQueryBuilder = {
-          where: jest.fn().mockReturnThis(),
-          andWhere: jest.fn().mockReturnThis(),
-          getMany: jest.fn().mockResolvedValue(credentials),
-        } as Partial<SelectQueryBuilder<CredentialEntity>>;
-
-        jest
-          .spyOn(credentialRepository, 'createQueryBuilder')
-          .mockReturnValue(
-            mockQueryBuilder as SelectQueryBuilder<CredentialEntity>,
-          );
-
-        const result = await credentialService.getCredentials(
-          { id: 'user123' },
-          CredentialStatus.ACTIVE,
-        );
-        expect(result).toEqual(credentials);
-      });
-    });
-
-    describe('getByReference', () => {
-      it('should return a credential by reference', async () => {
-        const credential = new CredentialEntity();
-        jest
-          .spyOn(credentialRepository, 'findByReference')
-          .mockResolvedValue(credential);
-
-        const result = await credentialService.getByReference('ref123');
-        expect(result).toEqual(credential);
-      });
-
-      it('should return null if the credential is expired', async () => {
-        const credential = {
-          status: CredentialStatus.EXPIRED,
-        } as CredentialEntity;
-        jest
-          .spyOn(credentialRepository, 'findByReference')
-          .mockResolvedValue(credential);
-
-        const result = await credentialService.getByReference('ref123');
-        expect(result).toBeNull();
-      });
-    });
-
-    describe('validateCredential', () => {
-      it('should validate an active credential', async () => {
-        const credential = {
-          status: CredentialStatus.ACTIVE,
-        } as CredentialEntity;
-        jest
-          .spyOn(credentialRepository, 'findByReference')
-          .mockResolvedValue(credential);
-        jest.spyOn(credentialRepository, 'save').mockResolvedValue(credential);
-
-        await credentialService.validateCredential('ref123');
-        expect(credential.status).toEqual(CredentialStatus.VALIDATED);
-      });
-
-      it('should throw an error if the credential is not found', async () => {
-        jest
-          .spyOn(credentialRepository, 'findByReference')
-          .mockResolvedValue(null);
-        await expect(
-          credentialService.validateCredential('ref123'),
-        ).rejects.toThrow(
-          new ControlledError('Credential not found.', HttpStatus.BAD_REQUEST),
-        );
-      });
-    });
-  });
-});
diff --git a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.ts b/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.ts
deleted file mode 100644
index 829369808e..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/credentials/credential.service.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
-import { CreateCredentialDto } from './credential.dto';
-import { CredentialRepository } from './credential.repository';
-import { CredentialEntity } from './credential.entity';
-import { CredentialStatus } from '../../common/enums/credential';
-import { Web3Service } from '../web3/web3.service';
-import { verifySignature } from '../../common/utils/signature';
-import { ErrorSignature } from '../../common/constants/errors';
-import { ChainId, KVStoreClient } from '@human-protocol/sdk';
-import { SignatureType, Web3Env } from '../../common/enums/web3';
-import { Web3ConfigService } from '../../common/config/web3-config.service';
-import { EscrowClient } from '@human-protocol/sdk';
-import { UserService } from '../user/user.service';
-import { ControlledError } from '../../common/errors/controlled';
-
-@Injectable()
-export class CredentialService {
-  private readonly logger = new Logger(CredentialService.name);
-
-  constructor(
-    private readonly credentialRepository: CredentialRepository,
-    private readonly web3Service: Web3Service,
-    private readonly userService: UserService,
-    private readonly web3ConfigService: Web3ConfigService,
-  ) {}
-
-  /**
-   * Create a new credential based on provided data.
-   * @param createCredentialDto Data needed to create the credential.
-   * @returns The created credential entity.
-   */
-  public async createCredential(
-    createCredentialDto: CreateCredentialDto,
-  ): Promise<CredentialEntity> {
-    const newCredential = new CredentialEntity();
-    newCredential.reference = createCredentialDto.reference;
-    newCredential.description = createCredentialDto.description;
-    newCredential.url = createCredentialDto.url;
-    newCredential.startsAt = new Date(createCredentialDto.startsAt);
-    if (createCredentialDto.expiresAt) {
-      const providedExpiresAt = new Date(createCredentialDto.expiresAt);
-      if (providedExpiresAt <= newCredential.startsAt) {
-        throw new ControlledError(
-          'ExpiresAt must be after StartsAt.',
-          HttpStatus.BAD_REQUEST,
-        );
-      } else {
-        newCredential.expiresAt = providedExpiresAt;
-      }
-    }
-    newCredential.status = CredentialStatus.ACTIVE;
-    await this.credentialRepository.createUnique(newCredential);
-    return newCredential;
-  }
-
-  public async getCredentials(
-    user: any,
-    status?: string,
-  ): Promise<CredentialEntity[]> {
-    let query = this.credentialRepository.createQueryBuilder('credential');
-    query = query.where('credential.userId = :userId', { userId: user.id });
-
-    if (status) {
-      query = query.andWhere('credential.status = :status', { status: status });
-    }
-    try {
-      return query.getMany();
-    } catch (error) {
-      throw new ControlledError(
-        `Failed to fetch credentials: ${error.message}`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-  }
-
-  public async getByReference(
-    reference: string,
-  ): Promise<CredentialEntity | null> {
-    const credentialEntity =
-      await this.credentialRepository.findByReference(reference);
-
-    if (
-      !credentialEntity ||
-      CredentialStatus.EXPIRED === credentialEntity.status
-    ) {
-      return null;
-    }
-
-    return credentialEntity;
-  }
-
-  /**
-   * Validate a credential based on provided data.
-   * @param {string} reference - The unique reference of the credential.
-   * @param {string} workerAddress - The address of the user that completed the training or activity.
-   * @returns {Promise<void>}
-   */
-  public async validateCredential(reference: string): Promise<void> {
-    const credential =
-      await this.credentialRepository.findByReference(reference);
-
-    if (!credential) {
-      throw new ControlledError(
-        'Credential not found.',
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-
-    if (credential.status !== CredentialStatus.ACTIVE) {
-      throw new ControlledError(
-        'Credential is not in a valid state for validation.',
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-    credential.status = CredentialStatus.VALIDATED;
-    await this.credentialRepository.save(credential);
-
-    this.logger.log(`Credential ${reference} validated successfully.`);
-  }
-
-  public async addCredentialOnChain(
-    reference: string,
-    workerAddress: string,
-    signature: string,
-    chainId: ChainId,
-    escrowAddress: string,
-  ): Promise<void> {
-    let signer = this.web3Service.getSigner(chainId);
-    const escrowClient = await EscrowClient.build(signer);
-
-    const reputationOracleAddress =
-      await escrowClient.getReputationOracleAddress(escrowAddress);
-
-    const signatureBody = await this.userService.prepareSignatureBody(
-      SignatureType.CERTIFICATE_AUTHENTICATION,
-      reputationOracleAddress,
-      {
-        reference: reference,
-        workerAddress: workerAddress,
-      },
-    );
-
-    if (!verifySignature(signatureBody.contents, signature, [workerAddress])) {
-      throw new ControlledError(
-        ErrorSignature.InvalidSignature,
-        HttpStatus.UNAUTHORIZED,
-      );
-    }
-
-    const currentWeb3Env = this.web3ConfigService.env;
-    if (currentWeb3Env === Web3Env.MAINNET) {
-      signer = this.web3Service.getSigner(ChainId.POLYGON);
-    } else if (currentWeb3Env === Web3Env.TESTNET) {
-      signer = this.web3Service.getSigner(ChainId.POLYGON_AMOY);
-    } else {
-      signer = this.web3Service.getSigner(ChainId.LOCALHOST);
-    }
-    const kvstore = await KVStoreClient.build(signer);
-    const key = `${reference}-${reputationOracleAddress}`;
-    const value = JSON.stringify({
-      signature,
-      contents: signatureBody.contents,
-    });
-
-    await kvstore.set(key, value);
-
-    this.logger.log(
-      `Credential added to the blockchain for reference: ${reference}`,
-    );
-  }
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
index 8b697833f4..2039c85fe8 100644
--- a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
@@ -1,11 +1,9 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { CronJobService } from './cron-job.service';
-import { HttpStatus, Logger } from '@nestjs/common';
+import { Logger } from '@nestjs/common';
 import { CronJobRepository } from './cron-job.repository';
 import { CronJobEntity } from './cron-job.entity';
 import { CronJobType } from '../../common/enums/cron-job';
-import { ErrorCronJob } from '../../common/constants/errors';
-import { ControlledError } from '../../common/errors/controlled';
 import { WebhookOutgoingService } from '../webhook/webhook-outgoing.service';
 import { WebhookIncomingService } from '../webhook/webhook-incoming.service';
 import { EscrowCompletionService } from '../escrow-completion/escrow-completion.service';
@@ -198,7 +196,7 @@ describe('CronJobService', () => {
       cronJobEntity.completedAt = new Date();
 
       await expect(service.completeCronJob(cronJobEntity)).rejects.toThrow(
-        new ControlledError(ErrorCronJob.Completed, HttpStatus.BAD_REQUEST),
+        new Error('Cron job is already completed'),
       );
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
index edeb1bd7b7..4616cda490 100644
--- a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
@@ -1,11 +1,9 @@
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 
 import { CronJobType } from '../../common/enums/cron-job';
-import { ErrorCronJob } from '../../common/constants/errors';
 
 import { CronJobEntity } from './cron-job.entity';
 import { CronJobRepository } from './cron-job.repository';
-import { ControlledError } from '../../common/errors/controlled';
 import { Cron } from '@nestjs/schedule';
 import { WebhookIncomingService } from '../webhook/webhook-incoming.service';
 import { WebhookOutgoingService } from '../webhook/webhook-outgoing.service';
@@ -63,13 +61,12 @@ export class CronJobService {
    * Throws an error if the cron job entity is already marked as completed.
    * @param cronJobEntity The cron job entity to mark as completed.
    * @returns {Promise<CronJobEntity>} A Promise containing the updated cron job entity.
-   * @throws {ControlledError} if the cron job is already completed.
    */
   public async completeCronJob(
     cronJobEntity: CronJobEntity,
   ): Promise<CronJobEntity> {
     if (cronJobEntity.completedAt) {
-      throw new ControlledError(ErrorCronJob.Completed, HttpStatus.BAD_REQUEST);
+      throw new Error('Cron job is already completed');
     }
 
     cronJobEntity.completedAt = new Date();
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
index 52317e0556..d8c9247b6c 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
@@ -109,7 +109,6 @@ describe('escrowCompletionService', () => {
   // Mock Web3Service
   const mockWeb3Service = {
     getSigner: jest.fn().mockReturnValue(signerMock),
-    validateChainId: jest.fn().mockReturnValue(new Error()),
     calculateGasPrice: jest.fn().mockReturnValue(1000n),
     getOperatorAddress: jest.fn().mockReturnValue(MOCK_ADDRESS),
   };
@@ -368,7 +367,7 @@ describe('escrowCompletionService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Message: ${error.message}`),
+        expect.stringContaining(`Error message: ${error.message}`),
       );
     });
 
@@ -514,7 +513,7 @@ describe('escrowCompletionService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Message: ${error.message}`),
+        expect.stringContaining(`Error message: ${error.message}`),
       );
     });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
index 24886d49f2..bf27ad853e 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
@@ -3,8 +3,7 @@ import crypto from 'crypto';
 import { ethers } from 'ethers';
 import stringify from 'json-stable-stringify';
 import _ from 'lodash';
-import { v4 as uuidv4 } from 'uuid';
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { EscrowCompletionStatus, EventType } from '../../common/enums';
 import { ServerConfigService } from '../../common/config/server-config.service';
 import { EscrowCompletionRepository } from './escrow-completion.repository';
@@ -25,8 +24,6 @@ import { WebhookIncomingService } from '../webhook/webhook-incoming.service';
 import { PayoutService } from '../payout/payout.service';
 import { ReputationService } from '../reputation/reputation.service';
 import { Web3Service } from '../web3/web3.service';
-import { ErrorEscrowCompletion } from '../../common/constants/errors';
-import { ControlledError } from '../../common/errors/controlled';
 import { WebhookOutgoingService } from '../webhook/webhook-outgoing.service';
 import { isDuplicatedError } from '../../common/utils/database';
 import { CalculatedPayout } from '../payout/payout.interface';
@@ -167,10 +164,9 @@ export class EscrowCompletionService {
         escrowCompletionEntity.status = EscrowCompletionStatus.AWAITING_PAYOUTS;
         await this.escrowCompletionRepository.updateOne(escrowCompletionEntity);
       } catch (error) {
-        const errorId = uuidv4();
-        const failureDetail = `${ErrorEscrowCompletion.PendingProcessingFailed} (Error ID: ${errorId})`;
+        const failureDetail = `Error message: ${error.message})`;
         this.logger.error(
-          `Error processing escrow completion. Error ID: ${errorId}, Escrow completion ID: ${escrowCompletionEntity.id}, Reason: ${failureDetail}, Message: ${error.message}`,
+          `Failed to process pending escrow completion. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
         );
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
@@ -211,60 +207,49 @@ export class EscrowCompletionService {
           );
         }
 
-        const callbackUrls = [
-          (
-            await OperatorUtils.getLeader(
-              chainId,
-              await escrowClient.getJobLauncherAddress(escrowAddress),
-            )
-          ).webhookUrl,
-          (
-            await OperatorUtils.getLeader(
-              chainId,
-              await escrowClient.getExchangeOracleAddress(escrowAddress),
-            )
-          ).webhookUrl,
-          /*(
-            await OperatorUtils.getLeader(
-              chainId,
-              await escrowClient.getRecordingOracleAddress(escrowAddress),
-            )
-          ).webhookUrl,*/
-        ];
+        const oracleAddresses = await Promise.all([
+          escrowClient.getJobLauncherAddress(escrowAddress),
+          escrowClient.getExchangeOracleAddress(escrowAddress),
+          // escrowClient.getRecordingOracleAddress(escrowAddress),
+        ]);
 
-        let allWebhooksCreated = true;
-
-        const payload = {
+        const webhookPayload = {
           chainId,
           escrowAddress,
           eventType: EventType.ESCROW_COMPLETED,
         };
 
-        for (const url of callbackUrls) {
-          if (!url) {
-            throw new ControlledError(
-              // This is a temporary solution during the refactoring phase.
-              'Webhook url not found',
-              HttpStatus.NOT_FOUND,
-            );
+        let allWebhooksCreated = true;
+
+        for (const oracleAddress of oracleAddresses) {
+          const oracleData = await OperatorUtils.getLeader(
+            chainId,
+            oracleAddress,
+          );
+          if (!oracleData) {
+            throw new Error('Oracle data is missing');
+          }
+
+          const { webhookUrl } = oracleData;
+          if (!webhookUrl) {
+            throw new Error('Webhook url is no set for oracle');
           }
 
           try {
             await this.webhookOutgoingService.createOutgoingWebhook(
-              payload,
-              url,
+              webhookPayload,
+              webhookUrl,
             );
           } catch (err) {
             if (isDuplicatedError(err)) {
-              this.logger.warn(
-                `Duplicate outgoing webhook for escrowAddress: ${escrowAddress}. Webhook creation skipped, but will not complete escrow until all URLs are successful.`,
-              );
+              /**
+               * Already created. Noop.
+               */
               continue;
             } else {
-              const errorId = uuidv4();
-              const failureDetail = `${ErrorEscrowCompletion.PaidProcessingFailed} (Error ID: ${errorId})`;
+              const failureDetail = `Failed to create outgoing webhook for oracle. Address: ${oracleAddress}. Error message: ${err.message}`;
               this.logger.error(
-                `Error creating outgoing webhook. Error ID: ${errorId}, Escrow Address: ${escrowAddress}, Reason: ${failureDetail}, Message: ${err.message}`,
+                `${failureDetail}. Escrow completion ID: ${escrowCompletionEntity.id}.`,
               );
               await this.handleEscrowCompletionError(
                 escrowCompletionEntity,
@@ -284,10 +269,9 @@ export class EscrowCompletionService {
           );
         }
       } catch (err) {
-        const errorId = uuidv4();
-        const failureDetail = `${ErrorEscrowCompletion.PaidProcessingFailed} (Error ID: ${errorId})`;
+        const failureDetail = `Error message: ${err.message}`;
         this.logger.error(
-          `Error processing escrow completion. Error ID: ${errorId}, Escrow completion ID: ${escrowCompletionEntity.id}, Reason: ${failureDetail}, Message: ${err.message}`,
+          `Failed to process paid escrow completion. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
         );
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
@@ -343,8 +327,8 @@ export class EscrowCompletionService {
             );
           } catch (error) {
             this.logger.error(
-              `Failed to process payouts batch ${payoutsBatch.id}`,
-              error,
+              `Failed to process payouts batch. Batch ID: ${payoutsBatch.id}`,
+              error.message,
             );
             hasFailedPayouts = true;
           }
@@ -359,10 +343,9 @@ export class EscrowCompletionService {
           );
         }
       } catch (error) {
-        const errorId = uuidv4();
-        const failureDetail = `${ErrorEscrowCompletion.AwaitingPayoutsProcessingFailed} (Error ID: ${errorId})`;
+        const failureDetail = `Error message: ${error.message}`;
         this.logger.error(
-          `Error processing escrow completion. Error ID: ${errorId}, Escrow completion ID: ${escrowCompletionEntity.id}, Reason: ${failureDetail}, Message: ${error.message}`,
+          `Failed to process payouts. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
         );
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
diff --git a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.spec.ts
index d2b59abe18..8199f5a97f 100644
--- a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.spec.ts
@@ -1,6 +1,5 @@
 import { createMock } from '@golevelup/ts-jest';
 import { ConfigModule, registerAs } from '@nestjs/config';
-import { HttpStatus } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { ChainId, EscrowClient } from '@human-protocol/sdk';
 import {
@@ -21,10 +20,9 @@ import { Web3Service } from '../web3/web3.service';
 import { StorageService } from '../storage/storage.service';
 import { PayoutService } from './payout.service';
 import { CvatManifestDto } from '../../common/dto/manifest';
-import { ErrorManifest, ErrorResults } from '../../common/constants/errors';
 import { CvatAnnotationMeta } from '../../common/dto/result';
 import { CalculatedPayout, SaveResultDto } from './payout.interface';
-import { ControlledError } from '../../common/errors/controlled';
+import { MissingManifestUrlError } from '../../common/errors/manifest';
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
@@ -64,8 +62,6 @@ describe('PayoutService', () => {
           provide: Web3Service,
           useValue: {
             getSigner: jest.fn().mockReturnValue(signerMock),
-            validateChainId: jest.fn().mockReturnValue(new Error()),
-            calculateGasPrice: jest.fn().mockReturnValue(1000n),
           },
         },
         { provide: StorageService, useValue: createMock<StorageService>() },
@@ -193,12 +189,7 @@ describe('PayoutService', () => {
 
       await expect(
         payoutService.processResults(chainId, escrowAddress),
-      ).rejects.toThrow(
-        new ControlledError(
-          ErrorManifest.ManifestUrlDoesNotExist,
-          HttpStatus.BAD_REQUEST,
-        ),
-      );
+      ).rejects.toThrow(new MissingManifestUrlError(MOCK_ADDRESS));
     });
 
     it('should throw an error for unsupported request types', async () => {
@@ -379,12 +370,7 @@ describe('PayoutService', () => {
 
       await expect(
         payoutService.saveResultsFortune(manifest, chainId, escrowAddress),
-      ).rejects.toThrow(
-        new ControlledError(
-          ErrorResults.NoIntermediateResultsFound,
-          HttpStatus.BAD_REQUEST,
-        ),
-      );
+      ).rejects.toThrow(new Error('No intermediate results found'));
     });
 
     it('should throw an error if the number of solutions is less than solutions required', async () => {
@@ -412,12 +398,7 @@ describe('PayoutService', () => {
 
       await expect(
         payoutService.saveResultsFortune(manifest, chainId, escrowAddress),
-      ).rejects.toThrow(
-        new ControlledError(
-          ErrorResults.NotAllRequiredSolutionsHaveBeenSent,
-          HttpStatus.BAD_REQUEST,
-        ),
-      );
+      ).rejects.toThrow(new Error('Not all required solutions have been sent'));
     });
   });
 
@@ -585,12 +566,7 @@ describe('PayoutService', () => {
           chainId,
           escrowAddress,
         ),
-      ).rejects.toThrow(
-        new ControlledError(
-          ErrorResults.NoAnnotationsMetaFound,
-          HttpStatus.BAD_REQUEST,
-        ),
-      );
+      ).rejects.toThrow(new Error('No annotations meta found'));
     });
   });
 });
diff --git a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
index 06a6cde07e..47d4482fce 100644
--- a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { HttpStatus, Inject, Injectable, Logger } from '@nestjs/common';
+import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ChainId, EscrowClient } from '@human-protocol/sdk';
-import { ErrorManifest, ErrorResults } from '../../common/constants/errors';
 
 import {
   CVAT_RESULTS_ANNOTATIONS_FILENAME,
@@ -25,8 +24,8 @@ import {
   RequestAction,
   SaveResultDto,
 } from './payout.interface';
-import { getRequestType, isValidJobRequestType } from '../../common/utils';
-import { ControlledError } from '../../common/errors/controlled';
+import { assertValidJobRequestType, getRequestType } from '../../common/utils';
+import { MissingManifestUrlError } from '../../common/errors/manifest';
 
 @Injectable()
 export class PayoutService {
@@ -54,10 +53,7 @@ export class PayoutService {
 
     const manifestUrl = await escrowClient.getManifestUrl(escrowAddress);
     if (!manifestUrl) {
-      throw new ControlledError(
-        ErrorManifest.ManifestUrlDoesNotExist,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new MissingManifestUrlError(escrowAddress);
     }
 
     const manifest =
@@ -65,12 +61,7 @@ export class PayoutService {
 
     const requestType = getRequestType(manifest).toLowerCase();
 
-    if (!isValidJobRequestType(requestType)) {
-      throw new ControlledError(
-        `Unsupported request type: ${requestType}`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
+    assertValidJobRequestType(requestType);
 
     const { saveResults } = this.createPayoutSpecificActions[requestType];
 
@@ -99,10 +90,7 @@ export class PayoutService {
 
     const manifestUrl = await escrowClient.getManifestUrl(escrowAddress);
     if (!manifestUrl) {
-      throw new ControlledError(
-        ErrorManifest.ManifestUrlDoesNotExist,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new MissingManifestUrlError(escrowAddress);
     }
 
     const manifest =
@@ -110,12 +98,7 @@ export class PayoutService {
 
     const requestType = getRequestType(manifest).toLowerCase();
 
-    if (!isValidJobRequestType(requestType)) {
-      throw new ControlledError(
-        `Unsupported request type: ${requestType}`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
+    assertValidJobRequestType(requestType);
 
     const { calculatePayouts } = this.createPayoutSpecificActions[requestType];
 
@@ -224,22 +207,12 @@ export class PayoutService {
     )) as FortuneFinalResult[];
 
     if (intermediateResults.length === 0) {
-      this.logger.log(
-        ErrorResults.NoIntermediateResultsFound,
-        PayoutService.name,
-      );
-      throw new ControlledError(
-        ErrorResults.NoIntermediateResultsFound,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new Error('No intermediate results found');
     }
 
     const validResults = intermediateResults.filter((result) => !result.error);
     if (validResults.length < manifest.submissionsRequired) {
-      throw new ControlledError(
-        ErrorResults.NotAllRequiredSolutionsHaveBeenSent,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new Error('Not all required solutions have been sent');
     }
 
     const { url, hash } = await this.storageService.uploadJobSolutions(
@@ -342,10 +315,7 @@ export class PayoutService {
       Array.isArray(annotations.jobs) &&
       annotations.jobs.length === 0
     ) {
-      throw new ControlledError(
-        ErrorResults.NoAnnotationsMetaFound,
-        HttpStatus.NOT_FOUND,
-      );
+      throw new Error('No annotations meta found');
     }
 
     const jobBountyValue = ethers.parseUnits(manifest.job_bounty, 18);
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.spec.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.spec.ts
index bcf6427597..14f63c265d 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.spec.ts
@@ -33,7 +33,6 @@ describe('ReputationController', () => {
           provide: Web3Service,
           useValue: {
             getSigner: jest.fn().mockReturnValue(signerMock),
-            validateChainId: jest.fn().mockReturnValue(new Error()),
           },
         },
         StorageService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.dto.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.dto.ts
index 90d03701cf..c1a74c07e7 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.dto.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.dto.ts
@@ -8,7 +8,7 @@ import {
   IsString,
   Min,
 } from 'class-validator';
-import { ChainId, OrderDirection } from '@human-protocol/sdk';
+import { ChainId } from '@human-protocol/sdk';
 import {
   ReputationEntityType,
   ReputationLevel,
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.service.spec.ts
index 22aed4304f..6dae0f8508 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.service.spec.ts
@@ -82,7 +82,6 @@ describe('ReputationService', () => {
           provide: Web3Service,
           useValue: {
             getSigner: jest.fn().mockReturnValue(signerMock),
-            validateChainId: jest.fn().mockReturnValue(new Error()),
             getOperatorAddress: jest.fn().mockReturnValue(MOCK_ADDRESS),
           },
         },
diff --git a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts
index d2e43f80e4..8c4dfc3d04 100644
--- a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts
@@ -2,11 +2,8 @@ import { ConfigService } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
 import { SendGridService } from './sendgrid.service';
 import { MailService } from '@sendgrid/mail';
-import { ErrorSendGrid } from '../../common/constants/errors';
 import { MOCK_SENDGRID_API_KEY, mockConfig } from '../../../test/constants';
 import { SendgridConfigService } from '../../common/config/sendgrid-config.service';
-import { ControlledError } from '../../common/errors/controlled';
-import { HttpStatus } from '@nestjs/common';
 
 describe('SendGridService', () => {
   let sendGridService: SendGridService;
@@ -89,10 +86,7 @@ describe('SendGridService', () => {
 
     it("should throw error if email wasn't sent", async () => {
       jest.spyOn(mailService, 'send').mockImplementationOnce(async () => {
-        throw new ControlledError(
-          ErrorSendGrid.EmailNotSent,
-          HttpStatus.BAD_REQUEST,
-        );
+        throw new Error('Mail service error');
       });
 
       await expect(
@@ -102,7 +96,7 @@ describe('SendGridService', () => {
           text: 'and easy to do anywhere, even with Node.js',
           html: '<strong>and easy to do anywhere, even with Node.js</strong>',
         }),
-      ).rejects.toThrowError(ErrorSendGrid.EmailNotSent);
+      ).rejects.toThrow('Failed to send email');
     });
   });
 
@@ -124,7 +118,7 @@ describe('SendGridService', () => {
           mailService,
           sendgridConfigService,
         );
-      }).toThrowError(ErrorSendGrid.InvalidApiKey);
+      }).toThrow('Invalid SendGrid API key');
     });
   });
 });
diff --git a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts
index cd60b60cb5..a49e6ec4b5 100644
--- a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts
@@ -1,12 +1,10 @@
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { MailDataRequired, MailService } from '@sendgrid/mail';
 import {
   SENDGRID_API_KEY_DISABLED,
   SENDGRID_API_KEY_REGEX,
 } from '../../common/constants';
-import { ErrorSendGrid } from '../../common/constants/errors';
 import { SendgridConfigService } from '../../common/config/sendgrid-config.service';
-import { ControlledError } from '../../common/errors/controlled';
 
 @Injectable()
 export class SendGridService {
@@ -21,10 +19,7 @@ export class SendGridService {
     }
 
     if (!SENDGRID_API_KEY_REGEX.test(this.sendgridConfigService.apiKey)) {
-      throw new ControlledError(
-        ErrorSendGrid.InvalidApiKey,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new Error('Invalid SendGrid API key');
     }
 
     this.mailService.setApiKey(this.sendgridConfigService.apiKey);
@@ -54,11 +49,9 @@ export class SendGridService {
       this.logger.log('Email sent successfully');
       return;
     } catch (error) {
-      this.logger.error(error, SendGridService.name);
-      throw new ControlledError(
-        ErrorSendGrid.EmailNotSent,
-        HttpStatus.BAD_REQUEST,
-      );
+      const errorMessage = 'Failed to send email';
+      this.logger.error(errorMessage, error.messages, error.stack);
+      throw new Error(errorMessage);
     }
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.spec.ts
index 06d34a74e9..1dac0a7270 100644
--- a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.spec.ts
@@ -18,8 +18,6 @@ import crypto from 'crypto';
 import { Web3Service } from '../web3/web3.service';
 import { PGPConfigService } from '../../common/config/pgp-config.service';
 import { S3ConfigService } from '../../common/config/s3-config.service';
-import { ControlledError } from '../../common/errors/controlled';
-import { HttpStatus } from '@nestjs/common';
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
@@ -267,9 +265,7 @@ describe('StorageService', () => {
         storageService.uploadJobSolutions(escrowAddress, chainId, [
           jobSolution,
         ]),
-      ).rejects.toThrow(
-        new ControlledError('Bucket not found', HttpStatus.BAD_REQUEST),
-      );
+      ).rejects.toThrow('Bucket not found');
     });
 
     it('should fail if the file cannot be uploaded', async () => {
@@ -297,9 +293,7 @@ describe('StorageService', () => {
         storageService.uploadJobSolutions(escrowAddress, chainId, [
           jobSolution,
         ]),
-      ).rejects.toThrow(
-        new ControlledError('File not uploaded', HttpStatus.BAD_REQUEST),
-      );
+      ).rejects.toThrow('File not uploaded');
     });
   });
 
@@ -580,9 +574,7 @@ describe('StorageService', () => {
           chainId,
           'invalid url',
         ),
-      ).rejects.toThrow(
-        new ControlledError('File not uploaded', HttpStatus.BAD_REQUEST),
-      );
+      ).rejects.toThrow('File not uploaded');
     });
   });
 });
diff --git a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
index 2eb086e55d..61f9edd17e 100644
--- a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
@@ -5,17 +5,15 @@ import {
   EscrowClient,
   KVStoreUtils,
 } from '@human-protocol/sdk';
-import { HttpStatus, Injectable } from '@nestjs/common';
+import { HttpStatus, Injectable, Logger } from '@nestjs/common';
 import axios from 'axios';
 import * as Minio from 'minio';
 import crypto from 'crypto';
 import { UploadedFile } from '../../common/interfaces/s3';
-import { Logger } from '@nestjs/common';
 import { Web3Service } from '../web3/web3.service';
 import { FortuneFinalResult } from '../../common/dto/result';
 import { S3ConfigService } from '../../common/config/s3-config.service';
 import { PGPConfigService } from '../../common/config/pgp-config.service';
-import { ControlledError } from '../../common/errors/controlled';
 import { isNotFoundError } from '../../common/utils/minio';
 import {
   FileDownloadError,
@@ -25,6 +23,7 @@ import {
 
 @Injectable()
 export class StorageService {
+  private readonly logger = new Logger(StorageService.name);
   public readonly minioClient: Minio.Client;
 
   constructor(
@@ -72,7 +71,7 @@ export class StorageService {
     );
 
     if (!reputationOraclePublicKey || !jobLauncherPublicKey) {
-      throw new ControlledError('Missing public key', HttpStatus.BAD_REQUEST);
+      throw new Error('Missing public key');
     }
 
     return await EncryptionUtils.encrypt(content, [
@@ -138,7 +137,11 @@ export class StorageService {
 
       return jsonLikeData;
     } catch (error) {
-      Logger.error(`Error downloading json like data ${url}:`, error);
+      this.logger.error(
+        `Error downloading json like data ${url}:`,
+        error.message,
+        error.stack,
+      );
       return [];
     }
   }
@@ -149,7 +152,7 @@ export class StorageService {
     solutions: FortuneFinalResult[],
   ): Promise<UploadedFile> {
     if (!(await this.minioClient.bucketExists(this.s3ConfigService.bucket))) {
-      throw new ControlledError('Bucket not found', HttpStatus.BAD_REQUEST);
+      throw new Error('Bucket not found');
     }
 
     try {
@@ -165,15 +168,18 @@ export class StorageService {
       // Check if the file already exists in the bucket
       try {
         await this.minioClient.statObject(this.s3ConfigService.bucket, key);
-        Logger.log(`File with key ${key} already exists. Skipping upload.`);
+        this.logger.log(
+          `File with key ${key} already exists. Skipping upload.`,
+        );
         return { url: this.getUrl(key), hash };
-      } catch (err) {
-        if (!isNotFoundError(err)) {
-          Logger.error('Error checking if file exists:', err);
-          throw new ControlledError(
-            'Error accessing storage',
-            HttpStatus.INTERNAL_SERVER_ERROR,
+      } catch (error) {
+        if (!isNotFoundError(error)) {
+          this.logger.error(
+            'Error checking if file exists:',
+            error.message,
+            error.stack,
           );
+          throw new Error('Error accessing storage');
         }
       }
 
@@ -189,7 +195,7 @@ export class StorageService {
 
       return { url: this.getUrl(key), hash };
     } catch (error) {
-      throw new ControlledError('File not uploaded', HttpStatus.BAD_REQUEST);
+      throw new Error('File not uploaded');
     }
   }
 
@@ -221,15 +227,18 @@ export class StorageService {
       // Check if the file already exists in the bucket
       try {
         await this.minioClient.statObject(this.s3ConfigService.bucket, key);
-        Logger.log(`File with key ${key} already exists. Skipping upload.`);
+        this.logger.log(
+          `File with key ${key} already exists. Skipping upload.`,
+        );
         return { url: this.getUrl(key), hash };
-      } catch (err) {
-        if (!isNotFoundError(err)) {
-          Logger.error('Error checking if file exists:', err);
-          throw new ControlledError(
-            'Error accessing storage',
-            HttpStatus.INTERNAL_SERVER_ERROR,
+      } catch (error) {
+        if (!isNotFoundError(error)) {
+          this.logger.error(
+            'Error checking if file exists:',
+            error.message,
+            error.stack,
           );
+          throw new Error('Error accessing storage');
         }
       }
 
@@ -248,12 +257,8 @@ export class StorageService {
         hash,
       };
     } catch (error) {
-      Logger.error('Error copying file:', error);
-      throw new ControlledError(
-        'File not uploaded',
-        HttpStatus.CONFLICT,
-        error.stack,
-      );
+      this.logger.error('Error copying file:', error.message, error.stack);
+      throw new Error('File not uploaded');
     }
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
index 4e2fe18bd0..e1917f9eda 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
@@ -14,6 +14,7 @@ import {
   UseGuards,
   Request,
   Get,
+  UseFilters,
 } from '@nestjs/common';
 import {
   DisableOperatorDto,
@@ -27,20 +28,31 @@ import {
   RegistrationInExchangeOracleResponseDto,
 } from './user.dto';
 import { JwtAuthGuard } from '../../common/guards';
+import { HCaptchaGuard } from '../../common/guards/hcaptcha';
 import { RequestWithUser } from '../../common/types';
+import { prepareSignatureBody } from '../../common/utils/signature';
 import { UserService } from './user.service';
 import { Public } from '../../common/decorators';
 import { KycSignedAddressDto } from '../kyc/kyc.dto';
+import { Web3Service } from '../web3/web3.service';
+import { UserRepository } from './user.repository';
+import { SignatureType } from '../../common/enums/web3';
+import { UserErrorFilter } from './user.error.filter';
 
 @ApiTags('User')
 @Controller('/user')
+@UseFilters(UserErrorFilter)
 @ApiBearerAuth()
-@UseGuards(JwtAuthGuard)
 export class UserController {
-  constructor(private readonly userService: UserService) {}
+  constructor(
+    private readonly userService: UserService,
+    private readonly web3Service: Web3Service,
+    private readonly userRepository: UserRepository,
+  ) {}
 
   @Post('/register-labeler')
   @HttpCode(200)
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Register Labeler',
     description: 'Endpoint to register user as a labeler on hcaptcha services.',
@@ -72,6 +84,7 @@ export class UserController {
 
   @Post('/register-address')
   @HttpCode(200)
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Register Blockchain Address',
     description: 'Endpoint to register blockchain address.',
@@ -103,6 +116,7 @@ export class UserController {
 
   @Post('/enable-operator')
   @HttpCode(204)
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Enable an operator',
     description: 'Endpoint to enable an operator.',
@@ -125,6 +139,7 @@ export class UserController {
 
   @Post('/disable-operator')
   @HttpCode(204)
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Disable an operator',
     description: 'Endpoint to disable an operator.',
@@ -147,6 +162,7 @@ export class UserController {
 
   @Public()
   @Post('/prepare-signature')
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Web3 signature body',
     description:
@@ -165,11 +181,21 @@ export class UserController {
   public async prepareSignature(
     @Body() data: PrepareSignatureDto,
   ): Promise<SignatureBodyDto> {
-    return await this.userService.prepareSignatureBody(data.type, data.address);
+    let nonce;
+    if (data.type === SignatureType.SIGNIN) {
+      nonce = (await this.userRepository.findOneByAddress(data.address))?.nonce;
+    }
+    return prepareSignatureBody({
+      from: data.address,
+      to: this.web3Service.getOperatorAddress(),
+      contents: data.type,
+      nonce,
+    });
   }
 
   @Post('/exchange-oracle-registration')
   @HttpCode(200)
+  @UseGuards(HCaptchaGuard, JwtAuthGuard)
   @ApiOperation({
     summary: 'Notifies registration in Exchange Oracle completed',
     description:
@@ -193,13 +219,17 @@ export class UserController {
     @Req() request: RequestWithUser,
     @Body() data: RegistrationInExchangeOracleDto,
   ): Promise<RegistrationInExchangeOracleResponseDto> {
-    await this.userService.registrationInExchangeOracle(request.user, data);
+    await this.userService.registrationInExchangeOracle(
+      request.user,
+      data.oracleAddress,
+    );
 
     return { oracleAddress: data.oracleAddress };
   }
 
   @Get('/exchange-oracle-registration')
   @HttpCode(200)
+  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Retrieves Exchange Oracles the user is registered in',
     description:
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
index 1db6ffc89e..f282b53f3e 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
@@ -93,8 +93,9 @@ export class SignatureBodyDto {
   public contents: string;
 
   @ApiProperty()
+  @IsOptional()
   @IsString()
-  public nonce: string | undefined;
+  public nonce?: string | undefined;
 }
 
 export class PrepareSignatureDto {
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts
new file mode 100644
index 0000000000..bbd2556429
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts
@@ -0,0 +1,42 @@
+import {
+  ExceptionFilter,
+  Catch,
+  ArgumentsHost,
+  HttpStatus,
+  Logger,
+} from '@nestjs/common';
+import { Request, Response } from 'express';
+
+import {
+  UserError,
+  DuplicatedWalletAddressError,
+  InvalidWeb3SignatureError,
+} from './user.error';
+
+type UserControllerError =
+  | UserError
+  | DuplicatedWalletAddressError
+  | InvalidWeb3SignatureError;
+
+@Catch(UserError, DuplicatedWalletAddressError, InvalidWeb3SignatureError)
+export class UserErrorFilter implements ExceptionFilter {
+  private logger = new Logger(UserErrorFilter.name);
+  catch(exception: UserControllerError, host: ArgumentsHost) {
+    const ctx = host.switchToHttp();
+    const response = ctx.getResponse<Response>();
+    const request = ctx.getRequest<Request>();
+    let status = HttpStatus.BAD_REQUEST;
+
+    if (exception instanceof DuplicatedWalletAddressError) {
+      status = HttpStatus.CONFLICT;
+    }
+
+    this.logger.error(exception.message, exception.stack, exception.userId);
+
+    return response.status(status).json({
+      message: exception.message,
+      timestamp: new Date().toISOString(),
+      path: request.url,
+    });
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.error.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.error.ts
new file mode 100644
index 0000000000..4a7aa3a515
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.error.ts
@@ -0,0 +1,35 @@
+import { BaseError } from '../../common/errors/base';
+
+export enum UserErrorMessage {
+  INVALID_ROLE = 'Invalid user role',
+  MISSING_ADDRESS = 'Wallet address is missing',
+  ADDRESS_EXISTS = 'Wallet address is already assigned',
+  KYC_NOT_APPROVED = 'KYC not approved',
+  LABELING_ENABLE_FAILED = 'Failed to enable hCaptcha labeling',
+  OPERATOR_ALREADY_ACTIVE = 'Operator status is already active',
+  OPERATOR_NOT_ACTIVE = 'Operator status is not active',
+}
+
+export class UserError extends BaseError {
+  userId: number;
+  constructor(message: UserErrorMessage, userId: number) {
+    super(message);
+    this.userId = userId;
+  }
+}
+
+export class DuplicatedWalletAddressError extends BaseError {
+  userId: number;
+  constructor(userId: number, address: string) {
+    super(`Wallet address already exists: ${address}`);
+    this.userId = userId;
+  }
+}
+
+export class InvalidWeb3SignatureError extends BaseError {
+  userId: number;
+  constructor(userId: number, address: string) {
+    super(`Invalid web3 signature provided for: ${address}`);
+    this.userId = userId;
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
index ca10165c42..d6125cff71 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
@@ -10,7 +10,10 @@ import {
   UserStatus,
   Role,
 } from '../../common/enums/user';
-import { signMessage, verifySignature } from '../../common/utils/signature';
+import {
+  signMessage,
+  prepareSignatureBody,
+} from '../../common/utils/signature';
 import {
   MOCK_ADDRESS,
   MOCK_EMAIL,
@@ -28,14 +31,12 @@ import { SiteKeyEntity } from './site-key.entity';
 import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
 import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
 import { HttpService } from '@nestjs/axios';
-import { ControlledError } from '../../common/errors/controlled';
 import {
-  ErrorCapthca,
-  ErrorOperator,
-  ErrorSignature,
-  ErrorUser,
-} from '../../common/constants/errors';
-import { BadRequestException, HttpStatus } from '@nestjs/common';
+  UserError,
+  UserErrorMessage,
+  DuplicatedWalletAddressError,
+  InvalidWeb3SignatureError,
+} from '../../modules/user/user.error';
 import { NetworkConfigService } from '../../common/config/network-config.service';
 import { SiteKeyType } from '../../common/enums';
 
@@ -90,12 +91,9 @@ describe('UserService', () => {
           provide: Web3Service,
           useValue: {
             getSigner: jest.fn().mockReturnValue(signerMock),
-            signMessage: jest.fn(),
-            prepareSignatureBody: jest.fn(),
             getOperatorAddress: jest
               .fn()
               .mockReturnValue(MOCK_ADDRESS.toLowerCase()),
-            getValidChains: jest.fn().mockReturnValue([ChainId.LOCALHOST]),
           },
         },
         {
@@ -165,25 +163,6 @@ describe('UserService', () => {
     });
   });
 
-  describe('getByAddress', () => {
-    it('should return the user entity if the address exists', async () => {
-      const address = '0x0755D4d722a4a201c1C5A4B5E614D913e7747b36';
-      const userEntity: Partial<UserEntity> = {
-        id: 1,
-        evmAddress: address,
-      };
-
-      jest
-        .spyOn(userRepository, 'findOneByAddress')
-        .mockResolvedValue(userEntity as UserEntity);
-
-      const result = await userService.getByAddress(address);
-
-      expect(userRepository.findOneByAddress).toHaveBeenCalledWith(address);
-      expect(result).toBe(userEntity);
-    });
-  });
-
   describe('registerLabeler', () => {
     it('should register labeler successfully and return site key', async () => {
       const userEntity: DeepPartial<UserEntity> = {
@@ -231,7 +210,9 @@ describe('UserService', () => {
 
       await expect(
         userService.registerLabeler(userEntity as UserEntity),
-      ).rejects.toThrow(new BadRequestException(ErrorUser.InvalidType));
+      ).rejects.toThrow(
+        new UserError(UserErrorMessage.INVALID_ROLE, userEntity.id as number),
+      );
     });
 
     it('should throw KycNotApproved if user KYC status is not approved', async () => {
@@ -249,7 +230,12 @@ describe('UserService', () => {
 
       await expect(
         userService.registerLabeler(userEntity as UserEntity),
-      ).rejects.toThrow(new BadRequestException(ErrorUser.KycNotApproved));
+      ).rejects.toThrow(
+        new UserError(
+          UserErrorMessage.KYC_NOT_APPROVED,
+          userEntity.id as number,
+        ),
+      );
     });
 
     it('should return site key if user is already registered as a labeler', async () => {
@@ -299,9 +285,9 @@ describe('UserService', () => {
       await expect(
         userService.registerLabeler(userEntity as UserEntity),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorUser.LabelingEnableFailed,
-          HttpStatus.BAD_REQUEST,
+        new UserError(
+          UserErrorMessage.LABELING_ENABLE_FAILED,
+          userEntity.id as number,
         ),
       );
     });
@@ -325,9 +311,9 @@ describe('UserService', () => {
       await expect(
         userService.registerLabeler(userEntity as UserEntity),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorUser.LabelingEnableFailed,
-          HttpStatus.BAD_REQUEST,
+        new UserError(
+          UserErrorMessage.LABELING_ENABLE_FAILED,
+          userEntity.id as number,
         ),
       );
     });
@@ -349,9 +335,9 @@ describe('UserService', () => {
       await expect(
         userService.registerLabeler(userEntity as UserEntity),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorUser.NoWalletAddresRegistered,
-          HttpStatus.BAD_REQUEST,
+        new UserError(
+          UserErrorMessage.MISSING_ADDRESS,
+          userEntity.id as number,
         ),
       );
     });
@@ -377,37 +363,34 @@ describe('UserService', () => {
         save: jest.fn(),
       };
 
-      const address = '0x123';
-      const signature = 'valid-signature';
+      const signature = await signMessage(
+        prepareSignatureBody({
+          from: MOCK_ADDRESS,
+          to: MOCK_ADDRESS,
+          contents: SignatureType.REGISTER_ADDRESS,
+          nonce: undefined,
+        }),
+        MOCK_PRIVATE_KEY,
+      );
 
       // Mock web3Service methods
       web3Service.getSigner = jest.fn().mockReturnValue({
-        signMessage: jest.fn().mockResolvedValue('signature'),
-      });
-
-      // Mock signature verification
-      jest.spyOn(userService, 'prepareSignatureBody').mockResolvedValue({
-        from: address,
-        to: 'operator-address',
-        contents: 'register-address',
-        nonce: undefined,
+        signMessage: jest.fn().mockResolvedValue(signature),
       });
 
-      (verifySignature as jest.Mock) = jest.fn().mockReturnValue(true);
-
       const result = await userService.registerAddress(
         userEntity as UserEntity,
-        { address, signature },
+        { address: MOCK_ADDRESS, signature },
       );
 
       expect(userRepository.updateOne).toHaveBeenCalledWith(userEntity);
       expect(result).toEqual({
         key: `KYC-${MOCK_ADDRESS.toLowerCase()}`,
-        value: 'signature',
+        value: signature,
       });
     });
 
-    it("should fail if address is different from user's evm address", async () => {
+    it('should fail if user already have a wallet address', async () => {
       const userEntity: Partial<UserEntity> = {
         id: 1,
         email: '',
@@ -423,7 +406,7 @@ describe('UserService', () => {
           signature,
         }),
       ).rejects.toThrow(
-        new ControlledError(ErrorUser.AlreadyAssigned, HttpStatus.BAD_REQUEST),
+        new UserError(UserErrorMessage.ADDRESS_EXISTS, userEntity.id as number),
       );
     });
 
@@ -446,7 +429,10 @@ describe('UserService', () => {
           signature,
         }),
       ).rejects.toThrow(
-        new ControlledError(ErrorUser.KycNotApproved, HttpStatus.BAD_REQUEST),
+        new UserError(
+          UserErrorMessage.KYC_NOT_APPROVED,
+          userEntity.id as number,
+        ),
       );
     });
 
@@ -474,7 +460,7 @@ describe('UserService', () => {
           signature,
         }),
       ).rejects.toThrow(
-        new ControlledError(ErrorUser.AlreadyAssigned, HttpStatus.BAD_REQUEST),
+        new UserError(UserErrorMessage.ADDRESS_EXISTS, userEntity.id as number),
       );
     });
 
@@ -503,10 +489,7 @@ describe('UserService', () => {
           signature,
         }),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorUser.DuplicatedAddress,
-          HttpStatus.BAD_REQUEST,
-        ),
+        new DuplicatedWalletAddressError(userEntity.id as number, address),
       );
     });
 
@@ -529,54 +512,29 @@ describe('UserService', () => {
         signMessage: jest.fn().mockResolvedValue('signature'),
       });
 
-      // Mock signature verification
-      jest.spyOn(userService, 'prepareSignatureBody').mockResolvedValue({
-        from: address,
-        to: 'operator-address',
-        contents: 'register-address',
-        nonce: undefined,
-      });
-
-      (verifySignature as jest.Mock) = jest.fn().mockImplementation(() => {
-        throw new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.CONFLICT,
-        );
-      });
-
       await expect(
         userService.registerAddress(userEntity as UserEntity, {
           address,
           signature,
         }),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.CONFLICT,
-        ),
+        new InvalidWeb3SignatureError(userEntity.id as number, address),
       );
     });
   });
 
   describe('enableOperator', () => {
-    const signatureBody: SignatureBodyDto = {
+    const signatureBody = prepareSignatureBody({
       from: MOCK_ADDRESS,
       to: MOCK_ADDRESS,
-      contents: 'enable-operator',
-      nonce: undefined,
-    };
+      contents: SignatureType.ENABLE_OPERATOR,
+    });
 
     const userEntity: DeepPartial<UserEntity> = {
       id: 1,
       evmAddress: MOCK_ADDRESS,
     };
 
-    beforeEach(() => {
-      jest
-        .spyOn(userService as any, 'prepareSignatureBody')
-        .mockReturnValue(signatureBody);
-    });
-
     afterEach(() => {
       jest.resetAllMocks();
     });
@@ -599,10 +557,6 @@ describe('UserService', () => {
       );
 
       expect(result).toBe(undefined);
-      expect(userService.prepareSignatureBody).toHaveBeenCalledWith(
-        SignatureType.ENABLE_OPERATOR,
-        MOCK_ADDRESS,
-      );
       expect(web3Service.getSigner).toHaveBeenCalledWith(ChainId.POLYGON_AMOY);
 
       expect(KVStoreUtils.get).toHaveBeenCalledWith(
@@ -626,13 +580,6 @@ describe('UserService', () => {
 
       KVStoreUtils.get = jest.fn().mockResolvedValue(OperatorStatus.INACTIVE);
 
-      (verifySignature as jest.Mock) = jest.fn().mockImplementation(() => {
-        throw new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.CONFLICT,
-        );
-      });
-
       const invalidSignature = await signMessage(
         'invalid message',
         MOCK_PRIVATE_KEY,
@@ -641,9 +588,9 @@ describe('UserService', () => {
       await expect(
         userService.enableOperator(userEntity as any, invalidSignature),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.BAD_REQUEST,
+        new InvalidWeb3SignatureError(
+          userEntity.id as number,
+          userEntity.evmAddress as string,
         ),
       );
     });
@@ -656,33 +603,26 @@ describe('UserService', () => {
       await expect(
         userService.enableOperator(userEntity as any, signature),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorOperator.OperatorAlreadyActive,
-          HttpStatus.BAD_REQUEST,
+        new UserError(
+          UserErrorMessage.OPERATOR_ALREADY_ACTIVE,
+          userEntity.id as number,
         ),
       );
     });
   });
 
   describe('disableOperator', () => {
-    const signatureBody: SignatureBodyDto = {
+    const signatureBody = prepareSignatureBody({
       from: MOCK_ADDRESS,
       to: MOCK_ADDRESS,
-      contents: 'disable-operator',
-      nonce: undefined,
-    };
+      contents: SignatureType.DISABLE_OPERATOR,
+    });
 
     const userEntity: DeepPartial<UserEntity> = {
       id: 1,
       evmAddress: MOCK_ADDRESS,
     };
 
-    beforeEach(() => {
-      jest
-        .spyOn(userService as any, 'prepareSignatureBody')
-        .mockReturnValue(signatureBody);
-    });
-
     afterEach(() => {
       jest.resetAllMocks();
     });
@@ -705,10 +645,6 @@ describe('UserService', () => {
       );
 
       expect(result).toBe(undefined);
-      expect(userService.prepareSignatureBody).toHaveBeenCalledWith(
-        SignatureType.DISABLE_OPERATOR,
-        MOCK_ADDRESS,
-      );
       expect(web3Service.getSigner).toHaveBeenCalledWith(ChainId.POLYGON_AMOY);
 
       expect(KVStoreUtils.get).toHaveBeenCalledWith(
@@ -731,12 +667,6 @@ describe('UserService', () => {
       );
 
       KVStoreUtils.get = jest.fn().mockResolvedValue(OperatorStatus.ACTIVE);
-      (verifySignature as jest.Mock) = jest.fn().mockImplementation(() => {
-        throw new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.CONFLICT,
-        );
-      });
 
       const invalidSignature = await signMessage(
         'invalid message',
@@ -746,23 +676,23 @@ describe('UserService', () => {
       await expect(
         userService.disableOperator(userEntity as any, invalidSignature),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorSignature.SignatureNotVerified,
-          HttpStatus.BAD_REQUEST,
+        new InvalidWeb3SignatureError(
+          userEntity.id as number,
+          userEntity.evmAddress as string,
         ),
       );
     });
 
-    it('should throw BadRequestException if operator already disabled in KVStore', async () => {
+    it('should throw UserErrorMessage.OPERATOR_NOT_ACTIVE if operator already disabled in KVStore', async () => {
       KVStoreUtils.get = jest.fn().mockResolvedValue(OperatorStatus.INACTIVE);
       const signature = await signMessage(signatureBody, MOCK_PRIVATE_KEY);
 
       await expect(
         userService.disableOperator(userEntity as any, signature),
       ).rejects.toThrow(
-        new ControlledError(
-          ErrorOperator.OperatorNotActive,
-          HttpStatus.BAD_REQUEST,
+        new UserError(
+          UserErrorMessage.OPERATOR_NOT_ACTIVE,
+          userEntity.id as number,
         ),
       );
     });
@@ -781,10 +711,11 @@ describe('UserService', () => {
         nonce: undefined,
       };
 
-      const result = await userService.prepareSignatureBody(
-        SignatureType.SIGNUP,
-        MOCK_ADDRESS,
-      );
+      const result = prepareSignatureBody({
+        from: MOCK_ADDRESS,
+        to: MOCK_ADDRESS,
+        contents: SignatureType.SIGNUP,
+      });
 
       expect(result).toStrictEqual(expectedData);
     });
@@ -793,14 +724,15 @@ describe('UserService', () => {
       const expectedData: SignatureBodyDto = {
         from: MOCK_ADDRESS.toLowerCase(),
         to: MOCK_ADDRESS.toLowerCase(),
-        contents: 'register-address',
+        contents: 'register_address',
         nonce: undefined,
       };
 
-      const result = await userService.prepareSignatureBody(
-        SignatureType.REGISTER_ADDRESS,
-        MOCK_ADDRESS,
-      );
+      const result = prepareSignatureBody({
+        from: MOCK_ADDRESS,
+        to: MOCK_ADDRESS,
+        contents: SignatureType.REGISTER_ADDRESS,
+      });
 
       expect(result).toStrictEqual(expectedData);
     });
@@ -835,7 +767,7 @@ describe('UserService', () => {
 
       const result = await userService.registrationInExchangeOracle(
         userEntity as UserEntity,
-        oracleRegistration,
+        oracleRegistration.oracleAddress,
       );
 
       expect(siteKeyRepository.createUnique).toHaveBeenCalledWith(
@@ -874,41 +806,13 @@ describe('UserService', () => {
 
       const result = await userService.registrationInExchangeOracle(
         userEntity as UserEntity,
-        oracleRegistration,
+        oracleRegistration.oracleAddress,
       );
 
       expect(siteKeyRepository.createUnique).not.toHaveBeenCalled();
 
       expect(result).toEqual(siteKeyMock);
     });
-
-    it('should throw if captcha verification fails', async () => {
-      const userEntity: DeepPartial<UserEntity> = {
-        id: 1,
-        email: 'test@example.com',
-      };
-
-      const oracleRegistration: RegistrationInExchangeOracleDto = {
-        oracleAddress: '0xOracleAddress',
-        hCaptchaToken: 'hcaptcha-token',
-      };
-
-      jest
-        .spyOn(hcaptchaService, 'verifyToken')
-        .mockResolvedValueOnce({ success: false });
-
-      await expect(
-        userService.registrationInExchangeOracle(
-          userEntity as UserEntity,
-          oracleRegistration,
-        ),
-      ).rejects.toThrow(
-        new ControlledError(
-          ErrorCapthca.VerificationFailed,
-          HttpStatus.BAD_REQUEST,
-        ),
-      );
-    });
   });
 
   describe('getRegisteredOracles', () => {
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
index 0a2ba26fd7..9b86af43ff 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
@@ -1,15 +1,5 @@
-import {
-  BadRequestException,
-  HttpStatus,
-  Injectable,
-  Logger,
-} from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
-import {
-  ErrorCapthca,
-  ErrorOperator,
-  ErrorUser,
-} from '../../common/constants/errors';
 import {
   KycStatus,
   OperatorStatus,
@@ -18,12 +8,7 @@ import {
 } from '../../common/enums/user';
 import { generateNonce, verifySignature } from '../../common/utils/signature';
 import { UserEntity } from './user.entity';
-import {
-  RegistrationInExchangeOracleDto,
-  RegisterAddressRequestDto,
-  SignatureBodyDto,
-  UserCreateDto,
-} from './user.dto';
+import { RegisterAddressRequestDto, UserCreateDto } from './user.dto';
 import { UserRepository } from './user.repository';
 import { ValidatePasswordDto } from '../auth/auth.dto';
 import { Web3Service } from '../web3/web3.service';
@@ -34,11 +19,17 @@ import { SiteKeyEntity } from './site-key.entity';
 import { SiteKeyRepository } from './site-key.repository';
 import { SiteKeyType } from '../../common/enums';
 import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
-import { ControlledError } from '../../common/errors/controlled';
 import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
 import { NetworkConfigService } from '../../common/config/network-config.service';
+import { prepareSignatureBody } from '../../common/utils/signature';
 import { KycSignedAddressDto } from '../kyc/kyc.dto';
 import { ethers } from 'ethers';
+import {
+  UserError,
+  UserErrorMessage,
+  DuplicatedWalletAddressError,
+  InvalidWeb3SignatureError,
+} from './user.error';
 
 @Injectable()
 export class UserService {
@@ -52,7 +43,6 @@ export class UserService {
     private readonly web3ConfigService: Web3ConfigService,
     private readonly hcaptchaConfigService: HCaptchaConfigService,
     private readonly networkConfigService: NetworkConfigService,
-    private readonly hCaptchaService: HCaptchaService,
   ) {}
 
   static checkPasswordMatchesHash(
@@ -86,8 +76,6 @@ export class UserService {
   }
 
   public async createWeb3User(address: string): Promise<UserEntity> {
-    await this.checkEvmAddress(address);
-
     const newUser = new UserEntity();
     newUser.evmAddress = address.toLowerCase();
     newUser.nonce = generateNonce();
@@ -98,28 +86,6 @@ export class UserService {
     return newUser;
   }
 
-  public async checkEvmAddress(address: string): Promise<void> {
-    const userEntity = await this.userRepository.findOneByAddress(address);
-
-    if (userEntity) {
-      this.logger.log(ErrorUser.AccountCannotBeRegistered, UserService.name);
-      throw new ControlledError(
-        ErrorUser.AccountCannotBeRegistered,
-        HttpStatus.CONFLICT,
-      );
-    }
-  }
-
-  public async getByAddress(address: string): Promise<UserEntity> {
-    const userEntity = await this.userRepository.findOneByAddress(address);
-
-    if (!userEntity) {
-      throw new ControlledError(ErrorUser.NotFound, HttpStatus.NOT_FOUND);
-    }
-
-    return userEntity;
-  }
-
   public async updateNonce(userEntity: UserEntity): Promise<UserEntity> {
     userEntity.nonce = generateNonce();
     return this.userRepository.updateOne(userEntity);
@@ -127,18 +93,15 @@ export class UserService {
 
   public async registerLabeler(user: UserEntity): Promise<string> {
     if (user.role !== Role.WORKER) {
-      throw new BadRequestException(ErrorUser.InvalidType);
+      throw new UserError(UserErrorMessage.INVALID_ROLE, user.id);
     }
 
     if (!user.evmAddress) {
-      throw new ControlledError(
-        ErrorUser.NoWalletAddresRegistered,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.MISSING_ADDRESS, user.id);
     }
 
     if (user.kyc?.status !== KycStatus.APPROVED) {
-      throw new BadRequestException(ErrorUser.KycNotApproved);
+      throw new UserError(UserErrorMessage.KYC_NOT_APPROVED, user.id);
     }
 
     if (user.siteKeys && user.siteKeys.length > 0) {
@@ -159,10 +122,7 @@ export class UserService {
     });
 
     if (!registeredLabeler) {
-      throw new ControlledError(
-        ErrorUser.LabelingEnableFailed,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.LABELING_ENABLE_FAILED, user.id);
     }
 
     // Retrieve labeler site key from hcaptcha foundation
@@ -170,10 +130,7 @@ export class UserService {
       email: user.email,
     });
     if (!labelerData || !labelerData.sitekeys.length) {
-      throw new ControlledError(
-        ErrorUser.LabelingEnableFailed,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.LABELING_ENABLE_FAILED, user.id);
     }
     const siteKey = labelerData.sitekeys[0].sitekey;
 
@@ -191,43 +148,42 @@ export class UserService {
     user: UserEntity,
     data: RegisterAddressRequestDto,
   ): Promise<KycSignedAddressDto> {
-    data.address = data.address.toLowerCase();
+    const lowercasedAddress = data.address.toLocaleLowerCase();
 
     if (user.evmAddress) {
-      throw new ControlledError(
-        ErrorUser.AlreadyAssigned,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.ADDRESS_EXISTS, user.id);
     }
 
     if (user.kyc?.status !== KycStatus.APPROVED) {
-      throw new ControlledError(
-        ErrorUser.KycNotApproved,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.KYC_NOT_APPROVED, user.id);
     }
 
-    const dbUser = await this.userRepository.findOneByAddress(data.address);
+    const dbUser =
+      await this.userRepository.findOneByAddress(lowercasedAddress);
     if (dbUser) {
-      throw new ControlledError(
-        ErrorUser.DuplicatedAddress,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new DuplicatedWalletAddressError(user.id, lowercasedAddress);
     }
 
     // Prepare signed data and verify the signature
-    const signedData = await this.prepareSignatureBody(
-      SignatureType.REGISTER_ADDRESS,
-      data.address,
-    );
-    verifySignature(signedData, data.signature, [data.address]);
+    const signedData = prepareSignatureBody({
+      from: lowercasedAddress,
+      to: this.web3Service.getOperatorAddress(),
+      contents: SignatureType.REGISTER_ADDRESS,
+    });
+    const verified = verifySignature(signedData, data.signature, [
+      lowercasedAddress,
+    ]);
+
+    if (!verified) {
+      throw new InvalidWeb3SignatureError(user.id, lowercasedAddress);
+    }
 
-    user.evmAddress = data.address.toLowerCase();
+    user.evmAddress = lowercasedAddress;
     await this.userRepository.updateOne(user);
 
     const signature = await this.web3Service
       .getSigner(this.networkConfigService.networks[0].chainId)
-      .signMessage(data.address);
+      .signMessage(lowercasedAddress);
 
     return {
       key: `KYC-${this.web3Service.getOperatorAddress()}`,
@@ -239,12 +195,17 @@ export class UserService {
     user: UserEntity,
     signature: string,
   ): Promise<void> {
-    const signedData = await this.prepareSignatureBody(
-      SignatureType.ENABLE_OPERATOR,
-      user.evmAddress,
-    );
+    const signedData = prepareSignatureBody({
+      from: user.evmAddress,
+      to: this.web3Service.getOperatorAddress(),
+      contents: SignatureType.ENABLE_OPERATOR,
+    });
 
-    verifySignature(signedData, signature, [user.evmAddress]);
+    const verified = verifySignature(signedData, signature, [user.evmAddress]);
+
+    if (!verified) {
+      throw new InvalidWeb3SignatureError(user.id, user.evmAddress);
+    }
 
     let chainId: ChainId;
     const currentWeb3Env = this.web3ConfigService.env;
@@ -265,10 +226,7 @@ export class UserService {
     } catch {}
 
     if (status === OperatorStatus.ACTIVE) {
-      throw new ControlledError(
-        ErrorOperator.OperatorAlreadyActive,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.OPERATOR_ALREADY_ACTIVE, user.id);
     }
 
     await kvstore.set(user.evmAddress.toLowerCase(), OperatorStatus.ACTIVE);
@@ -278,12 +236,17 @@ export class UserService {
     user: UserEntity,
     signature: string,
   ): Promise<void> {
-    const signedData = await this.prepareSignatureBody(
-      SignatureType.DISABLE_OPERATOR,
-      user.evmAddress,
-    );
+    const signedData = prepareSignatureBody({
+      from: user.evmAddress,
+      to: this.web3Service.getOperatorAddress(),
+      contents: SignatureType.DISABLE_OPERATOR,
+    });
 
-    verifySignature(signedData, signature, [user.evmAddress]);
+    const verified = verifySignature(signedData, signature, [user.evmAddress]);
+
+    if (!verified) {
+      throw new InvalidWeb3SignatureError(user.id, user.evmAddress);
+    }
 
     let chainId: ChainId;
     const currentWeb3Env = this.web3ConfigService.env;
@@ -306,87 +269,16 @@ export class UserService {
     );
 
     if (status === OperatorStatus.INACTIVE) {
-      throw new ControlledError(
-        ErrorOperator.OperatorNotActive,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new UserError(UserErrorMessage.OPERATOR_NOT_ACTIVE, user.id);
     }
 
     await kvstore.set(user.evmAddress.toLowerCase(), OperatorStatus.INACTIVE);
   }
 
-  public async prepareSignatureBody(
-    type: SignatureType,
-    address: string,
-    additionalData?: { reference?: string; workerAddress?: string },
-  ): Promise<SignatureBodyDto> {
-    let content: string;
-    let nonce: string | undefined;
-    switch (type) {
-      case SignatureType.SIGNUP:
-        content = 'signup';
-        break;
-      case SignatureType.SIGNIN:
-        content = 'signin';
-        nonce = (await this.userRepository.findOneByAddress(address))?.nonce;
-        break;
-      case SignatureType.ENABLE_OPERATOR:
-        content = 'enable-operator';
-        break;
-      case SignatureType.DISABLE_OPERATOR:
-        content = 'disable-operator';
-        break;
-      case SignatureType.CERTIFICATE_AUTHENTICATION:
-        if (
-          !additionalData ||
-          !additionalData.reference ||
-          !additionalData.workerAddress
-        ) {
-          throw new ControlledError(
-            'Missing necessary credential data',
-            HttpStatus.BAD_REQUEST,
-          );
-        }
-        content = JSON.stringify({
-          reference: additionalData.reference,
-          workerJson: additionalData.workerAddress.toLowerCase(),
-        });
-        break;
-      case SignatureType.REGISTER_ADDRESS:
-        content = 'register-address';
-        break;
-      default:
-        throw new ControlledError('Type not allowed', HttpStatus.BAD_REQUEST);
-    }
-
-    return {
-      from: address.toLowerCase(),
-      to: this.web3Service.getOperatorAddress().toLowerCase(),
-      contents: content,
-      nonce: nonce ?? undefined,
-    };
-  }
-
   public async registrationInExchangeOracle(
     user: UserEntity,
-    { hCaptchaToken, oracleAddress }: RegistrationInExchangeOracleDto,
+    oracleAddress: string,
   ): Promise<SiteKeyEntity> {
-    if (!hCaptchaToken) {
-      throw new ControlledError(
-        ErrorCapthca.InvalidToken,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
-      token: hCaptchaToken,
-    });
-    if (!captchaVerificationResult.success) {
-      throw new ControlledError(
-        ErrorCapthca.VerificationFailed,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-
     const siteKey = await this.siteKeyRepository.findByUserSiteKeyAndType(
       user,
       oracleAddress,
diff --git a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.spec.ts
index cec9a2e25f..54ccdadd13 100644
--- a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.spec.ts
@@ -6,12 +6,9 @@ import {
   MOCK_PRIVATE_KEY,
   mockConfig,
 } from '../../../test/constants';
-import { ErrorWeb3 } from '../../common/constants/errors';
 import { Web3Service } from './web3.service';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
 import { NetworkConfigService } from '../../common/config/network-config.service';
-import { HttpStatus } from '@nestjs/common';
-import { ControlledError } from '../../common/errors/controlled';
 
 describe('Web3Service', () => {
   let web3Service: Web3Service;
@@ -62,10 +59,10 @@ describe('Web3Service', () => {
     });
 
     it('should throw invalid chain id provided for the testnet environment', () => {
-      const invalidChainId = ChainId.POLYGON;
+      const invalidChainId = -42;
 
       expect(() => web3Service.getSigner(invalidChainId)).toThrow(
-        new ControlledError(ErrorWeb3.InvalidChainId, HttpStatus.BAD_REQUEST),
+        `No signer for provided chain id: ${invalidChainId}`,
       );
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
index 9d05fafb6e..d204e24df7 100644
--- a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
@@ -1,13 +1,15 @@
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
-import { Wallet, ethers } from 'ethers';
-import { ErrorWeb3 } from '../../common/constants/errors';
+import { Injectable, Logger } from '@nestjs/common';
+import { Provider, Wallet, ethers } from 'ethers';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
 import { NetworkConfigService } from '../../common/config/network-config.service';
-import { ControlledError } from '../../common/errors/controlled';
+
+type WalletWithProvider = Wallet & { provider: Provider };
 
 @Injectable()
 export class Web3Service {
-  private signers: { [key: number]: Wallet } = {};
+  private signersByChainId: {
+    [chainId: number]: WalletWithProvider;
+  } = {};
   public readonly logger = new Logger(Web3Service.name);
 
   constructor(
@@ -17,41 +19,41 @@ export class Web3Service {
     const privateKey = this.web3ConfigService.privateKey;
 
     if (!this.networkConfigService.networks.length) {
-      this.logger.log(ErrorWeb3.NoValidNetworks, Web3Service.name);
-      throw new ControlledError(
-        ErrorWeb3.NoValidNetworks,
-        HttpStatus.BAD_REQUEST,
-      );
+      throw new Error('No networks specified in network config');
     }
 
     for (const network of this.networkConfigService.networks) {
       const provider = new ethers.JsonRpcProvider(network.rpcUrl);
-      this.signers[network.chainId] = new Wallet(privateKey, provider);
+      this.signersByChainId[network.chainId] = new Wallet(
+        privateKey,
+        provider,
+      ) as WalletWithProvider;
     }
   }
 
-  public getSigner(chainId: number): Wallet {
-    if (!this.signers[chainId]) {
-      this.logger.log(ErrorWeb3.InvalidChainId, Web3Service.name);
-      throw new ControlledError(
-        ErrorWeb3.InvalidChainId,
-        HttpStatus.BAD_REQUEST,
-      );
+  public getSigner(chainId: number): WalletWithProvider {
+    const signer = this.signersByChainId[chainId];
+
+    if (signer) {
+      return signer;
     }
-    return this.signers[chainId];
+
+    throw new Error(`No signer for provided chain id: ${chainId}`);
   }
 
   public async calculateGasPrice(chainId: number): Promise<bigint> {
     const signer = this.getSigner(chainId);
     const multiplier = this.web3ConfigService.gasPriceMultiplier;
-    const gasPrice = (await signer.provider?.getFeeData())?.gasPrice;
+    const gasPrice = (await signer.provider.getFeeData()).gasPrice;
+
     if (gasPrice) {
       return gasPrice * BigInt(multiplier);
     }
-    throw new ControlledError(ErrorWeb3.GasPriceError, HttpStatus.CONFLICT);
+
+    throw new Error(`No gas price data for chain id: ${chainId}`);
   }
 
   public getOperatorAddress(): string {
-    return Object.values(this.signers)[0].address;
+    return Object.values(this.signersByChainId)[0].address;
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
index f3754ec9e5..8e6db959e0 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
@@ -57,8 +57,6 @@ describe('WebhookIncomingService', () => {
   // Mock Web3Service
   const mockWeb3Service = {
     getSigner: jest.fn().mockReturnValue(signerMock),
-    validateChainId: jest.fn().mockReturnValue(new Error()),
-    calculateGasPrice: jest.fn().mockReturnValue(1000n),
     getOperatorAddress: jest.fn().mockReturnValue(MOCK_ADDRESS),
   };
 
@@ -270,7 +268,7 @@ describe('WebhookIncomingService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Message: ${error.message}`),
+        expect.stringContaining(`Error message: ${error.message}`),
       );
     });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
index d0a51e75c6..d6bc51667d 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Injectable, Logger } from '@nestjs/common';
-import { v4 as uuidv4 } from 'uuid';
 import { ServerConfigService } from '../../common/config/server-config.service';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
 import { BACKOFF_INTERVAL_SECONDS } from '../../common/constants';
@@ -28,7 +27,7 @@ export class WebhookIncomingService {
    * Creates an incoming webhook entry in the repository.
    * Validates that the event type is 'JOB_COMPLETED' and sets initial status to 'PENDING'.
    * @param {IncomingWebhookDto} dto - Contains webhook details like chain ID and escrow address.
-   * @throws {ControlledError} If the event type is invalid or the webhook cannot be created.
+   * @throws {IncomingWebhookError} If the event type is invalid or the webhook cannot be created.
    */
   public async createIncomingWebhook(dto: IncomingWebhookDto): Promise<void> {
     if (dto.eventType !== EventType.JOB_COMPLETED) {
@@ -91,20 +90,15 @@ export class WebhookIncomingService {
         webhookEntity.status = WebhookIncomingStatus.COMPLETED;
         await this.webhookIncomingRepository.updateOne(webhookEntity);
       } catch (err) {
-        const errorId = uuidv4();
-        const failureDetail = `${WebhookErrorMessage.PENDING_PROCESSING_FAILED} (Error ID: ${errorId})`;
-
         if (isDuplicatedError(err)) {
-          // Handle duplicated error: log and mark as completed
-          this.logger.warn(
-            `Duplicate tracking entity for escrowAddress: ${webhookEntity.escrowAddress}. Marking webhook as completed.`,
-          );
           webhookEntity.status = WebhookIncomingStatus.COMPLETED;
           await this.webhookIncomingRepository.updateOne(webhookEntity);
         } else {
           // Handle other errors (general failure)
+          const failureDetail = `Error message: ${err.message}`;
+
           this.logger.error(
-            `Error processing webhook. Error ID: ${errorId}, Webhook ID: ${webhookEntity.id}, Reason: ${failureDetail}, Message: ${err.message}`,
+            `Error processing incoming webhook. Webhook ID: ${webhookEntity.id}. ${failureDetail}.`,
           );
           await this.handleWebhookIncomingError(webhookEntity, failureDetail);
         }
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
index 4e14fc93c9..95800a7a54 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
@@ -51,8 +51,6 @@ describe('WebhookOutgoingService', () => {
   // Mock Web3Service
   const mockWeb3Service = {
     getSigner: jest.fn().mockReturnValue(signerMock),
-    validateChainId: jest.fn().mockReturnValue(new Error()),
-    calculateGasPrice: jest.fn().mockReturnValue(1000n),
     getOperatorAddress: jest.fn().mockReturnValue(MOCK_ADDRESS),
   };
 
@@ -284,7 +282,7 @@ describe('WebhookOutgoingService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Message: ${error.message}`),
+        expect.stringContaining(`Error message: ${error.message}`),
       );
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
index 7649d8d996..fa8305bb59 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { v4 as uuidv4 } from 'uuid';
 import * as crypto from 'crypto';
 import stringify from 'json-stable-stringify';
 import { HttpStatus, Injectable, Logger } from '@nestjs/common';
@@ -87,7 +86,7 @@ export class WebhookOutgoingService {
    * Converts payload to snake_case, signs it, and sends it to the specified URL.
    * @param {string} url - The target URL to which the webhook is sent.
    * @param {object} payload - The data payload to send.
-   * @throws {ControlledError} If the webhook request fails.
+   * @throws {OutgoingWebhookError} If the webhook request fails.
    */
   public async sendWebhook(
     outgoingWebhook: WebhookOutgoingEntity,
@@ -122,10 +121,9 @@ export class WebhookOutgoingService {
       try {
         await this.sendWebhook(webhookEntity);
       } catch (err) {
-        const errorId = uuidv4();
-        const failureDetail = `${WebhookErrorMessage.PENDING_PROCESSING_FAILED} (Error ID: ${errorId})`;
+        const failureDetail = `Error message: ${err.message}`;
         this.logger.error(
-          `Error processing pending outgoing webhook. Error ID: ${errorId}, Webhook ID: ${webhookEntity.id}, Reason: ${failureDetail}, Message: ${err.message}`,
+          `Error processing outgoing webhook. Webhook ID: ${webhookEntity.id}. ${failureDetail}`,
         );
         await this.handleWebhookOutgoingError(webhookEntity, failureDetail);
         continue;
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
index b9962fc363..47a8739579 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
@@ -1,11 +1,4 @@
-import {
-  Body,
-  Controller,
-  Headers,
-  Post,
-  UseFilters,
-  UseGuards,
-} from '@nestjs/common';
+import { Body, Controller, Post, UseFilters, UseGuards } from '@nestjs/common';
 import {
   ApiTags,
   ApiOperation,
@@ -59,7 +52,6 @@ export class WebhookController {
     description: 'Not Found. Could not find the requested content.',
   })
   public async createIncomingWebhook(
-    @Headers(HEADER_SIGNATURE_KEY) _: string,
     @Body() data: IncomingWebhookDto,
   ): Promise<void> {
     await this.webhookIncomingService.createIncomingWebhook(data);
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.ts
index 4e19ec09b3..24cd928e53 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.ts
@@ -2,10 +2,8 @@ import { ChainId } from '@human-protocol/sdk';
 import { BaseError } from '../../common/errors/base';
 
 export enum WebhookErrorMessage {
-  URL_NOT_FOUND = 'Webhook url not found',
   INVALID_EVENT_TYPE = 'Invalid event type',
   NOT_SENT = 'Webhook was not sent',
-  PENDING_PROCESSING_FAILED = 'Failed to process pending webhook',
 }
 
 export class IncomingWebhookError extends BaseError {
diff --git a/packages/apps/staking/.env.example b/packages/apps/staking/.env.example
index 6e4408065c..611f637438 100644
--- a/packages/apps/staking/.env.example
+++ b/packages/apps/staking/.env.example
@@ -1,6 +1,8 @@
-VITE_APP_DASHBOARD_SERVER_URL=
+VITE_APP_DASHBOARD_API_URL=
 VITE_APP_ENVIRONMENT=testnet
 VITE_APP_SUPPORTED_CHAINS=80002
+# links to header
+VITE_HEADER_LINK_DASHBOARD=
 # links to footer socials
 VITE_FOOTER_LINK_GITHUB=
 VITE_FOOTER_LINK_DISCORD=
diff --git a/packages/apps/staking/package.json b/packages/apps/staking/package.json
index f2e514c499..9a72d1b8dc 100644
--- a/packages/apps/staking/package.json
+++ b/packages/apps/staking/package.json
@@ -11,7 +11,8 @@
     "test": "vitest run -u",
     "format:prettier": "prettier --write \"**/*.{ts,tsx,js,jsx}\"",
     "format:lint": "eslint --fix \"**/*.{ts,tsx,js,jsx}\"",
-    "format": "yarn format:prettier && yarn format:lint"
+    "format": "yarn format:prettier && yarn format:lint",
+    "vercel-build": "yarn workspace @human-protocol/sdk build && yarn build"
   },
   "browserslist": {
     "production": [
diff --git a/packages/apps/staking/src/assets/KVStoreIcon.tsx b/packages/apps/staking/src/assets/KVStoreIcon.tsx
new file mode 100644
index 0000000000..86c9bca45a
--- /dev/null
+++ b/packages/apps/staking/src/assets/KVStoreIcon.tsx
@@ -0,0 +1,186 @@
+import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+import { FC } from 'react';
+
+export const KVStoreIcon: FC<SvgIconProps> = (props) => {
+  return (
+    <SvgIcon
+      {...props}
+      style={{
+        width: '130',
+        height: '130',
+      }}
+    >
+      <svg
+        width="130"
+        height="130"
+        viewBox="0 0 130 130"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <g filter="url(#filter0_d_2247_31600)">
+          <path
+            d="M98 41C98 59.2254 83.2254 74 65 74C46.7746 74 32 59.2254 32 41C32 22.7746 46.7746 8 65 8C83.2254 8 98 22.7746 98 41Z"
+            fill="url(#paint0_radial_2247_31600)"
+          />
+        </g>
+        <g filter="url(#filter1_d_2247_31600)">
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M65 69.9304C80.9778 69.9304 93.9304 56.9778 93.9304 41C93.9304 25.0222 80.9778 12.0696 65 12.0696C49.0222 12.0696 36.0696 25.0222 36.0696 41C36.0696 56.9778 49.0222 69.9304 65 69.9304ZM65 74C83.2254 74 98 59.2254 98 41C98 22.7746 83.2254 8 65 8C46.7746 8 32 22.7746 32 41C32 59.2254 46.7746 74 65 74Z"
+            fill="url(#paint1_linear_2247_31600)"
+          />
+        </g>
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M79.4124 47.0702V32.0494V31.661H79.3739C78.8552 29.0538 73.158 27 66.2062 27C59.2544 27 53.5572 29.0538 53.0385 31.661H53V32.0494V50.6935V51.0819H53.0385C53.5572 53.6892 59.2544 55.7429 66.2062 55.7429C68.2846 55.7429 70.2508 55.5594 72 55.2323V58.1477L79.081 62.0551L86.162 58.1477V50.6887L79.4124 47.0702Z"
+          fill="url(#paint2_linear_2247_31600)"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M49.6 29.438C49.9314 29.438 50.2 29.7066 50.2 30.038V47.9052C50.2 48.2366 49.9314 48.5052 49.6 48.5052C49.2686 48.5052 49 48.2366 49 47.9052V30.038C49 29.7066 49.2686 29.438 49.6 29.438ZM76.0124 29.438C76.3438 29.438 76.6124 29.7066 76.6124 30.038V41.9C76.6124 42.2314 76.3438 42.5 76.0124 42.5C75.6811 42.5 75.4124 42.2314 75.4124 41.9V30.038C75.4124 29.7066 75.6811 29.438 76.0124 29.438Z"
+          fill="#320A8D"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M51.0402 28.1291C50.4461 28.6661 50.2 29.1808 50.2 29.6494C50.2 30.118 50.4461 30.6328 51.0402 31.1698C51.6342 31.7068 52.5275 32.2179 53.6823 32.6595C55.9878 33.541 59.2135 34.0989 62.8062 34.0989C66.399 34.0989 69.6246 33.541 71.9301 32.6595C73.085 32.2179 73.9782 31.7068 74.5723 31.1698C75.1663 30.6328 75.4124 30.118 75.4124 29.6494C75.4124 29.1808 75.1663 28.6661 74.5723 28.1291C73.9782 27.592 73.085 27.0809 71.9301 26.6394C69.6246 25.7578 66.399 25.2 62.8062 25.2C59.2135 25.2 55.9878 25.7578 53.6823 26.6394C52.5275 27.0809 51.6342 27.592 51.0402 28.1291ZM53.2537 25.5185C55.7279 24.5725 59.1054 24 62.8062 24C66.507 24 69.8845 24.5725 72.3587 25.5185C73.5937 25.9907 74.6345 26.5677 75.377 27.2389C76.1194 27.9101 76.6124 28.7237 76.6124 29.6494C76.6124 30.5752 76.1194 31.3888 75.377 32.06C74.6345 32.7312 73.5937 33.3081 72.3587 33.7804C69.8845 34.7264 66.507 35.2989 62.8062 35.2989C59.1054 35.2989 55.7279 34.7264 53.2537 33.7804C52.0187 33.3081 50.9779 32.7312 50.2355 32.06C49.493 31.3888 49 30.5752 49 29.6494C49 28.7237 49.493 27.9101 50.2355 27.2389C50.9779 26.5677 52.0187 25.9907 53.2537 25.5185Z"
+          fill="#320A8D"
+        />
+        <path
+          d="M53.6965 51.1956C55.9976 52.1431 59.2181 52.7431 62.8062 52.7431C64.8589 52.7431 66.7913 52.5468 68.5 52.2013V53.4244C66.7619 53.7586 64.8323 53.9431 62.8062 53.9431C59.1008 53.9431 55.7181 53.3258 53.2396 52.3052C52.0017 51.7955 50.9604 51.1734 50.2193 50.4518C49.4762 49.7285 49 48.8677 49 47.9053H50.2C50.2 48.4445 50.4629 49.0142 51.0563 49.592C51.6517 50.1716 52.5445 50.7213 53.6965 51.1956Z"
+          fill="#320A8D"
+        />
+        <path
+          d="M53.6965 44.9805C55.9976 45.928 59.2181 46.528 62.8062 46.528C64.8589 46.528 66.7913 46.3317 68.5 45.9862V47.2093C66.7619 47.5435 64.8323 47.728 62.8062 47.728C59.1008 47.728 55.7181 47.1107 53.2396 46.0901C52.0017 45.5804 50.9604 44.9583 50.2193 44.2368C49.4762 43.5134 49 42.6526 49 41.6902H50.2C50.2 42.2294 50.4629 42.7991 51.0563 43.3769C51.6517 43.9566 52.5445 44.5062 53.6965 44.9805Z"
+          fill="#320A8D"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M53.6677 38.9825C55.978 39.7979 59.2089 40.3135 62.8062 40.3135C66.4035 40.3135 69.6344 39.7979 71.9447 38.9825C73.1026 38.5738 73.9969 38.1011 74.5902 37.606C75.1868 37.1082 75.4124 36.6479 75.4124 36.2524H76.6124C76.6124 37.144 76.0989 37.91 75.359 38.5274C74.6158 39.1476 73.5761 39.6793 72.3441 40.1141C69.8747 40.9856 66.5025 41.5135 62.8062 41.5135C59.1099 41.5135 55.7377 40.9856 53.2683 40.1141C52.0363 39.6793 50.9967 39.1476 50.2534 38.5274C49.5135 37.91 49 37.144 49 36.2524H50.2C50.2 36.6479 50.4256 37.1082 51.0222 37.606C51.6155 38.1011 52.5098 38.5738 53.6677 38.9825Z"
+          fill="#320A8D"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M76.2815 42L83.162 45.6887V53.1477L76.081 57.0551L69 53.1477V45.8963L76.2815 42Z"
+          stroke="#320A8D"
+        />
+        <path
+          d="M69.1436 46.0244L76.088 49.6619L83.2687 45.8118"
+          stroke="#320A8D"
+        />
+        <path d="M76.0909 57.055V49.6145" stroke="#320A8D" />
+        <defs>
+          <filter
+            id="filter0_d_2247_31600"
+            x="0"
+            y="0"
+            width="130"
+            height="130"
+            filterUnits="userSpaceOnUse"
+            colorInterpolationFilters="sRGB"
+          >
+            <feFlood floodOpacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset dy="24" />
+            <feGaussianBlur stdDeviation="16" />
+            <feComposite in2="hardAlpha" operator="out" />
+            <feColorMatrix
+              type="matrix"
+              values="0 0 0 0 0.0486111 0 0 0 0 0.127083 0 0 0 0 0.833333 0 0 0 0.06 0"
+            />
+            <feBlend
+              mode="normal"
+              in2="BackgroundImageFix"
+              result="effect1_dropShadow_2247_31600"
+            />
+            <feBlend
+              mode="normal"
+              in="SourceGraphic"
+              in2="effect1_dropShadow_2247_31600"
+              result="shape"
+            />
+          </filter>
+          <filter
+            id="filter1_d_2247_31600"
+            x="0"
+            y="0"
+            width="130"
+            height="130"
+            filterUnits="userSpaceOnUse"
+            colorInterpolationFilters="sRGB"
+          >
+            <feFlood floodOpacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset dy="24" />
+            <feGaussianBlur stdDeviation="16" />
+            <feComposite in2="hardAlpha" operator="out" />
+            <feColorMatrix
+              type="matrix"
+              values="0 0 0 0 0.0486111 0 0 0 0 0.127083 0 0 0 0 0.833333 0 0 0 0.06 0"
+            />
+            <feBlend
+              mode="normal"
+              in2="BackgroundImageFix"
+              result="effect1_dropShadow_2247_31600"
+            />
+            <feBlend
+              mode="normal"
+              in="SourceGraphic"
+              in2="effect1_dropShadow_2247_31600"
+              result="shape"
+            />
+          </filter>
+          <radialGradient
+            id="paint0_radial_2247_31600"
+            cx="0"
+            cy="0"
+            r="1"
+            gradientUnits="userSpaceOnUse"
+            gradientTransform="translate(65 18.6895) rotate(90) scale(55.3105)"
+          >
+            <stop stopColor="#F0F0FF" />
+            <stop stopColor="#F1F1FD" />
+            <stop offset="0.703125" stopColor="white" />
+          </radialGradient>
+          <linearGradient
+            id="paint1_linear_2247_31600"
+            x1="104.526"
+            y1="74"
+            x2="109.495"
+            y2="52.1101"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop stopColor="#F7F8FD" />
+            <stop offset="1" stopColor="white" />
+          </linearGradient>
+          <linearGradient
+            id="paint2_linear_2247_31600"
+            x1="58.8725"
+            y1="27"
+            x2="96.1314"
+            y2="50.4872"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop stopColor="#244CB3" stopOpacity="0.2" />
+            <stop offset="1" stopColor="#B4C2E5" stopOpacity="0.07" />
+          </linearGradient>
+        </defs>
+      </svg>
+    </SvgIcon>
+  );
+};
diff --git a/packages/apps/staking/src/assets/styles/_shadow-icon.scss b/packages/apps/staking/src/assets/styles/_shadow-icon.scss
new file mode 100644
index 0000000000..bf50fc4162
--- /dev/null
+++ b/packages/apps/staking/src/assets/styles/_shadow-icon.scss
@@ -0,0 +1,29 @@
+.shadow-icon{
+  display: flex;
+  gap: 16px;
+  height: 90px;
+  &__icon {
+    width: 65px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  img, svg {
+    transform: translateY(17%);
+    width: 130px;
+    height: 130px;
+  }
+  span{
+    padding-top: 20px;
+    font-size: 28px;
+    font-weight: 600;
+  }
+
+    @media (max-width: 400px) {
+      span {
+        padding-top: 30px;
+        font-size: 20px;
+        font-weight: 500;
+      }
+    }
+}
diff --git a/packages/apps/staking/src/assets/styles/main.scss b/packages/apps/staking/src/assets/styles/main.scss
index d307c35bcf..4658e923ee 100644
--- a/packages/apps/staking/src/assets/styles/main.scss
+++ b/packages/apps/staking/src/assets/styles/main.scss
@@ -3,4 +3,5 @@
 @use 'page-wrapper';
 @use 'footer';
 @use 'home-page';
-@use 'breadcrumbs';
\ No newline at end of file
+@use 'breadcrumbs';
+@use 'shadow-icon';
\ No newline at end of file
diff --git a/packages/apps/staking/src/components/Account/index.tsx b/packages/apps/staking/src/components/Account/index.tsx
index c1a4e8490d..1f5784fc35 100644
--- a/packages/apps/staking/src/components/Account/index.tsx
+++ b/packages/apps/staking/src/components/Account/index.tsx
@@ -16,7 +16,7 @@ export function Account() {
 
   const theme = useTheme();
   const isSmallScreen = useMediaQuery(theme.breakpoints.down('md'));
-  const isMediumScreen = useMediaQuery(theme.breakpoints.down(1500));
+  const isMediumScreen = useMediaQuery(theme.breakpoints.down(1800));
 
   const formattedAddress = isMediumScreen ? formatAddress(address) : address;
 
diff --git a/packages/apps/staking/src/components/Footer/Footer.tsx b/packages/apps/staking/src/components/Footer/Footer.tsx
index cc9a7eadec..3bbbb718e2 100644
--- a/packages/apps/staking/src/components/Footer/Footer.tsx
+++ b/packages/apps/staking/src/components/Footer/Footer.tsx
@@ -46,7 +46,7 @@ const Footer: FC = () => {
             </Typography>
           </div>
           <Typography variant="subtitle1" color="text.secondary">
-            © 2021 HPF. HUMAN Protocol® is a registered trademark
+            © 2025 HPF. HUMAN Protocol® is a registered trademark
           </Typography>
         </div>
         <div className="footer-icon">
diff --git a/packages/apps/staking/src/components/Headers/DefaultHeader.tsx b/packages/apps/staking/src/components/Headers/DefaultHeader.tsx
index 0abc506166..46a9f644a5 100644
--- a/packages/apps/staking/src/components/Headers/DefaultHeader.tsx
+++ b/packages/apps/staking/src/components/Headers/DefaultHeader.tsx
@@ -51,7 +51,7 @@ export const DefaultHeader: FC = () => {
         <Box sx={{ display: { xs: 'none', md: 'flex' }, alignItems: 'center' }}>
           <MuiLink
             sx={{ fontSize: '14px', fontWeight: 600, mx: 2 }}
-            href="https://dashboard.humanprotocol.org"
+            href={import.meta.env.VITE_HEADER_LINK_DASHBOARD}
             underline="none"
           >
             Dashboard
@@ -108,7 +108,7 @@ export const DefaultHeader: FC = () => {
 
             <MuiLink
               sx={{ fontSize: '18px', fontWeight: 600, my: 2 }}
-              href="https://dashboard.humanprotocol.org"
+              href={import.meta.env.VITE_HEADER_LINK_DASHBOARD}
               underline="none"
               onClick={() => toggleDrawer(false)}
             >
diff --git a/packages/apps/staking/src/components/ShadowIcon/index.tsx b/packages/apps/staking/src/components/ShadowIcon/index.tsx
new file mode 100644
index 0000000000..7a16de664e
--- /dev/null
+++ b/packages/apps/staking/src/components/ShadowIcon/index.tsx
@@ -0,0 +1,22 @@
+import { FC } from 'react';
+import clsx from 'clsx';
+
+const ShadowIcon: FC<{
+  className?: string;
+  title?: string;
+  img: string | JSX.Element;
+}> = ({ className, title, img }) => {
+  return (
+    <div
+      className={clsx('shadow-icon', className)}
+      style={{ marginBottom: '20px' }}
+    >
+      <div className="shadow-icon__icon">
+        {typeof img === 'string' ? <img src={img} alt="logo" /> : <>{img}</>}
+      </div>
+      <span>{title}</span>
+    </div>
+  );
+};
+
+export default ShadowIcon;
diff --git a/packages/apps/staking/src/components/Tables/kvstore.tsx b/packages/apps/staking/src/components/Tables/kvstore.tsx
new file mode 100644
index 0000000000..334dcf44ae
--- /dev/null
+++ b/packages/apps/staking/src/components/Tables/kvstore.tsx
@@ -0,0 +1,211 @@
+import EditIcon from '@mui/icons-material/Edit';
+import InfoIcon from '@mui/icons-material/Info';
+import { Box, Button, Typography, useTheme } from '@mui/material';
+import { DataGrid, GridColDef } from '@mui/x-data-grid';
+import React, { useState } from 'react';
+import { useAccount } from 'wagmi';
+import { SUPPORTED_CHAIN_IDS } from '../../constants/chains';
+import { useKVStoreContext } from '../../contexts/kvstore';
+import { useSnackbar } from '../../providers/SnackProvider';
+import KVStoreModal from '../modals/KVStoreModal';
+import { ChainId } from '@human-protocol/sdk';
+
+const KVStoreTable: React.FC = () => {
+  const { kvStore, set, setBulk } = useKVStoreContext();
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const theme = useTheme();
+  const { chainId } = useAccount();
+  const { showError } = useSnackbar();
+  const filteredData = kvStore.filter((item) => item.value !== '');
+
+  const handleOpenModal = () => {
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId as ChainId)) {
+      showError('Unsupported chain. Please switch to a supported network.');
+      return;
+    }
+    setIsModalOpen(true);
+  };
+
+  const handleSaveChanges = async (keys: string[], values: string[]) => {
+    try {
+      if (keys.length === 1) {
+        await set(keys[0], values[0]);
+      } else {
+        await setBulk(keys, values);
+      }
+    } catch (err) {
+      console.error('Failed to update KVStore:', err);
+    }
+  };
+
+  const columns: GridColDef[] = [
+    {
+      field: 'key',
+      headerName: 'Key',
+      flex: 1,
+      renderCell: (params) => (
+        <Typography
+          variant="body1"
+          fontWeight={400}
+          display="flex"
+          alignItems="center"
+          fontSize="1.1rem"
+        >
+          {params.value}
+        </Typography>
+      ),
+    },
+    {
+      field: 'value',
+      headerName: 'Value',
+      flex: 2,
+      renderCell: (params) => (
+        <Typography
+          variant="body1"
+          fontWeight={400}
+          display="flex"
+          alignItems="center"
+          fontSize="1.1rem"
+        >
+          {params.value}
+        </Typography>
+      ),
+    },
+  ];
+
+  return (
+    <Box
+      sx={{
+        width: '100%',
+        marginBottom: 3,
+        padding: 3,
+        backgroundColor: theme.palette.white.main,
+        borderRadius: '16px',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 2,
+      }}
+    >
+      <Box
+        sx={{
+          flexGrow: 1,
+        }}
+      >
+        <DataGrid
+          rows={filteredData}
+          columns={columns}
+          getRowId={(row) => row.key}
+          getRowHeight={() => (filteredData.length > 0 ? 'auto' : null)}
+          pageSizeOptions={[5, 10, 25]}
+          initialState={{
+            pagination: {
+              paginationModel: { pageSize: 10 },
+            },
+          }}
+          disableColumnSelector
+          disableRowSelectionOnClick
+          disableColumnMenu
+          hideFooterPagination={filteredData.length === 0}
+          sx={{
+            border: 0,
+            '& .MuiDataGrid-cell': {
+              borderTop: 'none',
+              padding: '12px 16px',
+              fontSize: '0.9rem',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+            },
+            '& .MuiDataGrid-row': {
+              borderTop: 'none',
+              '&:hover': {
+                background: 'rgba(20, 6, 178, 0.04)',
+              },
+            },
+            '& .MuiDataGrid-cell:focus': {
+              outline: 'none',
+            },
+            '& .MuiDataGrid-cell:focus-within': {
+              outline: 'none',
+            },
+            '& .MuiDataGrid-columnHeaders': {
+              background: 'rgba(20, 6, 178, 0.04)',
+              color: '#333',
+              fontWeight: 'bold',
+              fontSize: '1.1rem',
+              textTransform: 'uppercase',
+            },
+            '& .MuiDataGrid-footerContainer': {
+              borderTop: '1px solid #E0E0E0',
+            },
+            '& .MuiDataGrid-columnHeader:hover': {
+              color: 'rgb(133, 142, 198)',
+            },
+            '& .MuiDataGrid-columnHeader:focus-within': {
+              outline: 'none',
+            },
+            '& .MuiDataGrid-columnSeparator--sideRight': {
+              display: 'none',
+            },
+            '& .MuiDataGrid-virtualScroller': {
+              position: 'relative',
+            },
+            '& .MuiDataGrid-filler': {
+              display: 'none',
+            },
+            '&, [class^=MuiDataGrid]': { border: 'none' },
+          }}
+          slots={{
+            noRowsOverlay: () => (
+              <Box
+                sx={{
+                  display: 'flex',
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                  minHeight: '180px',
+                }}
+              >
+                <Typography variant="body1" fontWeight={500}>
+                  No data available
+                </Typography>
+              </Box>
+            ),
+          }}
+        />
+      </Box>
+      <Button
+        variant="outlined"
+        startIcon={<EditIcon />}
+        size="large"
+        fullWidth
+        onClick={handleOpenModal}
+      >
+        Edit
+      </Button>
+      <KVStoreModal
+        open={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        initialData={filteredData}
+        onSave={handleSaveChanges}
+      />
+      <Typography
+        variant="body2"
+        color="textSecondary"
+        sx={{
+          mt: 2,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          gap: 1,
+        }}
+      >
+        <InfoIcon fontSize="small" />
+        Please note: The data displayed is fetched from the subgraph and may
+        take some time to update. As a result, the table might temporarily show
+        outdated information.
+      </Typography>
+    </Box>
+  );
+};
+
+export default KVStoreTable;
diff --git a/packages/apps/staking/src/components/modals/BaseModal.tsx b/packages/apps/staking/src/components/modals/BaseModal.tsx
index e20823c06b..a5eef857a6 100644
--- a/packages/apps/staking/src/components/modals/BaseModal.tsx
+++ b/packages/apps/staking/src/components/modals/BaseModal.tsx
@@ -1,14 +1,15 @@
 import React from 'react';
-import { Modal, Box, IconButton } from '@mui/material';
+import { Modal, Box, IconButton, SxProps, Theme } from '@mui/material';
 import CloseIcon from '@mui/icons-material/Close';
 
 type Props = {
   open: boolean;
   onClose: () => void;
   children: React.ReactNode;
+  sx?: SxProps<Theme>;
 };
 
-const BaseModal: React.FC<Props> = ({ open, onClose, children }) => {
+const BaseModal: React.FC<Props> = ({ open, onClose, children, sx }) => {
   return (
     <Modal open={open} onClose={onClose}>
       <Box
@@ -20,6 +21,7 @@ const BaseModal: React.FC<Props> = ({ open, onClose, children }) => {
           backgroundColor: '#fff',
           borderRadius: 2,
           position: 'relative',
+          ...sx,
         }}
       >
         <IconButton
diff --git a/packages/apps/staking/src/components/modals/KVStoreModal.tsx b/packages/apps/staking/src/components/modals/KVStoreModal.tsx
new file mode 100644
index 0000000000..4b280abf10
--- /dev/null
+++ b/packages/apps/staking/src/components/modals/KVStoreModal.tsx
@@ -0,0 +1,311 @@
+import {
+  IKVStore,
+  KVStoreKeys,
+  LeaderCategory,
+  Role,
+} from '@human-protocol/sdk';
+import DeleteIcon from '@mui/icons-material/Delete';
+import {
+  Box,
+  Button,
+  CircularProgress,
+  FormControl,
+  Grid,
+  IconButton,
+  InputLabel,
+  MenuItem,
+  Select,
+  TextField,
+  Tooltip,
+  Typography,
+} from '@mui/material';
+import React, { useEffect, useState } from 'react';
+import { useSnackbar } from '../../providers/SnackProvider';
+import BaseModal from './BaseModal';
+
+type Props = {
+  open: boolean;
+  onClose: () => void;
+  initialData: IKVStore[];
+  onSave: (keys: string[], values: string[]) => Promise<void>;
+};
+
+const KVStoreModal: React.FC<Props> = ({
+  open,
+  onClose,
+  initialData,
+  onSave,
+}) => {
+  const [formData, setFormData] = useState<
+    { key: string; value: string; isCustom?: boolean }[]
+  >([]);
+  const [pendingChanges, setPendingChanges] = useState<
+    { key: string; value: string }[]
+  >([]);
+  const [loading, setLoading] = useState(false);
+  const { showError } = useSnackbar();
+
+  useEffect(() => {
+    if (open) {
+      const preparedData = initialData.map((item) => ({
+        ...item,
+        isCustom: !Object.values(KVStoreKeys).includes(item.key),
+      }));
+      setFormData(preparedData);
+      setPendingChanges([]);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
+
+  const updatePendingChanges = (key: string, value: string) => {
+    setPendingChanges((prev) => {
+      const existingChangeIndex = prev.findIndex(
+        (change) => change.key === key
+      );
+      const newChanges = [...prev];
+
+      if (existingChangeIndex >= 0) {
+        newChanges[existingChangeIndex].value = value;
+      } else {
+        newChanges.push({ key, value });
+      }
+
+      return newChanges;
+    });
+  };
+
+  const handleKeyChange = (index: number, newKey: string) => {
+    if (formData.some((item, i) => i !== index && item.key === newKey)) {
+      showError('Duplicate keys are not allowed.');
+      return;
+    }
+
+    const updatedData = [...formData];
+    updatedData[index].key = newKey;
+    updatedData[index].isCustom = newKey === 'custom';
+
+    if (newKey === 'custom') {
+      updatedData[index].key = '';
+    }
+
+    setFormData(updatedData);
+
+    if (!updatedData[index].isCustom) {
+      updatePendingChanges(newKey, updatedData[index].value);
+    }
+  };
+
+  const handleCustomKeyChange = (index: number, customKey: string) => {
+    if (formData.some((item, i) => i !== index && item.key === customKey)) {
+      showError('Duplicate keys are not allowed.');
+      return;
+    }
+
+    const updatedData = [...formData];
+    updatedData[index].key = customKey;
+
+    setFormData(updatedData);
+  };
+
+  const handleValueChange = (index: number, newValue: string) => {
+    const updatedData = [...formData];
+    updatedData[index].value = newValue;
+
+    if (!updatedData[index].isCustom) {
+      updatePendingChanges(updatedData[index].key, newValue);
+    }
+    setFormData(updatedData);
+  };
+
+  const handleDelete = (index: number) => {
+    const updatedData = formData.filter((_, i) => i !== index);
+    updatePendingChanges(formData[index].key, '');
+    setFormData(updatedData);
+  };
+
+  const handleAddField = () => {
+    setFormData((prev) => [...prev, { key: '', value: '' }]);
+  };
+
+  const handleSave = async () => {
+    setLoading(true);
+    try {
+      const customChanges = formData
+        .filter(
+          (item) =>
+            item.isCustom &&
+            !initialData.some(
+              (data) => data.key === item.key && data.value === item.value
+            )
+        )
+        .map((item) => ({
+          key: item.key,
+          value: item.value,
+        }));
+      const finalChanges = [...pendingChanges, ...customChanges].filter(
+        (item) => item.key !== ''
+      );
+      const keys = finalChanges.map((item) => item.key);
+      const values = finalChanges.map((item) => item.value);
+      if (finalChanges.length > 0) {
+        await onSave(keys, values);
+      }
+      onClose();
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <BaseModal
+      open={open}
+      onClose={onClose}
+      sx={{
+        width: '80%',
+        maxWidth: '1200px',
+      }}
+    >
+      <Typography variant="h6" mb={2}>
+        Edit KVStore
+      </Typography>
+      <Box
+        sx={{
+          maxHeight: '400px',
+          overflowY: 'auto',
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 1,
+          mb: 5,
+        }}
+      >
+        {formData.map((item, index) => (
+          <Grid
+            container
+            spacing={2}
+            alignItems="center"
+            key={index}
+            mt={-1}
+            width={'104%'}
+          >
+            <Grid item xs={4}>
+              <Box
+                sx={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  gap: 1,
+                }}
+              >
+                <FormControl sx={{ flex: item.isCustom ? 0.3 : 1 }}>
+                  <InputLabel id={`key-select-label-${index}`}>Key</InputLabel>
+                  <Select
+                    labelId={`key-select-label-${index}`}
+                    label="Key"
+                    value={item.isCustom ? 'custom' : item.key}
+                    onChange={(e) => handleKeyChange(index, e.target.value)}
+                    disabled={initialData.some((data) => data.key === item.key)}
+                  >
+                    <MenuItem value="" disabled>
+                      Select Key
+                    </MenuItem>
+                    {Object.entries(KVStoreKeys).map(([label, kvKey]) => (
+                      <MenuItem key={kvKey} value={kvKey}>
+                        {label[0].toUpperCase() + label.slice(1)}
+                      </MenuItem>
+                    ))}
+                    <MenuItem value="custom">Custom</MenuItem>
+                  </Select>
+                </FormControl>
+                {item.isCustom && (
+                  <TextField
+                    placeholder="Custom Key"
+                    value={item.key}
+                    onChange={(e) =>
+                      handleCustomKeyChange(index, e.target.value)
+                    }
+                    fullWidth
+                    sx={{ flex: 0.7 }}
+                    disabled={initialData.some((data) => data.key === item.key)}
+                  />
+                )}
+              </Box>
+            </Grid>
+            <Grid item xs={7}>
+              {item.key === 'role' ? (
+                <FormControl fullWidth>
+                  <InputLabel id={`value-select-label-${index}`}>
+                    Value
+                  </InputLabel>
+                  <Select
+                    labelId={`value-select-label-${index}`}
+                    label="Value"
+                    value={item.value}
+                    onChange={(e) => handleValueChange(index, e.target.value)}
+                  >
+                    {Object.entries(Role).map(([roleKey, roleValue]) => (
+                      <MenuItem key={roleKey} value={roleValue}>
+                        {roleValue}
+                      </MenuItem>
+                    ))}
+                  </Select>
+                </FormControl>
+              ) : item.key === 'category' ? (
+                <FormControl fullWidth>
+                  <InputLabel id={`value-select-label-${index}`}>
+                    Value
+                  </InputLabel>
+                  <Select
+                    labelId={`value-select-label-${index}`}
+                    label="Value"
+                    value={item.value}
+                    onChange={(e) => handleValueChange(index, e.target.value)}
+                  >
+                    {Object.entries(LeaderCategory).map(
+                      ([categoryKey, categoryValue]) => (
+                        <MenuItem key={categoryKey} value={categoryValue}>
+                          {categoryValue}
+                        </MenuItem>
+                      )
+                    )}
+                  </Select>
+                </FormControl>
+              ) : (
+                <TextField
+                  fullWidth
+                  label="Value"
+                  value={item.value}
+                  onChange={(e) => handleValueChange(index, e.target.value)}
+                  type={item.key === 'fee' ? 'number' : 'text'}
+                  inputProps={{ min: item.key === 'fee' ? '0' : undefined }}
+                />
+              )}
+            </Grid>
+            <Grid item xs={1}>
+              <Tooltip title="Delete">
+                <IconButton onClick={() => handleDelete(index)}>
+                  <DeleteIcon />
+                </IconButton>
+              </Tooltip>
+            </Grid>
+          </Grid>
+        ))}
+      </Box>
+      <Box
+        sx={{ display: 'flex', justifyContent: 'space-between', mt: 2, gap: 2 }}
+      >
+        <Button variant="outlined" onClick={handleAddField} fullWidth>
+          Add Field
+        </Button>
+        <Button
+          variant="contained"
+          fullWidth
+          onClick={handleSave}
+          disabled={loading}
+        >
+          {loading ? <CircularProgress size={20} /> : 'Save Changes'}
+        </Button>
+      </Box>
+    </BaseModal>
+  );
+};
+
+export default KVStoreModal;
diff --git a/packages/apps/staking/src/components/modals/UnstakeModal.tsx b/packages/apps/staking/src/components/modals/UnstakeModal.tsx
index 55b8fd1ec4..486038e748 100644
--- a/packages/apps/staking/src/components/modals/UnstakeModal.tsx
+++ b/packages/apps/staking/src/components/modals/UnstakeModal.tsx
@@ -15,11 +15,13 @@ type Props = {
 };
 
 const UnstakeModal: React.FC<Props> = ({ open, onClose }) => {
-  const { stakedAmount, lockedAmount, handleUnstake } = useStakeContext();
+  const { stakedAmount, lockedAmount, withdrawableAmount, handleUnstake } =
+    useStakeContext();
   const [amount, setAmount] = useState('');
   const [loading, setLoading] = useState(false);
 
-  const availableAmount = Number(stakedAmount) - Number(lockedAmount);
+  const availableAmount =
+    Number(stakedAmount) - Number(lockedAmount) - Number(withdrawableAmount);
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
diff --git a/packages/apps/staking/src/constants/chains.ts b/packages/apps/staking/src/constants/chains.ts
index aecd68e9a9..c079b7577f 100644
--- a/packages/apps/staking/src/constants/chains.ts
+++ b/packages/apps/staking/src/constants/chains.ts
@@ -14,7 +14,6 @@ switch (import.meta.env.VITE_APP_ENVIRONMENT.toLowerCase()) {
       ChainId.BSC_TESTNET,
       ChainId.POLYGON_AMOY,
       ChainId.SEPOLIA,
-      ChainId.XLAYER_TESTNET,
     ];
     break;
   case 'localhost':
@@ -36,13 +35,6 @@ if (SUPPORTED_CHAIN_IDS.length === 0) {
   );
 }
 
-export const CHAIN_ID_BY_NAME: Record<string, ChainId> = {
-  'Polygon Amoy': ChainId.POLYGON_AMOY,
-  'Binance Smart Chain': ChainId.BSC_MAINNET,
-  'Ethereum Sepolia': ChainId.SEPOLIA,
-  Localhost: ChainId.LOCALHOST,
-};
-
 export const LOCALHOST = {
   id: 1338,
   name: 'Localhost',
diff --git a/packages/apps/staking/src/constants/index.tsx b/packages/apps/staking/src/constants/index.tsx
deleted file mode 100644
index 60a4cd3b44..0000000000
--- a/packages/apps/staking/src/constants/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export const HUMAN_SIGNATURE_KEY = 'human-signature';
diff --git a/packages/apps/staking/src/contexts/kvstore.tsx b/packages/apps/staking/src/contexts/kvstore.tsx
new file mode 100644
index 0000000000..385eddcccd
--- /dev/null
+++ b/packages/apps/staking/src/contexts/kvstore.tsx
@@ -0,0 +1,27 @@
+import React, { createContext, useContext } from 'react';
+import { useKVStore } from '../hooks/useKVStore';
+
+const KVStoreContext = createContext<ReturnType<typeof useKVStore> | undefined>(
+  undefined
+);
+
+export const KVStoreProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const kvStore = useKVStore();
+
+  return (
+    <KVStoreContext.Provider value={kvStore}>
+      {children}
+    </KVStoreContext.Provider>
+  );
+};
+
+// eslint-disable-next-line react-refresh/only-export-components
+export const useKVStoreContext = () => {
+  const context = useContext(KVStoreContext);
+  if (!context) {
+    throw new Error('useKVStoreContext must be used within a KVStoreProvider');
+  }
+  return context;
+};
diff --git a/packages/apps/staking/src/contexts/stake.tsx b/packages/apps/staking/src/contexts/stake.tsx
index c7f00e5b01..7334fb62ea 100644
--- a/packages/apps/staking/src/contexts/stake.tsx
+++ b/packages/apps/staking/src/contexts/stake.tsx
@@ -15,6 +15,7 @@ export const StakeProvider: React.FC<{ children: React.ReactNode }> = ({
   );
 };
 
+// eslint-disable-next-line react-refresh/only-export-components
 export const useStakeContext = () => {
   const context = useContext(StakeContext);
   if (!context) {
diff --git a/packages/apps/staking/src/hooks/useKVStore.ts b/packages/apps/staking/src/hooks/useKVStore.ts
new file mode 100644
index 0000000000..694c5e230f
--- /dev/null
+++ b/packages/apps/staking/src/hooks/useKVStore.ts
@@ -0,0 +1,110 @@
+import { ChainId, IKVStore, KVStoreClient } from '@human-protocol/sdk';
+import { ethers } from 'ethers';
+import { useEffect, useState } from 'react';
+import { useAccount, useWalletClient } from 'wagmi';
+import { SUPPORTED_CHAIN_IDS } from '../constants/chains';
+import { useSnackbar } from '../providers/SnackProvider';
+import { parseErrorMessage } from '../utils/string';
+import { getKVStoreData } from '../services/dashboard';
+
+export const useKVStore = () => {
+  const { address, chainId } = useAccount();
+  const { data: walletClient } = useWalletClient();
+  const { showError, openSnackbar } = useSnackbar();
+
+  const [kvStore, setKVStore] = useState<IKVStore[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [kvstoreClient, setKVStoreClient] = useState<KVStoreClient | null>(
+    null
+  );
+
+  const fetchKVStore = async () => {
+    setLoading(true);
+    try {
+      if (address && chainId) {
+        const data = await getKVStoreData(address, chainId);
+        setKVStore(data);
+      }
+    } catch (err) {
+      console.error(err);
+      showError('Failed to fetch KVStore data');
+      setKVStore([]);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    const initStakingClient = async () => {
+      try {
+        if (walletClient && address) {
+          checkSupportedChain();
+          const provider = new ethers.BrowserProvider(window.ethereum);
+          const signer = await provider.getSigner();
+
+          const client = await KVStoreClient.build(signer);
+          setKVStoreClient(client);
+          await fetchKVStore();
+        }
+      } catch (error) {
+        showError(parseErrorMessage(error));
+        resetData();
+      }
+    };
+
+    initStakingClient();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [walletClient, address, chainId]);
+
+  const checkSupportedChain = () => {
+    const isSupportedChain = SUPPORTED_CHAIN_IDS.includes(chainId as ChainId);
+    if (!isSupportedChain) {
+      resetData();
+      throw new Error(
+        'Unsupported chain. Please switch to a supported network.'
+      );
+    }
+  };
+
+  const resetData = () => {
+    setKVStore([]);
+  };
+
+  const set = async (key: string, value: string) => {
+    setLoading(true);
+    try {
+      checkSupportedChain();
+      if (kvstoreClient && key) {
+        await kvstoreClient.set(key, value);
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+        openSnackbar('KVStore updated successfully!', 'success');
+        await fetchKVStore();
+      }
+    } catch (err) {
+      showError(parseErrorMessage(err));
+      console.error(err);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const setBulk = async (keys: string[], values: string[]) => {
+    setLoading(true);
+    try {
+      checkSupportedChain();
+      if (kvstoreClient) {
+        await kvstoreClient.setBulk(keys, values);
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+        openSnackbar('KVStore updated successfully!', 'success');
+        await fetchKVStore();
+      }
+    } catch (err) {
+      showError(parseErrorMessage(err));
+      console.error(err);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return { kvStore, fetchKVStore, set, setBulk, loading };
+};
diff --git a/packages/apps/staking/src/hooks/useStake.ts b/packages/apps/staking/src/hooks/useStake.ts
index ddd8e3be70..b87dc32682 100644
--- a/packages/apps/staking/src/hooks/useStake.ts
+++ b/packages/apps/staking/src/hooks/useStake.ts
@@ -7,15 +7,15 @@ import {
 } from '@human-protocol/sdk';
 import { ethers } from 'ethers';
 import { useEffect, useState } from 'react';
-import { useAccount, useChainId, useWalletClient } from 'wagmi';
+import { useAccount, useWalletClient } from 'wagmi';
 import { useSnackbar } from '../providers/SnackProvider';
 import { parseErrorMessage } from '../utils/string';
 import { formatAmount } from '../utils/units';
+import { SUPPORTED_CHAIN_IDS } from '../constants/chains';
 
 export const useStake = () => {
-  const { address } = useAccount();
+  const { address, chainId } = useAccount();
   const { data: walletClient } = useWalletClient();
-  const chainId = useChainId();
   const { showError, openSnackbar } = useSnackbar();
 
   const [stakingClient, setStakingClient] = useState<StakingClient | null>(
@@ -28,24 +28,42 @@ export const useStake = () => {
     const initStakingClient = async () => {
       try {
         if (walletClient && address) {
+          checkSupportedChain();
           const provider = new ethers.BrowserProvider(window.ethereum);
           const signer = await provider.getSigner();
 
           const client = await StakingClient.build(signer);
           setStakingClient(client);
-
           await fetchStakingData(client);
           await fetchTokenBalance(provider, address, chainId);
         }
       } catch (error) {
-        showError('Invalid network');
+        showError(error);
+        resetData();
       }
     };
 
     initStakingClient();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [walletClient, address, chainId]);
 
+  const checkSupportedChain = () => {
+    const isSupportedChain = SUPPORTED_CHAIN_IDS.includes(chainId as ChainId);
+    if (!isSupportedChain) {
+      resetData();
+      throw new Error(
+        'Unsupported chain. Please switch to a supported network.'
+      );
+    }
+  };
+
+  const resetData = () => {
+    setStakingData(null);
+    setTokenBalance(0);
+  };
+
   const fetchStakingData = async (stakingClient: StakingClient) => {
+    checkSupportedChain();
     try {
       const stakingInfo = await stakingClient.getStakerInfo(address!);
       setStakingData(stakingInfo);
@@ -57,8 +75,9 @@ export const useStake = () => {
   const fetchTokenBalance = async (
     provider: ethers.BrowserProvider,
     address: string,
-    chainId: number
+    chainId?: number
   ) => {
+    checkSupportedChain();
     try {
       const tokenAddress = NETWORKS[chainId as ChainId]?.hmtAddress;
       if (!tokenAddress) {
@@ -81,6 +100,7 @@ export const useStake = () => {
 
   const handleStake = async (amount: string) => {
     try {
+      checkSupportedChain();
       if (stakingClient && amount) {
         const weiAmount = ethers.parseUnits(amount, 'ether');
         await stakingClient.approveStake(weiAmount);
@@ -100,6 +120,7 @@ export const useStake = () => {
 
   const handleUnstake = async (amount: string) => {
     try {
+      checkSupportedChain();
       if (stakingClient && amount) {
         const weiAmount = ethers.parseUnits(amount, 'ether');
         await stakingClient.unstake(weiAmount);
@@ -118,6 +139,7 @@ export const useStake = () => {
 
   const handleWithdraw = async () => {
     try {
+      checkSupportedChain();
       if (stakingClient) {
         await stakingClient.withdraw();
         await fetchStakingData(stakingClient);
diff --git a/packages/apps/staking/src/main.tsx b/packages/apps/staking/src/main.tsx
index c0a50bc94f..42ad0ec619 100644
--- a/packages/apps/staking/src/main.tsx
+++ b/packages/apps/staking/src/main.tsx
@@ -12,6 +12,7 @@ import { QueryClientProvider } from './providers/QueryClientProvider';
 import './assets/styles/main.scss';
 import 'simplebar-react/dist/simplebar.min.css';
 import { StakeProvider } from './contexts/stake';
+import { KVStoreProvider } from './contexts/kvstore';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   <React.StrictMode>
@@ -22,7 +23,9 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
             <CssBaseline />
             <SnackbarProvider>
               <StakeProvider>
-                <App />
+                <KVStoreProvider>
+                  <App />
+                </KVStoreProvider>
               </StakeProvider>
             </SnackbarProvider>
           </Router>
diff --git a/packages/apps/staking/src/pages/Dashboard/index.tsx b/packages/apps/staking/src/pages/Dashboard/index.tsx
index 792fa0bb2e..824238ee81 100644
--- a/packages/apps/staking/src/pages/Dashboard/index.tsx
+++ b/packages/apps/staking/src/pages/Dashboard/index.tsx
@@ -1,17 +1,23 @@
+import { Box, Container, Grid, Typography, useMediaQuery } from '@mui/material';
+import { useTheme } from '@mui/material/styles';
 import React, { useState } from 'react';
-import { Box, Grid, Container, Typography } from '@mui/material';
+import { KVStoreIcon } from '../../assets/KVStoreIcon';
 import BalanceCard from '../../components/BalanceCard';
-import StakedAmountCard from '../../components/StakedAmountCard';
 import LockedAmountCard from '../../components/LockedAmountCard';
-import WithdrawableAmountCard from '../../components/WithdrawableAmountCard';
 import StakeModal from '../../components/modals/StakeModal';
 import UnstakeModal from '../../components/modals/UnstakeModal';
-import PageWrapper from '../../components/PageWrapper';
 import NetworkStatus from '../../components/NetworkStatus';
+import PageWrapper from '../../components/PageWrapper';
+import ShadowIcon from '../../components/ShadowIcon';
+import StakedAmountCard from '../../components/StakedAmountCard';
+import KVStoreTable from '../../components/Tables/kvstore';
+import WithdrawableAmountCard from '../../components/WithdrawableAmountCard';
 
 const Dashboard: React.FC = () => {
   const [stakeModalOpen, setStakeModalOpen] = useState(false);
   const [unstakeModalOpen, setUnstakeModalOpen] = useState(false);
+  const theme = useTheme();
+  const isSmallScreen = useMediaQuery(theme.breakpoints.down('sm'));
 
   return (
     <PageWrapper violetHeader>
@@ -22,11 +28,17 @@ const Dashboard: React.FC = () => {
               mt: 6,
               mb: 8,
               display: 'flex',
+              flexDirection: isSmallScreen ? 'column' : 'row',
               justifyContent: 'space-between',
-              alignItems: 'center',
+              alignItems: isSmallScreen ? 'flex-start' : 'center',
+              gap: 2,
             }}
           >
-            <Typography variant="h4" fontWeight="bold" color="white">
+            <Typography
+              variant="h1"
+              fontWeight="bold"
+              color={theme.palette.white.main}
+            >
               Staking Overview
             </Typography>
             <NetworkStatus />
@@ -52,6 +64,15 @@ const Dashboard: React.FC = () => {
               <WithdrawableAmountCard />
             </Grid>
           </Grid>
+
+          <Box mt={8}>
+            <ShadowIcon
+              className="home-page-kvstore"
+              title="KV Store"
+              img={<KVStoreIcon />}
+            />
+            <KVStoreTable />
+          </Box>
         </Container>
       </Box>
 
diff --git a/packages/apps/staking/src/providers/WagmiProvider.tsx b/packages/apps/staking/src/providers/WagmiProvider.tsx
index a0d72e5061..b684251dc0 100644
--- a/packages/apps/staking/src/providers/WagmiProvider.tsx
+++ b/packages/apps/staking/src/providers/WagmiProvider.tsx
@@ -1,52 +1,48 @@
 import { FC, PropsWithChildren } from 'react';
 import { createConfig, http, WagmiProvider as WWagmiProvider } from 'wagmi';
+import { walletConnect, coinbaseWallet } from 'wagmi/connectors';
 import * as wagmiChains from 'wagmi/chains';
-import { coinbaseWallet, walletConnect } from 'wagmi/connectors';
-
-import { LOCALHOST } from '../constants/chains';
+import { LOCALHOST, SUPPORTED_CHAIN_IDS } from '../constants/chains';
 
 const projectId = import.meta.env.VITE_APP_WALLETCONNECT_PROJECT_ID;
 
+const chainIdToChainMap: Record<number, any> = {
+  [wagmiChains.mainnet.id]: wagmiChains.mainnet,
+  [wagmiChains.sepolia.id]: wagmiChains.sepolia,
+  [wagmiChains.bsc.id]: wagmiChains.bsc,
+  [wagmiChains.bscTestnet.id]: wagmiChains.bscTestnet,
+  [wagmiChains.polygon.id]: wagmiChains.polygon,
+  [wagmiChains.polygonAmoy.id]: wagmiChains.polygonAmoy,
+  [wagmiChains.moonbeam.id]: wagmiChains.moonbeam,
+  [wagmiChains.moonbaseAlpha.id]: wagmiChains.moonbaseAlpha,
+  [wagmiChains.avalanche.id]: wagmiChains.avalanche,
+  [wagmiChains.avalancheFuji.id]: wagmiChains.avalancheFuji,
+  [wagmiChains.xLayer.id]: wagmiChains.xLayer,
+  [wagmiChains.xLayerTestnet.id]: wagmiChains.xLayerTestnet,
+  [LOCALHOST.id]: LOCALHOST,
+};
+
+const supportedChains = SUPPORTED_CHAIN_IDS.map(
+  (id) => chainIdToChainMap[id]
+).filter(Boolean);
+
 export const wagmiConfig = createConfig({
-  chains: [
-    wagmiChains.mainnet,
-    wagmiChains.sepolia,
-    wagmiChains.bsc,
-    wagmiChains.bscTestnet,
-    wagmiChains.polygon,
-    wagmiChains.polygonAmoy,
-    wagmiChains.moonbeam,
-    wagmiChains.moonbaseAlpha,
-    wagmiChains.avalancheFuji,
-    wagmiChains.avalanche,
-    wagmiChains.xLayer,
-    wagmiChains.xLayerTestnet,
-    LOCALHOST,
-  ],
+  chains: supportedChains as any,
   connectors: [
     walletConnect({
       showQrModal: true,
       projectId: projectId ?? '',
     }),
     coinbaseWallet({
-      appName: 'human-job-launcher',
+      appName: 'human-staking-dashboard',
     }),
   ],
-  transports: {
-    [wagmiChains.mainnet.id]: http(),
-    [wagmiChains.sepolia.id]: http(),
-    [wagmiChains.bsc.id]: http(),
-    [wagmiChains.bscTestnet.id]: http(),
-    [wagmiChains.polygon.id]: http(),
-    [wagmiChains.polygonAmoy.id]: http(),
-    [wagmiChains.moonbeam.id]: http(),
-    [wagmiChains.moonbaseAlpha.id]: http(),
-    [wagmiChains.avalanche.id]: http(),
-    [wagmiChains.avalancheFuji.id]: http(),
-    [wagmiChains.xLayer.id]: http(),
-    [wagmiChains.xLayerTestnet.id]: http(),
-    [LOCALHOST.id]: http(LOCALHOST.rpcUrls.default.http[0]),
-  },
+  transports: Object.fromEntries(
+    supportedChains.map((chain) => [
+      chain.id,
+      http(chain.rpcUrls.default.http[0]),
+    ])
+  ),
 });
 
 export const WagmiProvider: FC<PropsWithChildren> = ({ children }) => {
diff --git a/packages/apps/staking/src/services/dashboard.ts b/packages/apps/staking/src/services/dashboard.ts
new file mode 100644
index 0000000000..5900576d32
--- /dev/null
+++ b/packages/apps/staking/src/services/dashboard.ts
@@ -0,0 +1,20 @@
+import { IKVStore } from '@human-protocol/sdk';
+import api from '../utils/api';
+
+export const getKVStoreData = async (
+  address: string,
+  chainId: number
+): Promise<IKVStore[]> => {
+  const response = await api.get(`details/kvstore/${address}`, {
+    params: { chain_id: chainId },
+  });
+
+  // Validate if response is IKVStore[]
+  if (
+    Array.isArray(response.data) &&
+    response.data.every((item) => 'key' in item && 'value' in item)
+  ) {
+    return response.data;
+  }
+  return [];
+};
diff --git a/packages/apps/staking/src/services/job.ts b/packages/apps/staking/src/services/job.ts
deleted file mode 100644
index 7861141972..0000000000
--- a/packages/apps/staking/src/services/job.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { WalletClient } from 'viem';
-
-import { HUMAN_SIGNATURE_KEY } from '../constants';
-import api from '../utils/api';
-
-export const solveJob = async (signer: WalletClient, body: any) => {
-  if (!signer.account) {
-    throw new Error('Account not found');
-  }
-
-  const signature = await signer.signMessage({
-    account: signer.account,
-    message: JSON.stringify(body),
-  });
-  await api.post('/job/solve', body, {
-    headers: { [HUMAN_SIGNATURE_KEY]: signature },
-  });
-};
diff --git a/packages/apps/staking/src/theme.ts b/packages/apps/staking/src/theme.ts
index ae150fcc8e..f8040f973e 100644
--- a/packages/apps/staking/src/theme.ts
+++ b/packages/apps/staking/src/theme.ts
@@ -1,154 +1,357 @@
 import { createTheme } from '@mui/material/styles';
+import {
+  PaletteColorOptions,
+  PaletteColor,
+} from '@mui/material/styles/createPalette';
+import { ThemeOptions } from '@mui/material';
+import { colorPalette } from './assets/styles/color-palette';
+import { CSSProperties } from 'react';
 
-const theme = createTheme({
+declare module '@mui/material/Typography' {
+  interface TypographyPropsVariantOverrides {
+    ['Components/Button Small']: true;
+    ['Components/Button Large']: true;
+    ['Components/Chip']: true;
+    ['Components/Table Header']: true;
+    ['H6-Mobile']: true;
+    body3: true;
+  }
+}
+
+declare module '@mui/material/styles' {
+  interface TypographyVariants {
+    ['Components/Button Small']: CSSProperties;
+    ['Components/Button Large']: CSSProperties;
+    ['Components/Chip']: CSSProperties;
+    ['Components/Table Header']: CSSProperties;
+    ['H6-Mobile']: CSSProperties;
+    body3: CSSProperties;
+  }
+
+  // allow configuration using `createTheme`
+  interface TypographyVariantsOptions {
+    ['Components/Button Small']?: CSSProperties;
+    ['Components/Button Large']?: CSSProperties;
+    ['Components/Chip']?: CSSProperties;
+    ['Components/Table Header']?: CSSProperties;
+    ['H6-Mobile']: CSSProperties;
+    body3?: CSSProperties;
+  }
+}
+
+declare module '@mui/material/styles' {
+  interface Palette {
+    sky: PaletteColor;
+    white: PaletteColor;
+    textSecondary: PaletteColor;
+  }
+  interface PaletteOptions {
+    sky?: PaletteColorOptions;
+    white?: PaletteColorOptions;
+    textSecondary?: PaletteColorOptions;
+  }
+}
+
+declare module '@mui/material/Button' {
+  interface ButtonPropsColorOverrides {
+    sky: true;
+    white: true;
+    textSecondary: true;
+  }
+}
+
+declare module '@mui/material/IconButton' {
+  interface IconButtonPropsColorOverrides {
+    sky: true;
+    white: true;
+    textSecondary: true;
+  }
+}
+
+declare module '@mui/material/SvgIcon' {
+  interface SvgIconPropsColorOverrides {
+    sky: true;
+    white: true;
+    textSecondary: true;
+  }
+}
+
+const theme: ThemeOptions = createTheme({
   palette: {
     primary: {
-      main: '#320a8d',
-      light: '#320a8d',
-      dark: '#4a148c',
+      main: colorPalette.primary.main,
+      light: colorPalette.primary.light,
     },
     info: {
-      main: '#eeeeee',
-      light: '#f5f5f5',
-      dark: '#bdbdbd',
+      main: colorPalette.info.main,
+      light: colorPalette.info.light,
+      dark: colorPalette.info.dark,
     },
     secondary: {
-      main: '#858ec6',
-      light: '#6309ff',
-      dark: '#00867d',
-      contrastText: '#000',
+      main: colorPalette.secondary.main,
+      light: colorPalette.secondary.light,
     },
     text: {
-      primary: '#320a8d',
-      secondary: '#858ec6',
+      primary: colorPalette.primary.main,
+      secondary: colorPalette.fog.main,
     },
-    success: {
-      main: '#0E976E',
+    sky: {
+      main: colorPalette.sky.main,
+      light: colorPalette.sky.light,
+      dark: colorPalette.sky.dark,
+      contrastText: colorPalette.sky.contrastText,
     },
-    warning: {
-      main: '#FF9800',
-    },
-    error: {
-      main: '#F20D5F',
+    white: {
+      main: '#fff',
+      light: '#fff',
+      dark: '#fff',
+      contrastText: '#fff',
     },
+    textSecondary: colorPalette.textSecondary,
   },
   typography: {
-    fontFamily: 'Inter',
+    fontFamily: 'Inter, Arial, sans-serif',
+    h1: {
+      fontSize: 32,
+    },
     h2: {
-      fontSize: '80px',
-      lineHeight: 1.5,
-      letterSpacing: '-0.5px',
-      fontWeight: 800,
+      fontSize: 34,
+      fontWeight: 600,
+    },
+    h3: {
+      fontSize: 24,
+      fontWeight: 500,
+      '@media (max-width:600px)': {
+        fontSize: 20,
+      },
     },
     h4: {
-      fontSize: '34px',
+      fontSize: 20,
+      fontWeight: 500,
+    },
+    h5: {
+      fontSize: 18,
       fontWeight: 600,
     },
     h6: {
+      fontSize: 20,
+      fontWeight: 500,
+    },
+    'H6-Mobile': {
       fontSize: '20px',
-      lineHeight: '160%',
+      fontWeight: 500,
+      lineHeight: '32px',
+      letterSpacing: '0.15px',
+      textAlign: 'left',
     },
     body1: {
-      fontSize: '16px',
-      lineHeight: '28px',
+      fontSize: 16,
+      fontWeight: 400,
     },
     body2: {
+      fontSize: 14,
+      fontWeight: 500,
+    },
+    body3: {
+      fontSize: '12px',
+      fontWeight: 400,
+      lineHeight: '19.92px',
+      letterSpacing: '0.4px',
+      textAlign: 'left',
+    },
+    'Components/Button Small': {
+      fontSize: '13px',
+      fontWeight: 600,
+      lineHeight: '22px',
+      letterSpacing: '0.1px',
+      textAlign: 'left',
+    },
+    'Components/Button Large': {
+      fontSize: '15px',
+      fontWeight: 600,
+      lineHeight: '26px',
+      letterSpacing: '0.1px',
+      textAlign: 'left',
+    },
+    'Components/Chip': {
+      fontSize: '13px',
+      fontWeight: 400,
+      lineHeight: '18px',
+      letterSpacing: '0.16px',
+      textAlign: 'left',
+    },
+    'Components/Table Header': {
+      fontFamily: 'Roboto',
       fontSize: '14px',
+      fontWeight: 500,
       lineHeight: '24px',
+      letterSpacing: '0.17px',
+      textAlign: 'left',
+    },
+    subtitle1: {
+      fontSize: 12,
+    },
+    subtitle2: {
+      fontSize: 14,
+      fontWeight: 600,
+      lineHeight: '21.9px',
+    },
+    caption: {
+      fontSize: 10,
     },
   },
   components: {
-    MuiAlert: {
+    MuiButton: {
       styleOverrides: {
-        outlinedSuccess: {
-          color: '#320a8d',
-          borderColor: '#320a8d',
+        root: {
+          fontWeight: 600,
+          textTransform: 'none',
         },
-        // icon: {
-        //   color: '#320a8d !important',
-        // },
       },
     },
-    MuiButton: {
+    MuiToolbar: {
       styleOverrides: {
         root: {
-          textTransform: 'none',
+          '@media (min-width:1280px)': {
+            paddingX: 56,
+          },
+        },
+      },
+    },
+    MuiTooltip: {
+      styleOverrides: {
+        tooltip: {
+          backgroundColor: colorPalette.secondary.main,
+          color: colorPalette.whiteSolid,
         },
-        sizeLarge: {
-          fontSize: '15px',
-          fontWeight: '600',
-          lineHeight: '24px',
-          padding: '12px 24px',
+        arrow: {
+          color: colorPalette.secondary.main,
         },
       },
     },
-    MuiCard: {
+    MuiIconButton: {
       styleOverrides: {
-        root: {
-          borderRadius: '16px',
-          background: '#fff',
-          boxShadow:
-            '0px 1px 5px 0px rgba(233, 235, 250, 0.20), 0px 2px 2px 0px rgba(233, 235, 250, 0.50), 0px 3px 1px -2px #E9EBFA',
+        sizeMedium: {
+          color: colorPalette.primary.main,
         },
       },
     },
-    MuiCardContent: {
+    MuiSelect: {
       styleOverrides: {
         root: {
-          padding: '32px 20px 18px !important',
+          borderRadius: 4,
+          borderWidth: 2,
+          color: colorPalette.primary.main,
+          '& .MuiOutlinedInput-notchedOutline': {
+            borderColor: colorPalette.primary.main,
+            borderWidth: 2,
+          },
+          '&:hover .MuiOutlinedInput-notchedOutline': {
+            borderColor: colorPalette.primary.main,
+          },
+          '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
+            borderColor: colorPalette.primary.main,
+          },
+          '& .MuiSvgIcon-root': {
+            color: colorPalette.primary.main,
+          },
         },
       },
     },
-    MuiLink: {
+    MuiTypography: {
       styleOverrides: {
         root: {
-          textDecoration: 'none',
+          wordBreak: 'break-word',
         },
       },
     },
     MuiOutlinedInput: {
       styleOverrides: {
         root: {
-          '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
-            borderWidth: '1px',
-          },
-        },
-        notchedOutline: {
-          borderColor: '#858ec6',
+          backgroundColor: colorPalette.white,
         },
       },
     },
-    MuiSelect: {
+    MuiMenuItem: {
       styleOverrides: {
-        icon: {
-          color: '#320a8d',
+        root: {
+          '&:hover': {
+            backgroundColor: '#1406B207',
+          },
         },
       },
     },
-    MuiToggleButton: {
+    MuiTablePagination: {
       styleOverrides: {
-        root: {
-          textTransform: 'none',
-          borderRadius: '8px',
-          border: '1px solid #320a8d',
-          color: '#320a8d',
-          fontWeight: 600,
-          fontSize: '14px',
-          '&.Mui-selected': {
-            background: '#320a8d',
-            color: '#fff',
+        toolbar: {
+          '@media (max-width: 440px)': {
+            display: 'grid',
+            gridTemplateColumns: '1fr 3fr 2fr',
+            gridTemplateRows: 'auto auto',
+            gridAutoFlow: 'row',
+          },
+        },
+        selectLabel: {
+          '@media (max-width: 440px)': {
+            gridColumn: '2 / 3',
+            gridRow: '1',
+            whiteSpace: 'nowrap',
+            color: colorPalette.fog.main,
+            justifySelf: 'end',
+            marginBottom: `17px`,
+            position: 'relative',
+            right: '-38px',
           },
-          '&.Mui-selected:hover': {
-            background: '#320a8d',
+          '&:focus': {
+            background: 'inherit',
+          },
+        },
+        input: {
+          '@media (max-width: 440px)': {
+            gridColumn: '3 / 3',
+            gridRow: '1',
+            marginRight: '8px',
+            width: '48px',
+            justifySelf: 'flex-end',
+          },
+        },
+        select: {
+          '&:focus': {
+            background: 'inherit',
+          },
+        },
+        displayedRows: {
+          '@media (max-width: 440px)': {
+            gridColumn: '2 / 3',
+            gridRow: '2',
+            justifySelf: 'end',
+            position: 'relative',
+            right: '-12px',
+          },
+        },
+        actions: {
+          '@media (max-width: 440px)': {
+            gridColumn: '3 / 3',
+            gridRow: '2',
+            justifySelf: 'end',
+            marginLeft: 0,
+            minWidth: '90px',
+          },
+          button: {
+            marginLeft: '5px',
           },
         },
       },
     },
-    MuiMenuItem: {
+    MuiLink: {
       styleOverrides: {
         root: {
-          '&.Mui-selected': {
-            backgroundColor: '#f9faff',
+          color: colorPalette.link,
+          '&:hover': {
+            color: `${colorPalette.linkHover}!important`,
+          },
+          '&:visited': {
+            color: colorPalette.linkVisited,
           },
         },
       },
diff --git a/packages/apps/staking/src/utils/api.ts b/packages/apps/staking/src/utils/api.ts
index 75febb176c..ac5315fb3b 100644
--- a/packages/apps/staking/src/utils/api.ts
+++ b/packages/apps/staking/src/utils/api.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { CaseConverter } from './case-converter';
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.VITE_APP_DASHBOARD_SERVER_URL,
+  baseURL: import.meta.env.VITE_APP_DASHBOARD_API_URL,
 });
 
 axiosInstance.interceptors.request.use(
diff --git a/packages/apps/staking/src/utils/string.ts b/packages/apps/staking/src/utils/string.ts
index 319d9b45b5..c9e402d27c 100644
--- a/packages/apps/staking/src/utils/string.ts
+++ b/packages/apps/staking/src/utils/string.ts
@@ -4,11 +4,11 @@ export const parseErrorMessage = (error: any) => {
     return error;
   }
 
-  if (error.response) {
+  if (error?.response) {
     return error.response?.data?.message ?? 'Something went wrong.';
   }
 
-  if (error.message) {
+  if (error?.message) {
     const match = error.message.match(/Contract execution error: (.+)/);
     if (match && match[1]) {
       return match[1].trim();
diff --git a/packages/apps/staking/vercel.json b/packages/apps/staking/vercel.json
new file mode 100644
index 0000000000..d48a2865b8
--- /dev/null
+++ b/packages/apps/staking/vercel.json
@@ -0,0 +1,9 @@
+{
+    "rewrites": [
+      {
+        "source": "/(.*)",
+        "destination": "/index.html"
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/packages/core/README.md b/packages/core/README.md
index a206adfe1d..0ff2c114ad 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -157,10 +157,10 @@ KVStore is the simple key-value store.
 
 ### Deploy contracts with proxy to a live network
 
-1. Create a .env file in the root folder of core package, with the following variables(this is an example for Polygon Mumbai, for other networks `check hardhat.config.ts`):
+1. Create a .env file in the root folder of core package, with the following variables(this is an example for Polygon Amoy, for other networks `check hardhat.config.ts`):
 
 ```bash
-ETH_POLYGON_MUMBAI_URL=
+ETH_POLYGON_AMOY_URL=
 PRIVATE_KEY=
 HMT_ADDRESS=
 POLYGONSCAN_API_KEY=
@@ -184,11 +184,11 @@ npx hardhat verify --network [NETWORK_NAME] [CONTRACT_ADDRESS]
 
 ### Upgrade contracts with proxy
 
-1. Create a .env file in the root folder of core package, with the following variables(this is an example to update EscrowFactory on Polygon Mumbai, if you want to upgrade
+1. Create a .env file in the root folder of core package, with the following variables(this is an example to update EscrowFactory on Polygon Amoy, if you want to upgrade
    more proxies you need to add the corresponding addresses. Also, for other networks `check hardhat.config.ts`):
 
 ```bash
-ETH_POLYGON_MUMBAI_URL=
+ETH_POLYGON_AMOY_URL=
 PRIVATE_KEY=
 POLYGONSCAN_API_KEY=
 ESCROW_FACTORY_ADDRESS=
diff --git a/packages/core/package.json b/packages/core/package.json
index c3eb589907..b1ba24d4ab 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -65,7 +65,7 @@
     "@types/chai": "^4.3.3",
     "@types/mocha": "^10.0.8",
     "chai": "^4.5.0",
-    "hardhat": "^2.22.10",
+    "hardhat": "^2.22.18",
     "hardhat-abi-exporter": "^2.10.1",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-dependency-compiler": "^1.2.1",
diff --git a/packages/examples/cvat/exchange-oracle/src/services/cloud/types.py b/packages/examples/cvat/exchange-oracle/src/services/cloud/types.py
index 211fca4ef1..3286fa540b 100644
--- a/packages/examples/cvat/exchange-oracle/src/services/cloud/types.py
+++ b/packages/examples/cvat/exchange-oracle/src/services/cloud/types.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import re
 from dataclasses import asdict, dataclass, is_dataclass
 from enum import Enum, auto
 from inspect import isclass
@@ -111,7 +112,9 @@ def from_url(cls, url: str) -> BucketAccessInfo:
                 path=parsed_url.path.lstrip("/"),
             )
         elif Config.features.enable_custom_cloud_host:
-            if is_ipv4(parsed_url.netloc):
+            # Check if netloc is an ip address
+            # or localhost with port (or its /etc/hosts aliast, e.g. minio:9000)
+            if is_ipv4(parsed_url.netloc) or re.fullmatch(r"\w+:\d{4}", parsed_url.netloc):
                 host = parsed_url.netloc
                 bucket_name, path = parsed_url.path.lstrip("/").split("/", maxsplit=1)
             else:
diff --git a/packages/examples/cvat/recording-oracle/alembic/versions/1e89224ad721_add_gt_labels_in_gt_stats.py b/packages/examples/cvat/recording-oracle/alembic/versions/1e89224ad721_add_gt_labels_in_gt_stats.py
index 3b8351099f..abd4f3576c 100644
--- a/packages/examples/cvat/recording-oracle/alembic/versions/1e89224ad721_add_gt_labels_in_gt_stats.py
+++ b/packages/examples/cvat/recording-oracle/alembic/versions/1e89224ad721_add_gt_labels_in_gt_stats.py
@@ -20,7 +20,7 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column(
-        "gt_stats", sa.Column("label_set", sa.String(), nullable=False, server_default="")
+        "gt_stats", sa.Column("label_set", sa.String(), nullable=False, server_default="[]")
     )
     # ### end Alembic commands ###
 
diff --git a/packages/examples/cvat/recording-oracle/src/core/config.py b/packages/examples/cvat/recording-oracle/src/core/config.py
index 11b9c6e8bf..fa262b8b0b 100644
--- a/packages/examples/cvat/recording-oracle/src/core/config.py
+++ b/packages/examples/cvat/recording-oracle/src/core/config.py
@@ -104,6 +104,7 @@ class IStorageConfig:
     data_bucket_name: ClassVar[str]
     secure: ClassVar[bool]
     endpoint_url: ClassVar[str]  # TODO: probably should be optional
+    use_path_style: ClassVar[bool]
     # AWS S3 specific attributes
     access_key: ClassVar[str | None]
     secret_key: ClassVar[str | None]
@@ -120,7 +121,7 @@ def provider_endpoint_url(cls) -> str:
 
     @classmethod
     def bucket_url(cls) -> str:
-        if is_ipv4(cls.endpoint_url):
+        if is_ipv4(cls.endpoint_url) or cls.use_path_style:
             return f"{cls.get_scheme()}{cls.endpoint_url}/{cls.data_bucket_name}/"
         return f"{cls.get_scheme()}{cls.data_bucket_name}.{cls.endpoint_url}/"
 
@@ -130,6 +131,7 @@ class StorageConfig(IStorageConfig):
     endpoint_url = os.environ["STORAGE_ENDPOINT_URL"]  # TODO: probably should be optional
     data_bucket_name = os.environ["STORAGE_RESULTS_BUCKET_NAME"]
     secure = to_bool(getenv("STORAGE_USE_SSL", "true"))
+    use_path_style = to_bool(getenv("STORAGE_USE_PATH_STYLE", "false"))
 
     # AWS S3 specific attributes
     access_key = getenv("STORAGE_ACCESS_KEY")
@@ -148,6 +150,7 @@ class ExchangeOracleStorageConfig(IStorageConfig):
     data_bucket_name = os.environ["EXCHANGE_ORACLE_STORAGE_RESULTS_BUCKET_NAME"]
     results_dir_suffix = getenv("STORAGE_RESULTS_DIR_SUFFIX", "-results")
     secure = to_bool(getenv("EXCHANGE_ORACLE_STORAGE_USE_SSL", "true"))
+    use_path_style = to_bool(getenv("EXCHANGE_ORACLE_STORAGE_USE_PATH_STYLE", "false"))
     # AWS S3 specific attributes
     access_key = getenv("EXCHANGE_ORACLE_STORAGE_ACCESS_KEY")
     secret_key = getenv("EXCHANGE_ORACLE_STORAGE_SECRET_KEY")
diff --git a/packages/examples/cvat/recording-oracle/src/cvat/api_calls.py b/packages/examples/cvat/recording-oracle/src/cvat/api_calls.py
index 0d6caebf33..0b51e7986c 100644
--- a/packages/examples/cvat/recording-oracle/src/cvat/api_calls.py
+++ b/packages/examples/cvat/recording-oracle/src/cvat/api_calls.py
@@ -161,8 +161,7 @@ def get_task_validation_layout(task_id: int) -> models.TaskValidationLayoutRead:
 def update_task_validation_layout(
     task_id: int,
     *,
-    disabled_frames: list[int],
-    honeypot_real_frames: list[int] | None,
+    honeypot_real_frames: list[int],
 ) -> None:
     logger = logging.getLogger("app")
 
@@ -171,15 +170,8 @@ def update_task_validation_layout(
             validation_layout, _ = api_client.tasks_api.partial_update_validation_layout(
                 task_id,
                 patched_task_validation_layout_write_request=models.PatchedTaskValidationLayoutWriteRequest(
-                    disabled_frames=disabled_frames,
-                    **(
-                        {
-                            "honeypot_real_frames": honeypot_real_frames,
-                            "frame_selection_method": models.FrameSelectionMethod("manual"),
-                        }
-                        if honeypot_real_frames
-                        else {}
-                    ),
+                    honeypot_real_frames=honeypot_real_frames,
+                    frame_selection_method=models.FrameSelectionMethod("manual"),
                 ),
             )
         except exceptions.ApiException as ex:
diff --git a/packages/examples/cvat/recording-oracle/src/handlers/process_intermediate_results.py b/packages/examples/cvat/recording-oracle/src/handlers/process_intermediate_results.py
index 475c3d7e0d..191d2d6966 100644
--- a/packages/examples/cvat/recording-oracle/src/handlers/process_intermediate_results.py
+++ b/packages/examples/cvat/recording-oracle/src/handlers/process_intermediate_results.py
@@ -418,7 +418,7 @@ def __init__(
         self.rng = rng
 
     @cached_property
-    def _get_gt_frame_uses(self) -> dict[GtKey, int]:
+    def _gt_frame_uses(self) -> dict[GtKey, int]:
         return {gt_key: gt_stat.total_uses for gt_key, gt_stat in self.gt_stats.items()}
 
     def _select_random_least_used(
@@ -598,7 +598,7 @@ def update_honeypots(self) -> _HoneypotUpdateResult:
 
         self._check_warmup_annotation_speed()
 
-        gt_frame_uses = self._get_gt_frame_uses
+        gt_frame_uses = self._gt_frame_uses
 
         tasks_with_rejected_jobs = grouped(
             rejected_jobs, key=lambda jid: self._job_annotation_meta_by_job_id[jid].task_id
@@ -619,7 +619,7 @@ def update_honeypots(self) -> _HoneypotUpdateResult:
                     f"Validation for escrow_address={self.task.escrow_address}: "
                     f"Too many validation frames excluded in the task {cvat_task_id} "
                     f"(required: {Config.validation.min_available_gt_threshold * 100:.4f}%, "
-                    f"left: {(len(task_available_gt_keys) / len(task_gt_keys)):.4f}%), "
+                    f"left: {(len(task_available_gt_keys) / len(task_gt_keys) * 100):.4f}%), "
                     "stopping annotation"
                 )
                 return _HoneypotUpdateResult(
@@ -658,12 +658,6 @@ def update_honeypots(self) -> _HoneypotUpdateResult:
                 if task_validation_frame_to_gt_key[validation_frame] in task_available_gt_keys
             ]
 
-            task_updated_disabled_frames = [
-                validation_frame
-                for validation_frame in task_validation_layout.validation_frames
-                if validation_frame not in task_available_validation_frames
-            ]
-
             task_honeypot_to_index: dict[int, int] = {
                 honeypot: i for i, honeypot in enumerate(task_validation_layout.honeypot_frames)
             }  # honeypot -> honeypot list index
@@ -697,9 +691,11 @@ def update_honeypots(self) -> _HoneypotUpdateResult:
                     }
                 ) == len(job_honeypots)
 
+            # Don't use disabled frames to avoid request fails because of
+            # the already accepted jobs with (possibly newly) excluded frames.
+            # The updated honeypots will include unmodified jobs as well.
             cvat_api.update_task_validation_layout(
                 cvat_task_id,
-                disabled_frames=task_updated_disabled_frames,
                 honeypot_real_frames=task_updated_honeypot_real_frames,
             )
 
@@ -812,7 +808,7 @@ def process_intermediate_results(  # noqa: PLR0912
 
         db_service.update_gt_stats(session, task.id, gt_stats)
 
-    job_final_result_ids: dict[int, str] = {}
+    job_final_result_ids: dict[str, str] = {}
 
     for job_meta in meta.jobs:
         job = db_service.get_job_by_cvat_id(session, job_meta.job_id)
@@ -904,6 +900,14 @@ def process_intermediate_results(  # noqa: PLR0912
         ],
     )
 
+    # Include final results for all jobs
+    job_results: _JobResults = {
+        job.cvat_id: task_validation_results[
+            validation_result_id_to_meta_id[job_final_result_ids[job.id]]
+        ].annotation_quality
+        for job in task_jobs
+    }
+
     return ValidationSuccess(
         job_results=job_results,
         validation_meta=validation_meta,
diff --git a/packages/examples/cvat/recording-oracle/src/handlers/validation.py b/packages/examples/cvat/recording-oracle/src/handlers/validation.py
index e899c15dc5..3f8ca5f45a 100644
--- a/packages/examples/cvat/recording-oracle/src/handlers/validation.py
+++ b/packages/examples/cvat/recording-oracle/src/handlers/validation.py
@@ -124,7 +124,7 @@ def _handle_validation_result(self, validation_result: ValidationResult):
         if isinstance(validation_result, ValidationSuccess):
             logger.info(
                 f"Validation for escrow_address={escrow_address}: successful, "
-                f"average annotation quality is {validation_result.average_quality:.2f}"
+                f"average annotation quality is {validation_result.average_quality * 100:.2f}%"
             )
 
             recor_merged_annotations_path = self._compose_validation_results_bucket_filename(
diff --git a/packages/examples/cvat/recording-oracle/tests/integration/services/test_validation_service.py b/packages/examples/cvat/recording-oracle/tests/integration/services/test_validation_service.py
index c203c08bc1..37750be364 100644
--- a/packages/examples/cvat/recording-oracle/tests/integration/services/test_validation_service.py
+++ b/packages/examples/cvat/recording-oracle/tests/integration/services/test_validation_service.py
@@ -477,20 +477,20 @@ def patched_prepare_merged_dataset(self):
             assert {j.job_id for j in annotation_meta.jobs} == set(vr.rejected_jobs)
 
             assert mock_update_task_validation_layout.call_count == 1
+            assert mock_update_task_validation_layout.call_args.args == (cvat_task_id,)
+            assert len(mock_update_task_validation_layout.call_args.kwargs) == 1
 
-            updated_disabled_frames = mock_update_task_validation_layout.call_args.kwargs[
-                "disabled_frames"
+            updated_honeypot_real_frames = mock_update_task_validation_layout.call_args.kwargs[
+                "honeypot_real_frames"
             ]
-            assert all(v in task_validation_frames for v in updated_disabled_frames)
-            assert {
+
+            assert all(f in task_validation_frames for f in updated_honeypot_real_frames)
+
+            excluded_validation_frames = {
                 f
                 for f, c in Counter(task_honeypot_real_frames).items()
                 if c == max_validation_frame_uses
-            } == set(updated_disabled_frames), Counter(task_honeypot_real_frames)
-
-            updated_honeypot_real_frames = mock_update_task_validation_layout.call_args.kwargs[
-                "honeypot_real_frames"
-            ]
+            }
 
             for job_start, job_stop in job_frame_ranges:
                 job_honeypot_positions = [
@@ -504,7 +504,7 @@ def patched_prepare_merged_dataset(self):
                 assert sorted(job_updated_honeypots) == sorted(set(job_updated_honeypots))
 
                 # Check that the new frames are not from the excluded set
-                assert set(job_updated_honeypots).isdisjoint(updated_disabled_frames)
+                assert set(job_updated_honeypots).isdisjoint(excluded_validation_frames)
 
     def _get_job_frame_ranges(self, jobs: Sequence[Sequence[str]]) -> list[tuple[int, int]]:
         job_frame_ranges = []
@@ -902,9 +902,11 @@ def patched_get_jobs_quality_reports(task_id: int):
             assert len(mock_update_task_validation_layout.mock_calls) == 2
             for call in mock_update_task_validation_layout.mock_calls:
                 if call.args[0] == cvat_task_id1:
-                    assert call.kwargs["disabled_frames"] == [2]
+                    assert "disabled_frames" not in call.kwargs
+                    assert 2 not in call.kwargs["honeypot_real_frames"]
                 elif call.args[0] == cvat_task_id2:
-                    assert call.kwargs["disabled_frames"] == [3]
+                    assert "disabled_frames" not in call.kwargs
+                    assert 3 not in call.kwargs["honeypot_real_frames"]
                 else:
                     raise AssertionError
 
@@ -922,7 +924,7 @@ def patched_get_jobs_quality_reports(task_id: int):
                 GtKey(filename="frame_5.jpg", labels=["label_0_node_1"]): (0, 0, 1),
             }
 
-    def test_can_complete_if_not_enough_gt_left_in_task(
+    def test_can_complete_if_not_enough_gt_left_in_task_with_several_jobs(
         self, session: Session, caplog: pytest.LogCaptureFixture
     ):
         escrow_address = ESCROW_ADDRESS
@@ -1059,7 +1061,7 @@ def patched_get_jobs_quality_reports(task_id: int):
                     mock.Mock(
                         cvat_api.models.IQualityReport,
                         job_id=task_id,
-                        summary=mock.Mock(accuracy=1),
+                        summary=mock.Mock(accuracy=1 / 3 if task_id == cvat_task_id1 else 1),
                     ),
                 ]
 
@@ -1100,7 +1102,7 @@ def patched_get_jobs_quality_reports(task_id: int):
 
             mock_update_task_validation_layout.assert_not_called()
 
-    def test_can_complete_if_not_enough_gt_left_in_task(
+    def test_can_complete_if_not_enough_gt_left_in_task_with_one_job(
         self, session: Session, caplog: pytest.LogCaptureFixture
     ):
         escrow_address = ESCROW_ADDRESS
diff --git a/packages/sdk/python/human-protocol-sdk/docs/conf.py b/packages/sdk/python/human-protocol-sdk/docs/conf.py
index 2cd74782ba..78bde18085 100644
--- a/packages/sdk/python/human-protocol-sdk/docs/conf.py
+++ b/packages/sdk/python/human-protocol-sdk/docs/conf.py
@@ -23,8 +23,8 @@ def setup(app):
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "human_protocol_sdk"
-copyright = "2023, Author"
-author = "Author"
+copyright = "2025, HUMAN Protocol"
+author = "HUMAN Protocol"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/packages/sdk/python/human-protocol-sdk/docs/human_protocol_sdk.rst b/packages/sdk/python/human-protocol-sdk/docs/human_protocol_sdk.rst
index dcdedf3d91..1e3d3d47bb 100644
--- a/packages/sdk/python/human-protocol-sdk/docs/human_protocol_sdk.rst
+++ b/packages/sdk/python/human-protocol-sdk/docs/human_protocol_sdk.rst
@@ -16,7 +16,6 @@ Subpackages
    human_protocol_sdk.encryption
    human_protocol_sdk.escrow
    human_protocol_sdk.kvstore
-   human_protocol_sdk.kvstore.kvstore_utils
    human_protocol_sdk.operator
    human_protocol_sdk.staking
    human_protocol_sdk.statistics
diff --git a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
index e5d6d405d5..9febaee002 100644
--- a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
+++ b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
@@ -6,22 +6,11 @@ class ChainId(Enum):
     """Enum for chain IDs."""
 
     MAINNET = 1
-    RINKEBY = 4
-    GOERLI = 5
     SEPOLIA = 11155111
     BSC_MAINNET = 56
     BSC_TESTNET = 97
     POLYGON = 137
-    POLYGON_MUMBAI = 80001
     POLYGON_AMOY = 80002
-    MOONBEAM = 1284
-    MOONBASE_ALPHA = 1287
-    AVALANCHE_TESTNET = 43113
-    AVALANCHE = 43114
-    CELO = 42220
-    CELO_ALFAJORES = 44787
-    XLAYER_TESTNET = 195
-    XLAYER = 196
     LOCALHOST = 1338
 
 
@@ -32,6 +21,13 @@ class OrderDirection(Enum):
     DESC = "desc"
 
 
+class LeaderCategory(Enum):
+    """Enum for leader categories"""
+
+    MACHINE_LEARNING = "machine_learning"
+    MARKET_MAKING = "market_making"
+
+
 NETWORKS = {
     ChainId.MAINNET: {
         "title": "Ethereum",
@@ -40,7 +36,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/ethereum/version/latest"
         ),
         "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNTdYHpQLW4sbrCxihXNdQwhxa2zdyu1yPkCUuTbqESba"
+            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmc8ikCj9y2uvYGTeELkM9wybPdcD2PgpW4tjJMwnogLrq"
         ),
         "hmt_address": "0xd1ba9BAC957322D6e8c07a160a3A8dA11A0d2867",
         "factory_address": "0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a",
@@ -49,22 +45,6 @@ class OrderDirection(Enum):
         "old_subgraph_url": "",
         "old_factory_address": "",
     },
-    ChainId.GOERLI: {
-        "title": "Ethereum Goerli",
-        "scan_url": "https://goerli.etherscan.io",
-        "subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/goerli-v2"
-        ),
-        "subgraph_url_api_key": "",
-        "hmt_address": "0xd3A31D57FDD790725d0F6B78095F62E8CD4ab317",
-        "factory_address": "0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c",
-        "staking_address": "0xf46B45Df3d956369726d8Bd93Ba33963Ab692920",
-        "kvstore_address": "0x19Fc3e859C1813ac9427a7a78BeB9ae102CE96d3",
-        "old_subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/goerli"
-        ),
-        "old_factory_address": "0xaAe6a2646C1F88763E62e0cD08aD050Ea66AC46F",
-    },
     ChainId.SEPOLIA: {
         "title": "Sepolia",
         "scan_url": "https://sepolia.etherscan.io",
@@ -72,7 +52,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/sepolia/version/latest"
         ),
         "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXVFVCLm2XxupxdKgnLRzvmkPJnpRbcoe4RNXoTqSRHsg"
+            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmfB1oqYCMTKZB2vcYJzQmGGvVS8cMCHohpYbjKFWoFo8z"
         ),
         "hmt_address": "0x792abbcC99c01dbDec49c9fa9A828a186Da45C33",
         "factory_address": "0x5987A5558d961ee674efe4A8c8eB7B1b5495D3bf",
@@ -88,7 +68,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/bsc/version/latest"
         ),
         "subgraph_url_api_key": (
-            "hthttps://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmPMS6G5evLm5ZpbnmpCfUy8bHJPwzPkZTv9DgfNdFfrCM"
+            "hthttps://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmPEaCSuzbVHDrGEWTS7T4N8U7kBMMMfkj4b4ZeqheVuMc"
         ),
         "hmt_address": "0x711Fd6ab6d65A98904522d4e3586F492B989c527",
         "factory_address": "0x92FD968AcBd521c232f5fB8c33b342923cC72714",
@@ -104,7 +84,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/bsc-testnet/version/latest"
         ),
         "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmW6JqXvhDnhRVHU6ixKVSD65U1GKWUf3xwJo8E6mTBsAu"
+            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmbp8jzcYurrKdk1Mg5ycJ8jcxwou3wWsmNcRdAc16aQEt"
         ),
         "hmt_address": "0xE3D74BBFa45B4bCa69FF28891fBE392f4B4d4e4d",
         "factory_address": "0x2bfA592DBDaF434DDcbb893B1916120d181DAD18",
@@ -122,7 +102,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/polygon/version/latest"
         ),
         "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmTyCQMQd5QtogeTEuiqxnGQZa2PtgpUBsWLYwPCCFPbUe"
+            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmeSoEuFieiKXtqzDY3WUBz5gKFWwYVPP7iaebpBpJyo7Y"
         ),
         "hmt_address": "0xc748B2A084F8eFc47E086ccdDD9b7e67aEb571BF",
         "factory_address": "0xBDBfD2cC708199C5640C6ECdf3B0F4A4C67AdfcB",
@@ -133,22 +113,6 @@ class OrderDirection(Enum):
         ),
         "old_factory_address": "0x45eBc3eAE6DA485097054ae10BA1A0f8e8c7f794",
     },
-    ChainId.POLYGON_MUMBAI: {
-        "title": "Polygon Mumbai",
-        "scan_url": "https://mumbai.polygonscan.com",
-        "subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/mumbai-v2"
-        ),
-        "subgraph_url_api_key": "",
-        "hmt_address": "0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4",
-        "factory_address": "0xA8D927C4DA17A6b71675d2D49dFda4E9eBE58f2d",
-        "staking_address": "0x7Fd3dF914E7b6Bd96B4c744Df32183b51368Bfac",
-        "kvstore_address": "0xD96158c7267Ea658a4688F4aEf1c85659851625d",
-        "old_subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/mumbai"
-        ),
-        "old_factory_address": "0x558cd800f9F0B02f3B149667bDe003284c867E94",
-    },
     ChainId.POLYGON_AMOY: {
         "title": "Polygon Amoy",
         "scan_url": "https://amoy.polygonscan.com",
@@ -156,7 +120,7 @@ class OrderDirection(Enum):
             "https://api.studio.thegraph.com/query/74256/amoy/version/latest"
         ),
         "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmawobiPUYsGNK9chtb5PvicUtaa8Jsjpwvv8dNyMVXQ9r"
+            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmQUUv8SK2skarDrJpB8LXXqMwjzxg3Z42dx12uEL5Pmeq"
         ),
         "hmt_address": "0x792abbcC99c01dbDec49c9fa9A828a186Da45C33",
         "factory_address": "0xAFf5a986A530ff839d49325A5dF69F96627E8D29",
@@ -165,140 +129,6 @@ class OrderDirection(Enum):
         "old_subgraph_url": "",
         "old_factory_address": "",
     },
-    ChainId.MOONBEAM: {
-        "title": "Moonbeam",
-        "scan_url": "https://moonbeam.moonscan.io",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/moonbeam/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYe9hsFYuVgQsH719AsqRNqgVM8YBYfCuhBNYjXtBqQru"
-        ),
-        "hmt_address": "0x3b25BC1dC591D24d60560d0135D6750A561D4764",
-        "factory_address": "0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a",
-        "staking_address": "0x05398211bA2046E296fBc9a9D3EB49e3F15C3123",
-        "kvstore_address": "0x2B95bEcb6EBC4589f64CB000dFCF716b4aeF8aA6",
-        "old_subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/moonbeam"
-        ),
-        "old_factory_address": "0x98108c28B7767a52BE38B4860832dd4e11A7ecad",
-    },
-    ChainId.MOONBASE_ALPHA: {
-        "title": "Moonbase Alpha",
-        "scan_url": "https://moonbase.moonscan.io/",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/moonbase-alpha/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmSDPbm5xxMvYVSJzHFVsRiMekvJVYSJ7UfZw17DhPMdaH"
-        ),
-        "hmt_address": "0x2dd72db2bBA65cE663e476bA8b84A1aAF802A8e3",
-        "factory_address": "0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed",
-        "staking_address": "0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940",
-        "kvstore_address": "0xcC561f4482f4Ff051D2Dcc65c2cE1A0f291bbA46",
-        "old_subgraph_url": "",
-        "old_factory_address": "",
-    },
-    ChainId.AVALANCHE: {
-        "title": "Avalanche C-Chain Mainnet",
-        "scan_url": "https://snowtrace.io",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/avalanche/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYR8NUuAQVoGmGSwKanUJLjX9iZxrEyGH39HjUuXLmsum"
-        ),
-        "hmt_address": "0x12365293cb6477d4fc2686e46BB97E3Fb64f1550",
-        "factory_address": "0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a",
-        "staking_address": "0x05398211bA2046E296fBc9a9D3EB49e3F15C3123",
-        "kvstore_address": "0x9Bc7bff35B2Be2413708d48c3B0aEF5c43646728",
-        "old_subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/avalanche"
-        ),
-        "old_factory_address": "0x9767a578ba7a5FA1563c8229943cB01cd8446BB4",
-    },
-    ChainId.AVALANCHE_TESTNET: {
-        "title": "Fuji C-Chain",
-        "scan_url": "https://testnet.snowtrace.io",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/fuji/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYXwNPwC5DcitK1SLVUR6gPANmEn3UsVvGeTbjCv1tTb2"
-        ),
-        "hmt_address": "0x9406d5c635AD22b0d76c75E52De57A2177919ca3",
-        "factory_address": "0x56C2ba540726ED4f46E7a134b6b9Ee9C867FcF92",
-        "staking_address": "0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940",
-        "kvstore_address": "0x3aD4B091E054f192a822D1406f4535eAd38580e4",
-        "old_subgraph_url": (
-            "https://api.thegraph.com/subgraphs/name/humanprotocol/fuji"
-        ),
-        "old_factory_address": "0xfb4469201951C3B9a7F1996c477cb7BDBEcE0A88",
-    },
-    ChainId.CELO: {
-        "title": "Celo",
-        "scan_url": "https://celoscan.io/",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/celo/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmeeb5zshw1z9Q38NNPun2Pd7P951Mkzz5ywK171tauNRY"
-        ),
-        "hmt_address": "0x19Ead835951493A763c96910255d5eeF147E914F",
-        "factory_address": "0xc90B43a5d576D9d8026c48904dfbaED50C15Fa08",
-        "staking_address": "0x34cD3Bd6B16c559f321799b516dE61E12017fFd1",
-        "kvstore_address": "0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569",
-        "old_subgraph_url": "",
-        "old_factory_address": "",
-    },
-    ChainId.CELO_ALFAJORES: {
-        "title": "Celo",
-        "scan_url": "https://alfajores.celoscan.io/",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/celo-alfajores/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmb2WKCFFhT7REAjTuMd9pZvGw7rRpzeZSPJ3KRztD2pMM"
-        ),
-        "hmt_address": "0x2736B33455A872dC478E1E004106D04c35472468",
-        "factory_address": "0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569",
-        "staking_address": "0x003548Df34be8836cF0F9673403a1E40ba449a0F",
-        "kvstore_address": "0x938335006ea6F9Eb0e8020969cFF94404425e298",
-        "old_subgraph_url": "",
-        "old_factory_address": "",
-    },
-    ChainId.XLAYER: {
-        "title": "XLayer",
-        "scan_url": "https://www.oklink.com/xlayer",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/xlayer/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmWTggMrB5sRSs2fePuqQG9WbLMk8HtnfLH3VbRhmVdF8s"
-        ),
-        "hmt_address": "0x10acbe3b9e6a2ff7f341e5cbf4b6617741ff44aa",
-        "factory_address": "0x4949C9DFFD83F0D5Ab0AB24C57C4D403D5c20C15",
-        "staking_address": "0x01D115E9E8bF0C58318793624CC662a030D07F1D",
-        "kvstore_address": "0x6512d894cc3d3FE93Da9d0420430136fA889FaB9",
-        "old_subgraph_url": "",
-        "old_factory_address": "",
-    },
-    ChainId.XLAYER_TESTNET: {
-        "title": "X Layer Testnet",
-        "scan_url": "https://www.oklink.com/oktc-test",
-        "subgraph_url": (
-            "https://api.studio.thegraph.com/query/74256/xlayer-testnet/version/latest"
-        ),
-        "subgraph_url_api_key": (
-            "https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNoRyqZtJTRrkbKAmWMZQUHuah7YSs8U9R3nzPu8WEhtY"
-        ),
-        "hmt_address": "0x792abbcC99c01dbDec49c9fa9A828a186Da45C33",
-        "factory_address": "0x6Cd3ecAD36ee88E9ef3665CF381D9dAE0FE0a32e",
-        "staking_address": "0xeF9849a904dF0d494D69ac0B0a6860a3A7936114",
-        "kvstore_address": "0xdE8BE9E3C12E9F546309A429cd88d026a25EaF8C",
-        "old_subgraph_url": "",
-        "old_factory_address": "",
-    },
     ChainId.LOCALHOST: {
         "title": "Localhost",
         "scan_url": "",
@@ -331,7 +161,6 @@ class Status(Enum):
 class Role(Enum):
     """Enum for roles."""
 
-    validator = "Validator"
     job_launcher = "Job Launcher"
     exchange_oracle = "Exchange Oracle"
     reputation_oracle = "Reputation Oracle"
@@ -344,14 +173,18 @@ class Role(Enum):
 class KVStoreKeys(Enum):
     """Enum for KVStore keys"""
 
-    role = "role"
+    category = "category"
     fee = "fee"
-    public_key = "public_key"
-    webhook_url = "webhook_url"
-    url = "url"
     job_types = "job_types"
-    registration_needed = "registration_needed"
+    name = "name"
+    public_key = "public_key"
+    public_key_hash = "public_key_hash"
     registration_instructions = "registration_instructions"
+    registration_needed = "registration_needed"
+    role = "role"
+    url = "url"
+    website = "website"
+    webhook_url = "webhook_url"
 
 
 ESCROW_BULK_PAYOUT_MAX_ITEMS = 99
diff --git a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/gql/operator.py b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/gql/operator.py
index 5a683eec62..fd6c3a29c4 100644
--- a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/gql/operator.py
+++ b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/gql/operator.py
@@ -25,6 +25,8 @@
     reputationNetworks {
       address
     }
+    name
+    category
 }
 """
 
diff --git a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/operator/operator_utils.py b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/operator/operator_utils.py
index 23d5dabe21..f64c81bad5 100644
--- a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/operator/operator_utils.py
+++ b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/operator/operator_utils.py
@@ -106,6 +106,8 @@ def __init__(
         registration_needed: Optional[bool] = None,
         registration_instructions: Optional[str] = None,
         reputation_networks: Optional[List[str]] = None,
+        name: Optional[str] = None,
+        category: Optional[str] = None,
     ):
         """
         Initializes a LeaderData instance.
@@ -130,6 +132,8 @@ def __init__(
         :param registration_needed: Whether registration is needed
         :param registration_instructions: Registration instructions
         :param reputation_networks: List of reputation networks
+        :param name: Name
+        :param category: Category
         """
 
         self.chain_id = chain_id
@@ -152,6 +156,8 @@ def __init__(
         self.registration_needed = registration_needed
         self.registration_instructions = registration_instructions
         self.reputation_networks = reputation_networks
+        self.name = name
+        self.category = category
 
 
 class RewardData:
@@ -305,6 +311,8 @@ def get_leaders(filter: LeaderFilter) -> List[LeaderData]:
                         "registrationInstructions", None
                     ),
                     reputation_networks=reputation_networks,
+                    name=leader.get("name", None),
+                    category=leader.get("category", None),
                 )
             )
 
@@ -405,6 +413,8 @@ def get_leader(
             registration_needed=leader.get("registrationNeeded", None),
             registration_instructions=leader.get("registrationInstructions", None),
             reputation_networks=reputation_networks,
+            name=leader.get("name", None),
+            category=leader.get("category", None),
         )
 
     @staticmethod
diff --git a/packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/operator/test_operator_utils.py b/packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/operator/test_operator_utils.py
index 162acc1fbe..01b3e01f12 100644
--- a/packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/operator/test_operator_utils.py
+++ b/packages/sdk/python/human-protocol-sdk/test/human_protocol_sdk/operator/test_operator_utils.py
@@ -44,6 +44,8 @@ def test_get_leaders(self):
                                 "registrationNeeded": True,
                                 "registrationInstructions": "www.google.com",
                                 "reputationNetworks": [{"address": "0x01"}],
+                                "name": "Alice",
+                                "category": "machine_learning",
                             }
                         ],
                     }
@@ -85,6 +87,8 @@ def test_get_leaders(self):
             self.assertEqual(leaders[0].registration_needed, True)
             self.assertEqual(leaders[0].registration_instructions, "www.google.com")
             self.assertEqual(leaders[0].reputation_networks, ["0x01"])
+            self.assertEqual(leaders[0].name, "Alice")
+            self.assertEqual(leaders[0].category, "machine_learning")
 
     def test_get_leaders_when_job_types_is_none(self):
         filter = LeaderFilter(chain_id=ChainId.POLYGON, roles=[Role.exchange_oracle])
@@ -115,6 +119,8 @@ def test_get_leaders_when_job_types_is_none(self):
                                 "url": None,
                                 "jobTypes": None,
                                 "reputationNetworks": [{"address": "0x01"}],
+                                "name": "Alice",
+                                "category": "machine_learning",
                             }
                         ],
                     }
@@ -156,6 +162,8 @@ def test_get_leaders_when_job_types_is_none(self):
             self.assertEqual(leaders[0].registration_instructions, None)
             self.assertEqual(leaders[0].job_types, [])
             self.assertEqual(leaders[0].reputation_networks, ["0x01"])
+            self.assertEqual(leaders[0].name, "Alice")
+            self.assertEqual(leaders[0].category, "machine_learning")
 
     def test_get_leaders_when_job_types_is_array(self):
         filter = LeaderFilter(chain_id=ChainId.POLYGON, roles=[Role.exchange_oracle])
@@ -186,6 +194,8 @@ def test_get_leaders_when_job_types_is_array(self):
                                 "url": None,
                                 "jobTypes": ["type1", "type2", "type3"],
                                 "reputationNetworks": [{"address": "0x01"}],
+                                "name": "Alice",
+                                "category": "machine_learning",
                             }
                         ],
                     }
@@ -227,6 +237,8 @@ def test_get_leaders_when_job_types_is_array(self):
                 leaders[0].job_types, ["type1", "type2", "type3"]
             )  # Should the same array
             self.assertEqual(leaders[0].reputation_networks, ["0x01"])
+            self.assertEqual(leaders[0].name, "Alice")
+            self.assertEqual(leaders[0].category, "machine_learning")
 
     def test_get_leaders_empty_data(self):
         filter = LeaderFilter(chain_id=ChainId.POLYGON, roles=[Role.exchange_oracle])
@@ -291,6 +303,8 @@ def test_get_leader(self):
                             "registrationNeeded": True,
                             "registrationInstructions": "www.google.com",
                             "reputationNetworks": [{"address": "0x01"}],
+                            "name": "Alice",
+                            "category": "machine_learning",
                         }
                     }
                 }
@@ -324,6 +338,8 @@ def test_get_leader(self):
             self.assertEqual(leader.registration_needed, True)
             self.assertEqual(leader.registration_instructions, "www.google.com")
             self.assertEqual(leader.reputation_networks, ["0x01"])
+            self.assertEqual(leader.name, "Alice")
+            self.assertEqual(leader.category, "machine_learning")
 
     def test_get_leader_when_job_types_is_none(self):
         staker_address = "0x1234567890123456789012345678901234567891"
@@ -354,6 +370,8 @@ def test_get_leader_when_job_types_is_none(self):
                             "url": None,
                             "jobTypes": None,
                             "reputationNetworks": [{"address": "0x01"}],
+                            "name": "Alice",
+                            "category": "machine_learning",
                         }
                     }
                 }
@@ -387,6 +405,8 @@ def test_get_leader_when_job_types_is_none(self):
             self.assertEqual(leader.registration_needed, None)
             self.assertEqual(leader.registration_instructions, None)
             self.assertEqual(leader.reputation_networks, ["0x01"])
+            self.assertEqual(leader.name, "Alice")
+            self.assertEqual(leader.category, "machine_learning")
 
     def test_get_leader_when_job_types_is_array(self):
         staker_address = "0x1234567890123456789012345678901234567891"
@@ -417,6 +437,8 @@ def test_get_leader_when_job_types_is_array(self):
                             "url": None,
                             "jobTypes": ["type1", "type2", "type3"],
                             "reputationNetworks": [{"address": "0x01"}],
+                            "name": "Alice",
+                            "category": "machine_learning",
                         }
                     }
                 }
@@ -448,6 +470,8 @@ def test_get_leader_when_job_types_is_array(self):
             self.assertEqual(leader.url, None)
             self.assertEqual(leader.job_types, ["type1", "type2", "type3"])
             self.assertEqual(leader.reputation_networks, ["0x01"])
+            self.assertEqual(leader.name, "Alice")
+            self.assertEqual(leader.category, "machine_learning")
 
     def test_get_leader_empty_data(self):
         staker_address = "0x1234567890123456789012345678901234567891"
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
index b783a6b030..79737b77fd 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
@@ -36,38 +36,10 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/ethereum/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNTdYHpQLW4sbrCxihXNdQwhxa2zdyu1yPkCUuTbqESba',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmc8ikCj9y2uvYGTeELkM9wybPdcD2PgpW4tjJMwnogLrq',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
-  [ChainId.RINKEBY]: {
-    chainId: ChainId.RINKEBY,
-    title: 'Ethereum Rinkeby',
-    scanUrl: 'https://rinkeby.etherscan.io',
-    factoryAddress: '0x925B24444511c86F4d4E63141D8Be0A025E2dca4',
-    hmtAddress: '0x4dCf5ac4509888714dd43A5cCc46d7ab389D9c23',
-    stakingAddress: '',
-    kvstoreAddress: '',
-    subgraphUrl: '',
-    subgraphUrlApiKey: '',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.GOERLI]: {
-    chainId: ChainId.GOERLI,
-    title: 'Ethereum Goerli',
-    scanUrl: 'https://goerli.etherscan.io',
-    factoryAddress: '0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c',
-    hmtAddress: '0xd3A31D57FDD790725d0F6B78095F62E8CD4ab317',
-    stakingAddress: '0xf46B45Df3d956369726d8Bd93Ba33963Ab692920',
-    kvstoreAddress: '0x19Fc3e859C1813ac9427a7a78BeB9ae102CE96d3',
-    subgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/goerli-v2',
-    subgraphUrlApiKey: '',
-    oldSubgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/goerli',
-    oldFactoryAddress: '0xaAe6a2646C1F88763E62e0cD08aD050Ea66AC46F',
-  },
   [ChainId.SEPOLIA]: {
     chainId: ChainId.SEPOLIA,
     title: 'Ethereum Sepolia',
@@ -79,7 +51,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/sepolia/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmXVFVCLm2XxupxdKgnLRzvmkPJnpRbcoe4RNXoTqSRHsg',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmfB1oqYCMTKZB2vcYJzQmGGvVS8cMCHohpYbjKFWoFo8z',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -94,7 +66,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmPMS6G5evLm5ZpbnmpCfUy8bHJPwzPkZTv9DgfNdFfrCM',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmPEaCSuzbVHDrGEWTS7T4N8U7kBMMMfkj4b4ZeqheVuMc',
     oldSubgraphUrl: 'https://api.thegraph.com/subgraphs/name/humanprotocol/bsc',
     oldFactoryAddress: '0xc88bC422cAAb2ac8812de03176402dbcA09533f4',
   },
@@ -109,7 +81,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/bsc-testnet/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmW6JqXvhDnhRVHU6ixKVSD65U1GKWUf3xwJo8E6mTBsAu',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmbp8jzcYurrKdk1Mg5ycJ8jcxwou3wWsmNcRdAc16aQEt',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/bsctest',
     oldFactoryAddress: '0xaae6a2646c1f88763e62e0cd08ad050ea66ac46f',
@@ -125,26 +97,11 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmTyCQMQd5QtogeTEuiqxnGQZa2PtgpUBsWLYwPCCFPbUe',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmeSoEuFieiKXtqzDY3WUBz5gKFWwYVPP7iaebpBpJyo7Y',
     oldSubgraphUrl:
       'https://api.thegraph.com/subgraphs/name/humanprotocol/polygon',
     oldFactoryAddress: '0x45eBc3eAE6DA485097054ae10BA1A0f8e8c7f794',
   },
-  [ChainId.POLYGON_MUMBAI]: {
-    chainId: ChainId.POLYGON_MUMBAI,
-    title: 'Polygon Mumbai',
-    scanUrl: 'https://mumbai.polygonscan.com',
-    factoryAddress: '0xA8D927C4DA17A6b71675d2D49dFda4E9eBE58f2d',
-    hmtAddress: '0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4',
-    stakingAddress: '0x7Fd3dF914E7b6Bd96B4c744Df32183b51368Bfac',
-    kvstoreAddress: '0xD96158c7267Ea658a4688F4aEf1c85659851625d',
-    subgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/mumbai-v2',
-    subgraphUrlApiKey: '',
-    oldSubgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/mumbai',
-    oldFactoryAddress: '0x558cd800f9F0B02f3B149667bDe003284c867E94',
-  },
   [ChainId.POLYGON_AMOY]: {
     chainId: ChainId.POLYGON_AMOY,
     title: 'Polygon Amoy',
@@ -156,130 +113,7 @@ export const NETWORKS: {
     subgraphUrl:
       'https://api.studio.thegraph.com/query/74256/amoy/version/latest',
     subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmawobiPUYsGNK9chtb5PvicUtaa8Jsjpwvv8dNyMVXQ9r',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.MOONBEAM]: {
-    chainId: ChainId.MOONBEAM,
-    title: 'Moonbeam',
-    scanUrl: 'https://moonbeam.moonscan.io',
-    factoryAddress: '0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a',
-    hmtAddress: '0x3b25BC1dC591D24d60560d0135D6750A561D4764',
-    stakingAddress: '0x05398211bA2046E296fBc9a9D3EB49e3F15C3123',
-    kvstoreAddress: '0x2B95bEcb6EBC4589f64CB000dFCF716b4aeF8aA6',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/moonbeam/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYe9hsFYuVgQsH719AsqRNqgVM8YBYfCuhBNYjXtBqQru',
-    oldSubgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/moonbeam',
-    oldFactoryAddress: '0x98108c28B7767a52BE38B4860832dd4e11A7ecad',
-  },
-  [ChainId.MOONBASE_ALPHA]: {
-    chainId: ChainId.MOONBASE_ALPHA,
-    title: 'Moonbase Alpha',
-    scanUrl: 'https://moonbase.moonscan.io/',
-    factoryAddress: '0x5e622FF522D81aa426f082bDD95210BC25fCA7Ed',
-    hmtAddress: '0x2dd72db2bBA65cE663e476bA8b84A1aAF802A8e3',
-    stakingAddress: '0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940',
-    kvstoreAddress: '0xcC561f4482f4Ff051D2Dcc65c2cE1A0f291bbA46',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/moonbase-alpha/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmSDPbm5xxMvYVSJzHFVsRiMekvJVYSJ7UfZw17DhPMdaH',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.AVALANCHE_TESTNET]: {
-    chainId: ChainId.AVALANCHE_TESTNET,
-    title: 'Fuji C-Chain',
-    scanUrl: 'https://testnet.snowtrace.io',
-    factoryAddress: '0x56C2ba540726ED4f46E7a134b6b9Ee9C867FcF92',
-    hmtAddress: '0x9406d5c635AD22b0d76c75E52De57A2177919ca3',
-    stakingAddress: '0xbA537fEF2442cD48f60686FE1Bbbe40F964a7940',
-    kvstoreAddress: '0x3aD4B091E054f192a822D1406f4535eAd38580e4',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/fuji/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYXwNPwC5DcitK1SLVUR6gPANmEn3UsVvGeTbjCv1tTb2',
-    oldSubgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/fuji',
-    oldFactoryAddress: '0xfb4469201951C3B9a7F1996c477cb7BDBEcE0A88',
-  },
-  [ChainId.AVALANCHE]: {
-    chainId: ChainId.AVALANCHE,
-    title: 'Avalanche C-Chain Mainnet',
-    scanUrl: 'https://snowtrace.io',
-    factoryAddress: '0xD9c75a1Aa4237BB72a41E5E26bd8384f10c1f55a',
-    hmtAddress: '0x12365293cb6477d4fc2686e46BB97E3Fb64f1550',
-    stakingAddress: '0x05398211bA2046E296fBc9a9D3EB49e3F15C3123',
-    kvstoreAddress: '0x9Bc7bff35B2Be2413708d48c3B0aEF5c43646728',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/avalanche/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmYR8NUuAQVoGmGSwKanUJLjX9iZxrEyGH39HjUuXLmsum',
-    oldSubgraphUrl:
-      'https://api.thegraph.com/subgraphs/name/humanprotocol/avalanche',
-    oldFactoryAddress: '0x9767a578ba7a5FA1563c8229943cB01cd8446BB4',
-  },
-  [ChainId.CELO_ALFAJORES]: {
-    chainId: ChainId.CELO_ALFAJORES,
-    title: 'Celo Alfajores',
-    scanUrl: 'https://alfajores.celoscan.io/',
-    factoryAddress: '0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569',
-    hmtAddress: '0x2736B33455A872dC478E1E004106D04c35472468',
-    stakingAddress: '0x003548Df34be8836cF0F9673403a1E40ba449a0F',
-    kvstoreAddress: '0x938335006ea6F9Eb0e8020969cFF94404425e298',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/celo-alfajores/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmb2WKCFFhT7REAjTuMd9pZvGw7rRpzeZSPJ3KRztD2pMM',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.CELO]: {
-    chainId: ChainId.CELO,
-    title: 'Celo',
-    scanUrl: 'https://celoscan.io/',
-    factoryAddress: '0xc90B43a5d576D9d8026c48904dfbaED50C15Fa08',
-    hmtAddress: '0x19Ead835951493A763c96910255d5eeF147E914F',
-    stakingAddress: '0x34cD3Bd6B16c559f321799b516dE61E12017fFd1',
-    kvstoreAddress: '0x86Af9f6Cd34B69Db1B202223C6d6D109f2491569',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/celo/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/Qmeeb5zshw1z9Q38NNPun2Pd7P951Mkzz5ywK171tauNRY',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.XLAYER]: {
-    chainId: ChainId.XLAYER,
-    title: 'XLayer',
-    scanUrl: 'https://www.oklink.com/xlayer',
-    factoryAddress: '0x4949C9DFFD83F0D5Ab0AB24C57C4D403D5c20C15',
-    hmtAddress: '0x10acbe3b9e6a2ff7f341e5cbf4b6617741ff44aa',
-    stakingAddress: '0x01D115E9E8bF0C58318793624CC662a030D07F1D',
-    kvstoreAddress: '0x6512d894cc3d3FE93Da9d0420430136fA889FaB9',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/xlayer/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmWTggMrB5sRSs2fePuqQG9WbLMk8HtnfLH3VbRhmVdF8s',
-    oldSubgraphUrl: '',
-    oldFactoryAddress: '',
-  },
-  [ChainId.XLAYER_TESTNET]: {
-    chainId: ChainId.XLAYER_TESTNET,
-    title: 'XLayer Testnet',
-    scanUrl: 'https://www.okx.com/explorer/xlayer-test',
-    factoryAddress: '0x6Cd3ecAD36ee88E9ef3665CF381D9dAE0FE0a32e',
-    hmtAddress: '0x792abbcC99c01dbDec49c9fa9A828a186Da45C33',
-    stakingAddress: '0xeF9849a904dF0d494D69ac0B0a6860a3A7936114',
-    kvstoreAddress: '0xdE8BE9E3C12E9F546309A429cd88d026a25EaF8C',
-    subgraphUrl:
-      'https://api.studio.thegraph.com/query/74256/xlayer-testnet/version/latest',
-    subgraphUrlApiKey:
-      'https://gateway-testnet-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmNoRyqZtJTRrkbKAmWMZQUHuah7YSs8U9R3nzPu8WEhtY',
+      'https://gateway-arbitrum.network.thegraph.com/api/[SUBGRAPH_API_KEY]/deployments/id/QmQUUv8SK2skarDrJpB8LXXqMwjzxg3Z42dx12uEL5Pmeq',
     oldSubgraphUrl: '',
     oldFactoryAddress: '',
   },
@@ -302,12 +136,15 @@ export const KVStoreKeys = {
   role: 'role',
   fee: 'fee',
   publicKey: 'public_key',
+  publicKeyHash: 'public_key_hash',
   webhookUrl: 'webhook_url',
   website: 'website',
   url: 'url',
   jobTypes: 'job_types',
   registrationNeeded: 'registration_needed',
   registrationInstructions: 'registration_instructions',
+  name: 'name',
+  category: 'category',
 };
 
 export const Role = {
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/enums.ts b/packages/sdk/typescript/human-protocol-sdk/src/enums.ts
index a212aa4d23..6f71feb39e 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/enums.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/enums.ts
@@ -1,26 +1,20 @@
 export enum ChainId {
   ALL = -1,
   MAINNET = 1,
-  RINKEBY = 4,
-  GOERLI = 5,
   SEPOLIA = 11155111,
   BSC_MAINNET = 56,
   BSC_TESTNET = 97,
   POLYGON = 137,
-  POLYGON_MUMBAI = 80001,
   POLYGON_AMOY = 80002,
-  MOONBEAM = 1284,
-  MOONBASE_ALPHA = 1287,
-  AVALANCHE_TESTNET = 43113,
-  AVALANCHE = 43114,
-  CELO = 42220,
-  CELO_ALFAJORES = 44787,
-  XLAYER_TESTNET = 195,
   LOCALHOST = 1338,
-  XLAYER = 196,
 }
 
 export enum OrderDirection {
   ASC = 'asc',
   DESC = 'desc',
 }
+
+export enum LeaderCategory {
+  MACHINE_LEARNING = 'machine_learning',
+  MARKET_MAKING = 'market_making',
+}
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts b/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts
index 121f1f3e70..97d51bdfef 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts
@@ -55,7 +55,12 @@ import {
   NetworkData,
   TransactionLikeWithNonce,
 } from './types';
-import { getSubgraphUrl, isValidUrl, throwError } from './utils';
+import {
+  getSubgraphUrl,
+  getUnixTimestamp,
+  isValidUrl,
+  throwError,
+} from './utils';
 
 /**
  * ## Introduction
@@ -1578,19 +1583,11 @@ export class EscrowUtils {
    * enum ChainId {
    *   ALL = -1,
    *   MAINNET = 1,
-   *   RINKEBY = 4,
-   *   GOERLI = 5,
+   *   SEPOLIA = 11155111,
    *   BSC_MAINNET = 56,
    *   BSC_TESTNET = 97,
    *   POLYGON = 137,
-   *   POLYGON_MUMBAI = 80001,
    *   POLYGON_AMOY=80002,
-   *   MOONBEAM = 1284,
-   *   MOONBASE_ALPHA = 1287,
-   *   AVALANCHE = 43114,
-   *   AVALANCHE_TESTNET = 43113,
-   *   CELO = 42220,
-   *   CELO_ALFAJORES = 44787,
    *   LOCALHOST = 1338,
    * }
    * ```
@@ -1700,8 +1697,8 @@ export class EscrowUtils {
                 ([, value]) => value === filter.status
               )?.[0]
             : undefined,
-        from: filter.from ? +filter.from.getTime() / 1000 : undefined,
-        to: filter.to ? +filter.to.getTime() / 1000 : undefined,
+        from: filter.from ? getUnixTimestamp(filter.from) : undefined,
+        to: filter.to ? getUnixTimestamp(filter.to) : undefined,
         orderDirection: orderDirection,
         first: first,
         skip: skip,
@@ -1727,19 +1724,11 @@ export class EscrowUtils {
    * enum ChainId {
    *   ALL = -1,
    *   MAINNET = 1,
-   *   RINKEBY = 4,
-   *   GOERLI = 5,
+   *   SEPOLIA = 11155111,
    *   BSC_MAINNET = 56,
    *   BSC_TESTNET = 97,
    *   POLYGON = 137,
-   *   POLYGON_MUMBAI = 80001,
    *   POLYGON_AMOY = 80002,
-   *   MOONBEAM = 1284,
-   *   MOONBASE_ALPHA = 1287,
-   *   AVALANCHE = 43114,
-   *   AVALANCHE_TESTNET = 43113,
-   *   CELO = 42220,
-   *   CELO_ALFAJORES = 44787,
    *   LOCALHOST = 1338,
    * }
    * ```
@@ -1815,23 +1804,12 @@ export class EscrowUtils {
    * enum ChainId {
    *   ALL = -1,
    *   MAINNET = 1,
-   *   RINKEBY = 4,
-   *   GOERLI = 5,
    *   SEPOLIA = 11155111,
    *   BSC_MAINNET = 56,
    *   BSC_TESTNET = 97,
    *   POLYGON = 137,
-   *   POLYGON_MUMBAI = 80001,
    *   POLYGON_AMOY = 80002,
-   *   MOONBEAM = 1284,
-   *   MOONBASE_ALPHA = 1287,
-   *   AVALANCHE = 43114,
-   *   AVALANCHE_TESTNET = 43113,
-   *   CELO = 42220,
-   *   CELO_ALFAJORES = 44787,
    *   LOCALHOST = 1338,
-   *   XLAYER_TESTNET = 195,
-   *   XLAYER = 196,
    * }
    * ```
    *
@@ -1921,8 +1899,8 @@ export class EscrowUtils {
       GET_STATUS_UPDATES_QUERY(from, to, launcher),
       {
         status: statusNames,
-        from: from ? Math.floor(from.getTime() / 1000) : undefined,
-        to: to ? Math.floor(to.getTime() / 1000) : undefined,
+        from: from ? getUnixTimestamp(from) : undefined,
+        to: to ? getUnixTimestamp(to) : undefined,
         launcher: launcher || undefined,
         orderDirection: orderDirection,
         first: first,
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/graphql/queries/operator.ts b/packages/sdk/typescript/human-protocol-sdk/src/graphql/queries/operator.ts
index 7a124e0881..c480710d72 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/graphql/queries/operator.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/graphql/queries/operator.ts
@@ -22,6 +22,8 @@ const LEADER_FRAGMENT = gql`
     registrationNeeded
     registrationInstructions
     reputationNetworks
+    name
+    category
   }
 `;
 
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts b/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts
index 428c42fd27..641c78e3ea 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts
@@ -27,6 +27,8 @@ export interface ILeader {
   registrationNeeded?: boolean;
   registrationInstructions?: string;
   reputationNetworks?: string[];
+  name?: string;
+  category?: string;
 }
 
 export interface ILeaderSubgraph
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts b/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts
index b071c4545f..f54fe02d9f 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts
@@ -20,7 +20,7 @@ import {
 } from './graphql';
 import { IHMTHoldersParams, IStatisticsFilter } from './interfaces';
 import { NetworkData } from './types';
-import { getSubgraphUrl, throwError } from './utils';
+import { getSubgraphUrl, getUnixTimestamp, throwError } from './utils';
 import { OrderDirection } from './enums';
 
 /**
@@ -133,8 +133,8 @@ export class StatisticsClient {
       const { eventDayDatas } = await gqlFetch<{
         eventDayDatas: EventDayData[];
       }>(this.subgraphUrl, GET_EVENT_DAY_DATA_QUERY(filter), {
-        from: filter.from ? filter.from.getTime() / 1000 : undefined,
-        to: filter.to ? filter.to.getTime() / 1000 : undefined,
+        from: filter.from ? getUnixTimestamp(filter.from) : undefined,
+        to: filter.to ? getUnixTimestamp(filter.to) : undefined,
         orderDirection: orderDirection,
         first: first,
         skip: skip,
@@ -213,8 +213,8 @@ export class StatisticsClient {
       const { eventDayDatas } = await gqlFetch<{
         eventDayDatas: EventDayData[];
       }>(this.subgraphUrl, GET_EVENT_DAY_DATA_QUERY(filter), {
-        from: filter.from ? filter.from.getTime() / 1000 : undefined,
-        to: filter.to ? filter.to.getTime() / 1000 : undefined,
+        from: filter.from ? getUnixTimestamp(filter.from) : undefined,
+        to: filter.to ? getUnixTimestamp(filter.to) : undefined,
         orderDirection: orderDirection,
         first: first,
         skip: skip,
@@ -309,8 +309,8 @@ export class StatisticsClient {
       const { eventDayDatas } = await gqlFetch<{
         eventDayDatas: EventDayData[];
       }>(this.subgraphUrl, GET_EVENT_DAY_DATA_QUERY(filter), {
-        from: filter.from ? filter.from.getTime() / 1000 : undefined,
-        to: filter.to ? filter.to.getTime() / 1000 : undefined,
+        from: filter.from ? getUnixTimestamp(filter.from) : undefined,
+        to: filter.to ? getUnixTimestamp(filter.to) : undefined,
         orderDirection: orderDirection,
         first: first,
         skip: skip,
@@ -487,8 +487,8 @@ export class StatisticsClient {
       const { eventDayDatas } = await gqlFetch<{
         eventDayDatas: EventDayData[];
       }>(this.subgraphUrl, GET_EVENT_DAY_DATA_QUERY(filter), {
-        from: filter.from ? filter.from.getTime() / 1000 : undefined,
-        to: filter.to ? filter.to.getTime() / 1000 : undefined,
+        from: filter.from ? getUnixTimestamp(filter.from) : undefined,
+        to: filter.to ? getUnixTimestamp(filter.to) : undefined,
         orderDirection: orderDirection,
         first: first,
         skip: skip,
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts b/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts
index 7444bf7f9b..37397c7914 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts
@@ -13,7 +13,7 @@ import {
   GET_TRANSACTION_QUERY,
 } from './graphql/queries/transaction';
 import { ITransaction, ITransactionsFilter } from './interfaces';
-import { getSubgraphUrl } from './utils';
+import { getSubgraphUrl, getUnixTimestamp } from './utils';
 
 export class TransactionUtils {
   /**
@@ -132,11 +132,9 @@ export class TransactionUtils {
       fromAddress: filter?.fromAddress,
       toAddress: filter?.toAddress,
       startDate: filter?.startDate
-        ? Math.floor(filter?.startDate.getTime() / 1000)
-        : undefined,
-      endDate: filter.endDate
-        ? Math.floor(filter.endDate.getTime() / 1000)
+        ? getUnixTimestamp(filter?.startDate)
         : undefined,
+      endDate: filter.endDate ? getUnixTimestamp(filter.endDate) : undefined,
       startBlock: filter.startBlock ? filter.startBlock : undefined,
       endBlock: filter.endBlock ? filter.endBlock : undefined,
       orderDirection: orderDirection,
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/utils.ts b/packages/sdk/typescript/human-protocol-sdk/src/utils.ts
index 2f22784fc2..4cff1453ed 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/utils.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/utils.ts
@@ -73,3 +73,13 @@ export const getSubgraphUrl = (networkData: NetworkData) => {
 
   return subgraphUrl;
 };
+
+/**
+ * **Convert a date to Unix timestamp (seconds since epoch).*
+ *
+ * @param {Date} date
+ * @returns {number}
+ */
+export const getUnixTimestamp = (date: Date): number => {
+  return Math.floor(date.getTime() / 1000);
+};
diff --git a/packages/sdk/typescript/human-protocol-sdk/test/operator.test.ts b/packages/sdk/typescript/human-protocol-sdk/test/operator.test.ts
index b9cb37cee6..7c5e7e7281 100644
--- a/packages/sdk/typescript/human-protocol-sdk/test/operator.test.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/test/operator.test.ts
@@ -199,6 +199,8 @@ describe('OperatorUtils', () => {
           address: '0x01',
         },
       ],
+      name: 'Alice',
+      category: 'machine_learning',
     };
 
     const mockLeader: ILeader = {
diff --git a/packages/sdk/typescript/human-protocol-sdk/test/statistics.test.ts b/packages/sdk/typescript/human-protocol-sdk/test/statistics.test.ts
index f3db21d616..ab88a6e9ed 100644
--- a/packages/sdk/typescript/human-protocol-sdk/test/statistics.test.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/test/statistics.test.ts
@@ -69,8 +69,8 @@ describe('StatisticsClient', () => {
         'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
         GET_EVENT_DAY_DATA_QUERY({ from, to }),
         {
-          from: from.getTime() / 1000,
-          to: to.getTime() / 1000,
+          from: Math.floor(from.getTime() / 1000),
+          to: Math.floor(to.getTime() / 1000),
           orderDirection: OrderDirection.ASC,
           first: 10,
           skip: 0,
@@ -131,8 +131,8 @@ describe('StatisticsClient', () => {
         'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
         GET_EVENT_DAY_DATA_QUERY({ from, to }),
         {
-          from: from.getTime() / 1000,
-          to: to.getTime() / 1000,
+          from: Math.floor(from.getTime() / 1000),
+          to: Math.floor(to.getTime() / 1000),
           orderDirection: OrderDirection.ASC,
           first: 10,
           skip: 0,
@@ -190,8 +190,8 @@ describe('StatisticsClient', () => {
         'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
         GET_EVENT_DAY_DATA_QUERY({ from, to }),
         {
-          from: from.getTime() / 1000,
-          to: to.getTime() / 1000,
+          from: Math.floor(from.getTime() / 1000),
+          to: Math.floor(to.getTime() / 1000),
           orderDirection: OrderDirection.ASC,
           first: 10,
           skip: 0,
@@ -444,8 +444,8 @@ describe('StatisticsClient', () => {
         'https://api.studio.thegraph.com/query/74256/polygon/version/latest',
         GET_EVENT_DAY_DATA_QUERY({ from, to }),
         {
-          from: from.getTime() / 1000,
-          to: to.getTime() / 1000,
+          from: Math.floor(from.getTime() / 1000),
+          to: Math.floor(to.getTime() / 1000),
           orderDirection: OrderDirection.ASC,
           first: 10,
           skip: 0,
diff --git a/packages/sdk/typescript/subgraph/README.md b/packages/sdk/typescript/subgraph/README.md
index a3999306ec..f2821e40db 100644
--- a/packages/sdk/typescript/subgraph/README.md
+++ b/packages/sdk/typescript/subgraph/README.md
@@ -65,9 +65,12 @@ yarn test
 
 Following networks are supported :
 
+- Ethereum Mainnet
+- Sepolia (testnet)
+- BSC Mainnet
+- BSC Testnet (testnet)
 - Polygon/matic
-- Goerli
-- Polygon Mumbai (testnet)
+- Polygon Amoy (testnet)
 
 # Add a new network
 
diff --git a/packages/sdk/typescript/subgraph/schema.graphql b/packages/sdk/typescript/subgraph/schema.graphql
index 06f6b3773e..d8ee8d67df 100644
--- a/packages/sdk/typescript/subgraph/schema.graphql
+++ b/packages/sdk/typescript/subgraph/schema.graphql
@@ -51,6 +51,9 @@ type Leader @entity {
   reputationNetworks: [ReputationNetwork!]
   registrationNeeded: Boolean
   registrationInstructions: String
+
+  name: String
+  category: String
 }
 
 type LeaderURL @entity {
diff --git a/packages/sdk/typescript/subgraph/src/mapping/KVStore.ts b/packages/sdk/typescript/subgraph/src/mapping/KVStore.ts
index 929ca3b506..b89ff9927a 100644
--- a/packages/sdk/typescript/subgraph/src/mapping/KVStore.ts
+++ b/packages/sdk/typescript/subgraph/src/mapping/KVStore.ts
@@ -1,3 +1,11 @@
+import {
+  Address,
+  BigInt,
+  Bytes,
+  dataSource,
+  Value,
+} from '@graphprotocol/graph-ts';
+import { DataSaved } from '../../generated/KVStore/KVStore';
 import {
   KVStore,
   KVStoreSetEvent,
@@ -5,13 +13,12 @@ import {
   LeaderURL,
   ReputationNetwork,
 } from '../../generated/schema';
-import { DataSaved } from '../../generated/KVStore/KVStore';
 import { createOrLoadLeader } from './Staking';
-import { toEventId } from './utils/event';
 import { isValidEthAddress } from './utils/ethAdrress';
-import { Address, BigInt, Bytes, dataSource } from '@graphprotocol/graph-ts';
-import { createTransaction } from './utils/transaction';
+import { toEventId } from './utils/event';
 import { toBytes } from './utils/string';
+import { createTransaction } from './utils/transaction';
+import { store } from '@graphprotocol/graph-ts';
 
 export function createOrLoadLeaderURL(leader: Leader, key: string): LeaderURL {
   const entityId = leader.address.concat(toBytes(key));
@@ -45,6 +52,11 @@ export function createOrUpdateKVStore(event: DataSaved): void {
   const kvstoreId = event.params.sender.concat(toBytes(event.params.key));
   let kvstore = KVStore.load(kvstoreId);
 
+  if (event.params.value == '' && kvstore) {
+    store.remove('KVStore', kvstoreId.toHexString());
+    return;
+  }
+
   if (!kvstore) {
     kvstore = new KVStore(kvstoreId);
     kvstore.address = event.params.sender;
@@ -76,58 +88,66 @@ export function handleDataSaved(event: DataSaved): void {
   const leader = createOrLoadLeader(event.params.sender);
 
   const key = event.params.key.toLowerCase();
-  if (key == 'role') {
-    leader.role = event.params.value;
-  } else if (key == 'fee') {
-    leader.fee = BigInt.fromString(event.params.value);
-  } else if (key == 'publickey' || key == 'public_key') {
-    leader.publicKey = event.params.value;
-  } else if (key == 'webhookurl' || key == 'webhook_url') {
-    leader.webhookUrl = event.params.value;
-  } else if (key == 'website') {
-    leader.website = event.params.value;
-  } else if (key == 'url') {
-    leader.url = event.params.value;
-  } else if (key == 'jobtypes' || key == 'job_types') {
-    leader.jobTypes = event.params.value
-      .split(',')
-      .map<string>((type) => type.trim());
-  } else if (
-    isValidEthAddress(event.params.key) &&
-    leader.role == 'Reputation Oracle'
-  ) {
-    const ethAddress = Address.fromString(event.params.key);
-
-    const reputationNetwork = createOrLoadReputationNetwork(
-      event.params.sender
-    );
-
-    const operator = createOrLoadLeader(ethAddress);
-
-    let reputationNetworks = operator.reputationNetworks;
-    if (reputationNetworks === null) {
-      reputationNetworks = [];
-    }
+  if (event.params.value == '') {
+    leader.set(key, Value.fromNull());
+  } else {
+    if (key == 'role') {
+      leader.role = event.params.value;
+    } else if (key == 'fee') {
+      leader.fee = BigInt.fromString(event.params.value);
+    } else if (key == 'publickey' || key == 'public_key') {
+      leader.publicKey = event.params.value;
+    } else if (key == 'webhookurl' || key == 'webhook_url') {
+      leader.webhookUrl = event.params.value;
+    } else if (key == 'website') {
+      leader.website = event.params.value;
+    } else if (key == 'url') {
+      leader.url = event.params.value;
+    } else if (key == 'jobtypes' || key == 'job_types') {
+      leader.jobTypes = event.params.value
+        .split(',')
+        .map<string>((type) => type.trim());
+    } else if (
+      isValidEthAddress(event.params.key) &&
+      leader.role == 'Reputation Oracle'
+    ) {
+      const ethAddress = Address.fromString(event.params.key);
+
+      const reputationNetwork = createOrLoadReputationNetwork(
+        event.params.sender
+      );
+
+      const operator = createOrLoadLeader(ethAddress);
+
+      let reputationNetworks = operator.reputationNetworks;
+      if (reputationNetworks === null) {
+        reputationNetworks = [];
+      }
 
-    if (event.params.value.toLowerCase() == 'active') {
-      reputationNetworks.push(reputationNetwork.id);
-    } else if (event.params.value.toLowerCase() == 'inactive') {
-      const filteredNetworks: Bytes[] = [];
-      for (let i = 0; i < reputationNetworks.length; i++) {
-        if (reputationNetworks[i] != reputationNetwork.id) {
-          filteredNetworks.push(reputationNetworks[i]);
+      if (event.params.value.toLowerCase() == 'active') {
+        reputationNetworks.push(reputationNetwork.id);
+      } else if (event.params.value.toLowerCase() == 'inactive') {
+        const filteredNetworks: Bytes[] = [];
+        for (let i = 0; i < reputationNetworks.length; i++) {
+          if (reputationNetworks[i] != reputationNetwork.id) {
+            filteredNetworks.push(reputationNetworks[i]);
+          }
         }
+        reputationNetworks = filteredNetworks;
       }
-      reputationNetworks = filteredNetworks;
-    }
-
-    operator.reputationNetworks = reputationNetworks;
 
-    operator.save();
-  } else if (key == 'registration_needed') {
-    leader.registrationNeeded = event.params.value.toLowerCase() == 'true';
-  } else if (key == 'registration_instructions') {
-    leader.registrationInstructions = event.params.value;
+      operator.reputationNetworks = reputationNetworks;
+
+      operator.save();
+    } else if (key == 'registration_needed') {
+      leader.registrationNeeded = event.params.value.toLowerCase() == 'true';
+    } else if (key == 'registration_instructions') {
+      leader.registrationInstructions = event.params.value;
+    } else if (key == 'name') {
+      leader.name = event.params.value;
+    } else if (key == 'category') {
+      leader.category = event.params.value;
+    }
   }
 
   if (key.indexOf('url') > -1) {
diff --git a/packages/sdk/typescript/subgraph/tests/kvstore/kvstore.test.ts b/packages/sdk/typescript/subgraph/tests/kvstore/kvstore.test.ts
index 6129d239af..97e95952e8 100644
--- a/packages/sdk/typescript/subgraph/tests/kvstore/kvstore.test.ts
+++ b/packages/sdk/typescript/subgraph/tests/kvstore/kvstore.test.ts
@@ -1,14 +1,15 @@
 import { BigInt, DataSourceContext } from '@graphprotocol/graph-ts';
 import {
-  describe,
-  test,
+  afterEach,
   assert,
+  beforeAll,
   clearStore,
-  afterEach,
   dataSourceMock,
-  beforeAll,
+  describe,
+  test,
 } from 'matchstick-as/assembly';
 
+import { Leader } from '../../generated/schema';
 import { handleDataSaved } from '../../src/mapping/KVStore';
 import { toEventId } from '../../src/mapping/utils/event';
 import { toBytes } from '../../src/mapping/utils/string';
@@ -38,7 +39,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'role',
-      'Validator',
+      'Job Launcher',
       BigInt.fromI32(11)
     );
 
@@ -102,7 +103,7 @@ describe('KVStore', () => {
       data2.params.sender.toHex()
     );
     assert.fieldEquals('KVStoreSetEvent', id2, 'key', 'role');
-    assert.fieldEquals('KVStoreSetEvent', id2, 'value', 'Validator');
+    assert.fieldEquals('KVStoreSetEvent', id2, 'value', 'Job Launcher');
   });
 
   test('Should properly create a transaction with set method', () => {
@@ -115,7 +116,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'role',
-      'Validator',
+      'Job Launcher',
       BigInt.fromI32(11)
     );
 
@@ -264,6 +265,78 @@ describe('KVStore', () => {
       'set'
     );
   });
+  test('Should properly remove KVStore entity when value is empty', () => {
+    const data1 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'role',
+      'Operator',
+      BigInt.fromI32(10)
+    );
+    const data2 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'role',
+      '',
+      BigInt.fromI32(11)
+    );
+
+    handleDataSaved(data1);
+
+    assert.fieldEquals(
+      'KVStore',
+      data1.params.sender.concat(toBytes(data1.params.key)).toHex(),
+      'value',
+      'Operator'
+    );
+
+    handleDataSaved(data2);
+
+    assert.notInStore(
+      'KVStore',
+      data2.params.sender.concat(toBytes(data2.params.key)).toHex()
+    );
+  });
+
+  test("Should properly set leader's attribute to null when value is empty and remove KVStore entity", () => {
+    const data1 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'role',
+      'Operator',
+      BigInt.fromI32(10)
+    );
+    const data2 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'role',
+      '',
+      BigInt.fromI32(11)
+    );
+
+    handleDataSaved(data1);
+
+    assert.fieldEquals(
+      'Leader',
+      data1.params.sender.toHex(),
+      'role',
+      'Operator'
+    );
+    assert.fieldEquals(
+      'KVStore',
+      data1.params.sender.concat(toBytes(data1.params.key)).toHex(),
+      'key',
+      'role'
+    );
+
+    handleDataSaved(data2);
+
+    const leader = Leader.load(data2.params.sender);
+    assert.assertNotNull(leader);
+    if (leader != null) {
+      assert.assertNull(leader.role);
+    }
+    assert.notInStore(
+      'KVStore',
+      data1.params.sender.concat(toBytes(data1.params.key)).toHex()
+    );
+  });
 
   test('Should properly update leader role', () => {
     const data1 = createDataSavedEvent(
@@ -275,7 +348,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'role',
-      'Validator',
+      'Job Launcher',
       BigInt.fromI32(11)
     );
 
@@ -292,7 +365,7 @@ describe('KVStore', () => {
       'Leader',
       data2.params.sender.toHex(),
       'role',
-      'Validator'
+      'Job Launcher'
     );
   });
 
@@ -378,7 +451,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'webhook_url',
-      'https://validator.example.com',
+      'https://job-launcher.example.com',
       BigInt.fromI32(11)
     );
 
@@ -408,7 +481,7 @@ describe('KVStore', () => {
       'Leader',
       data2.params.sender.toHex(),
       'webhookUrl',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
     assert.fieldEquals(
       'LeaderURL',
@@ -420,7 +493,7 @@ describe('KVStore', () => {
       'LeaderURL',
       data2.params.sender.concat(toBytes('webhook_url')).toHex(),
       'url',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
   });
 
@@ -434,7 +507,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'website',
-      'https://validator.example.com',
+      'https://job-launcher.example.com',
       BigInt.fromI32(11)
     );
 
@@ -452,7 +525,7 @@ describe('KVStore', () => {
       'Leader',
       data2.params.sender.toHex(),
       'website',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
   });
 
@@ -466,7 +539,7 @@ describe('KVStore', () => {
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'URL',
-      'https://validator.example.com',
+      'https://job-launcher.example.com',
       BigInt.fromI32(11)
     );
 
@@ -496,7 +569,7 @@ describe('KVStore', () => {
       'Leader',
       data2.params.sender.toHex(),
       'url',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
     assert.fieldEquals(
       'LeaderURL',
@@ -508,7 +581,7 @@ describe('KVStore', () => {
       'LeaderURL',
       data2.params.sender.concat(toBytes('url')).toHex(),
       'url',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
   });
 
@@ -636,13 +709,13 @@ describe('KVStore', () => {
     const data1 = createDataSavedEvent(
       '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
       'registration_instructions',
-      'https://validator.example.com',
+      'https://job-launcher.example.com',
       BigInt.fromI32(10)
     );
     const data2 = createDataSavedEvent(
       '0x92a2eEF7Ff696BCef98957a0189872680600a959',
       'registration_instructions',
-      'https://validator.example.com',
+      'https://job-launcher.example.com',
       BigInt.fromI32(11)
     );
 
@@ -653,14 +726,66 @@ describe('KVStore', () => {
       'Leader',
       data1.params.sender.toHex(),
       'registrationInstructions',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
     );
 
     assert.fieldEquals(
       'Leader',
       data2.params.sender.toHex(),
       'registrationInstructions',
-      'https://validator.example.com'
+      'https://job-launcher.example.com'
+    );
+  });
+
+  test("Should properly update leader's name", () => {
+    const data1 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'name',
+      'Alice',
+      BigInt.fromI32(10)
+    );
+    const data2 = createDataSavedEvent(
+      '0x92a2eEF7Ff696BCef98957a0189872680600a959',
+      'name',
+      'Bob',
+      BigInt.fromI32(11)
+    );
+
+    handleDataSaved(data1);
+    handleDataSaved(data2);
+
+    assert.fieldEquals('Leader', data1.params.sender.toHex(), 'name', 'Alice');
+    assert.fieldEquals('Leader', data2.params.sender.toHex(), 'name', 'Bob');
+  });
+
+  test("Should properly update leader's category", () => {
+    const data1 = createDataSavedEvent(
+      '0xD979105297fB0eee83F7433fC09279cb5B94fFC6',
+      'category',
+      'machine_learning',
+      BigInt.fromI32(10)
+    );
+    const data2 = createDataSavedEvent(
+      '0x92a2eEF7Ff696BCef98957a0189872680600a959',
+      'category',
+      'market_making',
+      BigInt.fromI32(11)
+    );
+
+    handleDataSaved(data1);
+    handleDataSaved(data2);
+
+    assert.fieldEquals(
+      'Leader',
+      data1.params.sender.toHex(),
+      'category',
+      'machine_learning'
+    );
+    assert.fieldEquals(
+      'Leader',
+      data2.params.sender.toHex(),
+      'category',
+      'market_making'
     );
   });
 });
diff --git a/scripts/cvat/Makefile b/scripts/cvat/Makefile
new file mode 100644
index 0000000000..03ca3c11fe
--- /dev/null
+++ b/scripts/cvat/Makefile
@@ -0,0 +1,18 @@
+.PHONY: copy-env-files
+
+copy-env-files:
+# Copying .env file for compose itself 
+	@cp ./env-files/.env.compose .env.compose.local
+# Copying .env files for backend services
+	@cp ./env-files/.env.reputation-oracle ./.env.reputation-oracle.local
+	@cp ./env-files/.env.human-app-server .env.human-app-server.local
+	@cp ./env-files/.env.job-launcher ./.env.job-launcher.local
+	@cp ./env-files/.env.exchange-oracle ./.env.exchange-oracle.local
+	@cp ./env-files/.env.recording-oracle ./.env.recording-oracle.local
+# Copying .env files for client apps.
+# It should be placed in corresponding app folder
+# because used during Docker image build process
+	@cp ./env-files/.env.human-app-client ../../packages/apps/human-app/frontend/.env.local
+	@cp ./env-files/.env.job-launcher-client ../../packages/apps/job-launcher/client/.env.local
+# Restore original files
+	@git checkout . > /dev/null 2>&1
\ No newline at end of file
diff --git a/scripts/cvat/docker-compose.local.yml b/scripts/cvat/docker-compose.local.yml
new file mode 100644
index 0000000000..14ccd6e9bd
--- /dev/null
+++ b/scripts/cvat/docker-compose.local.yml
@@ -0,0 +1,493 @@
+name: human-protocol-local-setup
+
+x-service-default-config:
+  restart: &default-restart unless-stopped
+  logging: &default-logging
+    options:
+      max-size: 10m
+      max-file: 3
+
+x-hardcoded-vars:
+  frontend_default_port: &frontend_default_port 3000
+  all_interfaces_ip: &all_interfaces_ip '0.0.0.0'
+  web3_env: &web3_env testnet
+  postgres_host: &postgres_host postgres
+  postgres_port: &postgres_port 5432
+  redis_host: &redis_host redis
+  redis_port: &redis_port 6379
+  minio_host: &minio_host minio
+  node_env: &node_env local
+  cvat_lb_url: &cvat_lb_url 'http://cvat-lb:8080'
+  cvat_oracle_storage_provider: &cvat_oracle_storage_provider aws
+
+x-general-env-variables:
+  # GENERAL VARS
+  subgraph_api_key: &subgraph_api_key ${SUBGRAPH_API_KEY}
+  sendgrid_api_key: &sendgrid_api_key ${SENDGRID_API_KEY:-sendgrid-disabled}
+  rpc_url_polygon_amoy: &rpc_url_polygon_amoy ${RPC_URL_POLYGON_AMOY:-}
+  # POSTGRES VARS
+  postgres_user: &postgres_user ${POSTGRES_USER:-default}
+  postgres_password: &postgres_password ${POSTGRES_PASSWORD:-qwerty}
+  # MINIO VARS
+  minio_port: &minio_port ${MINIO_PORT:?}
+  minio_console_port: &minio_console_port ${MINIO_CONSOLE_PORT:-9001}
+  minio_root_user: &minio_root_user ${MINIO_ROOT_USER:-minioadmin}
+  minio_root_password: &minio_root_password ${MINIO_ROOT_PASSWORD:-minioadmin}
+  minio_services_access_key: &minio_services_access_key ${MINIO_SERVICES_ACCESS_KEY:-human-oracle}
+  minio_services_secret_key: &minio_services_secret_key ${MINIO_SERVICES_SECRET_KEY:-human-oracle-s3-secret}
+  # BUCKET NAMES
+  bucket_name_manifests: &bucket_name_manifests ${BUCKET_NAME_MANIFESTS:-manifests}
+  bucket_name_datasets: &bucket_name_datasets ${BUCKET_NAME_DATASETS:-datasets}
+  bucket_name_rep_o: &bucket_name_rep_o ${BUCKET_NAME_REPUTATION_ORACLE:-reputation-oracle}
+  bucket_name_exc_o: &bucket_name_exc_o ${BUCKET_NAME_EXCHANGE_ORACLE:-exchange-oracle}
+  bucket_name_rec_o: &bucket_name_rec_o ${BUCKET_NAME_RECORDING_ORACLE:-recording-oracle}
+  # WEB3 ADDRESSES
+  reputation_oracle_address: &reputation_oracle_address ${REPUTATION_ORACLE_ADDRESS:?}
+  exchange_oracle_address: &exchange_oracle_address ${EXCHANGE_ORACLE_ADDRESS:?}
+  recording_oracle_address: &recording_oracle_address ${RECORDING_ORACLE_ADDRESS:?}
+  # OTHER
+  backend_apps_internal_port: &backend_apps_internal_port ${BACKEND_APPS_INTERNAL_PORT:?}
+  human_app_email: &human_app_email ${HUMAN_APP_EMAIL:?}
+  reputation_oracle_jwt_public_key: &reputation_oracle_jwt_public_key ${REPUTATION_ORACLE_JWT_PUBLIC_KEY:?}
+  cvat_oracle_storage_endpoint: &cvat_oracle_storage_endpoint minio:${MINIO_PORT:?}
+
+x-service-env-vars-groups:
+  postgres_auth_vars: &postgres_auth_vars
+    POSTGRES_USER: *postgres_user
+    POSTGRES_PASSWORD: *postgres_password
+  redis_app_vars: &redis_app_vars
+    REDIS_HOST: *redis_host
+    REDIS_PORT: *redis_port
+  nodejs_app_vars: &nodejs_app_vars
+    NODE_ENV: *node_env
+    WEB3_ENV: *web3_env
+    RPC_URL_POLYGON_AMOY: *rpc_url_polygon_amoy
+    SENDGRID_API_KEY: *sendgrid_api_key
+    SUBGRAPH_API_KEY: *subgraph_api_key
+    HCAPTCHA_SITE_KEY: ${HCAPTCHA_SITE_KEY:-10000000-ffff-ffff-ffff-000000000001}
+    HCAPTCHA_SECRET: ${HCAPTCHA_SECRET:-0x0000000000000000000000000000000000000000}
+    HCAPTCHA_API_KEY: ${HCAPTCHA_API_KEY:-test}
+  nodejs_app_postgres_vars: &nodejs_app_postgres_vars
+    <<: *postgres_auth_vars
+    POSTGRES_HOST: *postgres_host
+    POSTGRES_PORT: *postgres_port
+    POSTGRES_SSL: 'false'
+  nodejs_app_s3_vars: &nodejs_app_s3_vars
+    S3_ENDPOINT: *minio_host
+    S3_PORT: *minio_port
+    S3_ACCESS_KEY: *minio_services_access_key
+    S3_SECRET_KEY: *minio_services_secret_key
+    S3_USE_SSL: 'false'
+  cvat_oracle_postgres_vars: &cvat_oracle_postgres_vars
+    PG_HOST: *postgres_host
+    PG_PORT: *postgres_port
+    PG_USER: *postgres_user
+    PG_PASSWORD: *postgres_password
+  cvat_oracle_storage_connection_vars: &cvat_oracle_storage_connection_vars
+    STORAGE_PROVIDER: *cvat_oracle_storage_provider
+    STORAGE_ENDPOINT_URL: *cvat_oracle_storage_endpoint
+    STORAGE_ACCESS_KEY: *minio_services_access_key
+    STORAGE_SECRET_KEY: *minio_services_secret_key
+    STORAGE_USE_SSL: 'false'
+  cvat_connection_vars: &cvat_connection_vars
+    CVAT_URL: *cvat_lb_url
+    CVAT_ADMIN: ${CVAT_ADMIN:-human-protocol}
+    CVAT_ADMIN_PASS: ${CVAT_ADMIN_PASS:-qwe123qwe123Q!}
+    CVAT_ORG_SLUG: HumanAppLocal
+
+services:
+  postgres:
+    container_name: human-postgres
+    image: postgres:16
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    networks:
+      - human_protocol
+    ports:
+      - name: instance_port
+        target: *postgres_port
+        # default 5432 is used by CVAT installation
+        published: ${POSTGRES_PORT:-5433}
+    volumes:
+      - ./initdb:/docker-entrypoint-initdb.d
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      <<: *postgres_auth_vars
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+  
+  redis:
+    container_name: human-redis
+    image: redis:6
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    networks:
+      - human_protocol
+    ports:
+      - name: instance_port
+        target: *redis_port
+        # default 6379 is used by CVAT installation
+        published: ${REDIS_PORT:-6380}
+    volumes:
+      - redis-data:/data
+    command: [
+      "redis-server",
+      # we don not expect a lot of writes on local
+      "--save", "60", "100",
+      "--appendonly", "yes",
+    ]
+
+  minio:
+    container_name: human-minio
+    image: minio/minio:RELEASE.2024-12-18T13-15-44Z
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    entrypoint: 'sh'
+    networks:
+      - human_protocol
+      - human_cvat_bridge
+    ports:
+      - name: instance_port
+        target: 9000
+        published: *minio_port
+      - name: console_port
+        target: 9001
+        published: *minio_console_port
+    volumes:
+      - minio-data:/data
+    environment:
+      MINIO_ROOT_USER: *minio_root_user
+      MINIO_ROOT_PASSWORD: *minio_root_password
+    command:
+      -c "minio server /data --console-address ':9001'"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
+
+  minio-client:
+    container_name: human-minio-client
+    image: minio/mc:RELEASE.2024-11-21T17-21-54Z
+    depends_on:
+      minio:
+        condition: service_healthy
+    networks:
+      - human_protocol
+    environment:
+      MINIO_ROOT_USER: *minio_root_user
+      MINIO_ROOT_PASSWORD: *minio_root_password
+      SERVICES_ACCESS_KEY: *minio_services_access_key
+      SERVICES_SECRET_KEY: *minio_services_secret_key
+      BUCKET_MANIFESTS: *bucket_name_manifests
+      BUCKET_DATASETS: *bucket_name_datasets
+      BUCKET_REPUTATION_ORACLE: *bucket_name_rep_o
+      BUCKET_EXCHANGE_ORACLE: *bucket_name_exc_o
+      BUCKET_RECORDING_ORACLE: *bucket_name_rec_o
+    entrypoint: >
+      /bin/sh -c "
+        mc alias set myminio http://minio:9000 $$MINIO_ROOT_USER $$MINIO_ROOT_PASSWORD
+
+        mc admin user add myminio $$SERVICES_ACCESS_KEY $$SERVICES_SECRET_KEY
+        mc admin policy attach myminio readwrite --user=$$SERVICES_ACCESS_KEY
+
+        mc mb myminio/$$BUCKET_MANIFESTS;
+        mc anonymous set public myminio/$$BUCKET_MANIFESTS;
+
+        mc mb myminio/$$BUCKET_DATASETS;
+        mc anonymous set public myminio/$$BUCKET_DATASETS;
+
+        mc mb myminio/$$BUCKET_REPUTATION_ORACLE;
+        mc anonymous set public myminio/$$BUCKET_REPUTATION_ORACLE;
+
+        mc mb myminio/$$BUCKET_EXCHANGE_ORACLE;
+        mc anonymous set public myminio/$$BUCKET_EXCHANGE_ORACLE;
+
+        mc mb myminio/$$BUCKET_RECORDING_ORACLE;
+        mc anonymous set public myminio/$$BUCKET_RECORDING_ORACLE;
+      "
+
+  reputation-oracle:
+    container_name: reputation-oracle
+    image: human-protocol/reputation-oracle
+    pull_policy: build
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      minio-client:
+        condition: service_completed_successfully
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../
+      dockerfile: packages/apps/reputation-oracle/server/Dockerfile
+    expose:
+      - *backend_apps_internal_port
+    networks:
+      - human_protocol
+    ports:
+      - name: server_port
+        target: *backend_apps_internal_port
+        published: ${REPUTATION_ORACLE_PORT:-5001}
+    env_file: ./.env.reputation-oracle.local
+    environment:
+      <<: [*nodejs_app_vars, *nodejs_app_postgres_vars, *nodejs_app_s3_vars]
+      HOST: *all_interfaces_ip
+      PORT: *backend_apps_internal_port
+      POSTGRES_DATABASE: reputation-oracle
+      S3_BUCKET: *bucket_name_rep_o
+      KYC_API_PRIVATE_KEY: ${KYC_API_PRIVATE_KEY:-none}
+      HUMAN_APP_EMAIL: *human_app_email
+      # It is accessed by user, not from container
+      # so put here exposed port, not internal
+      FE_URL: http://localhost:${HUMAN_APP_CLIENT_PORT:?}
+      JWT_PUBLIC_KEY: *reputation_oracle_jwt_public_key
+
+  human-app-server:
+    container_name: human-app-server
+    image: human-protocol/human-app-server
+    pull_policy: build
+    depends_on:
+      redis:
+        condition: service_started
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../
+      dockerfile: packages/apps/human-app/server/Dockerfile
+    expose:
+      - *backend_apps_internal_port
+    networks:
+      - human_protocol
+    ports:
+      - name: server_port
+        target: *backend_apps_internal_port
+        published: ${HUMAN_APP_SERVER_PORT:-5002}
+    env_file: ./.env.human-app-server.local
+    environment:
+      <<: [*nodejs_app_vars, *redis_app_vars]
+      HOST: *all_interfaces_ip
+      PORT: *backend_apps_internal_port
+      REDIS_DB: 1
+      RPC_URL: *rpc_url_polygon_amoy
+      HUMAN_APP_EMAIL: *human_app_email
+      REPUTATION_ORACLE_URL: "http://reputation-oracle:${BACKEND_APPS_INTERNAL_PORT:?}"
+      REPUTATION_ORACLE_ADDRESS: *reputation_oracle_address
+
+  human-app-client:
+    container_name: human-app-client
+    image: human-protocol/human-app-client
+    pull_policy: build
+    depends_on:
+      human-app-server:
+        condition: service_started
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../
+      dockerfile: packages/apps/human-app/frontend/Dockerfile
+    expose:
+      - *frontend_default_port
+    networks:
+      - human_protocol
+    ports:
+      - name: server_port
+        target: *frontend_default_port
+        published: ${HUMAN_APP_CLIENT_PORT:?}
+    environment:
+      PORT: *frontend_default_port
+
+  exchange-oracle:
+    container_name: exchange-oracle-cvat
+    image: human-protocol/exchange-oracle-cvat
+    pull_policy: build
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      minio-client:
+        condition: service_completed_successfully
+      redis:
+        condition: service_started
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../packages/examples/cvat/exchange-oracle
+      dockerfile: ./Dockerfile
+    expose:
+      - *backend_apps_internal_port
+    networks:
+      human_protocol:
+      human_cvat_bridge:
+        aliases:
+          - exchange-oracle.app
+    ports:
+      - name: server_port
+        target: *backend_apps_internal_port
+        published: ${EXCHANGE_ORACLE_PORT:-5003}
+    env_file: ./.env.exchange-oracle.local
+    environment:
+      HOST: *all_interfaces_ip
+      PORT: *backend_apps_internal_port
+      <<: [
+        *cvat_oracle_postgres_vars,
+        *redis_app_vars,
+        *cvat_oracle_storage_connection_vars,
+        *cvat_connection_vars
+      ]
+      REDIS_DB: 2
+      PG_DB: exchange-oracle
+      POLYGON_AMOY_RPC_API_URL: *rpc_url_polygon_amoy
+      POLYGON_AMOY_ADDR: *exchange_oracle_address
+      STORAGE_BUCKET_NAME: *bucket_name_exc_o
+      HUMAN_APP_JWT_KEY: *reputation_oracle_jwt_public_key
+      CVAT_INCOMING_WEBHOOKS_URL: "http://exchange-oracle.app:${BACKEND_APPS_INTERNAL_PORT:?}/cvat-webhook"
+      LOCALHOST_RECORDING_ORACLE_URL: "http://recording-oracle:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
+      LOCALHOST_JOB_LAUNCHER_URL: "http://job-launcher:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
+      LOCALHOST_RECORDING_ORACLE_ADDRESS: *recording_oracle_address
+
+  recording-oracle:
+    container_name: recording-oracle-cvat
+    image: human-protocol/recording-oracle-cvat
+    pull_policy: build
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      minio-client:
+        condition: service_completed_successfully
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../packages/examples/cvat/recording-oracle
+      dockerfile: ./Dockerfile
+    expose:
+      - *backend_apps_internal_port
+    networks:
+      - human_protocol
+      - human_cvat_bridge
+    ports:
+      - name: server_port
+        target: *backend_apps_internal_port
+        published: ${RECORDING_ORACLE_PORT:-5004}
+    env_file: ./.env.recording-oracle.local
+    environment:
+      HOST: *all_interfaces_ip
+      PORT: *backend_apps_internal_port
+      <<: [
+        *cvat_oracle_postgres_vars,
+        *cvat_oracle_storage_connection_vars,
+        *cvat_connection_vars
+      ]
+      PG_DB: recording-oracle
+      POLYGON_AMOY_RPC_API_URL: *rpc_url_polygon_amoy
+      POLYGON_AMOY_ADDR: *recording_oracle_address
+      STORAGE_RESULTS_BUCKET_NAME: *bucket_name_rec_o
+      STORAGE_USE_PATH_STYLE: "true"
+      EXCHANGE_ORACLE_STORAGE_PROVIDER: *cvat_oracle_storage_provider
+      EXCHANGE_ORACLE_STORAGE_ENDPOINT_URL: *cvat_oracle_storage_endpoint
+      EXCHANGE_ORACLE_STORAGE_ACCESS_KEY: *minio_services_access_key
+      EXCHANGE_ORACLE_STORAGE_SECRET_KEY: *minio_services_secret_key
+      EXCHANGE_ORACLE_STORAGE_RESULTS_BUCKET_NAME: *bucket_name_exc_o
+      EXCHANGE_ORACLE_STORAGE_USE_SSL: 'false'
+      LOCALHOST_EXCHANGE_ORACLE_URL: "http://exchange-oracle:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
+      LOCALHOST_REPUTATION_ORACLE_URL: "http://reputation-oracle:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
+      LOCALHOST_EXCHANGE_ORACLE_ADDRESS: *exchange_oracle_address
+
+  job-launcher:
+    container_name: job-launcher
+    image: human-protocol/job-launcher
+    pull_policy: build
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      minio-client:
+        condition: service_completed_successfully
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../
+      dockerfile: packages/apps/job-launcher/server/Dockerfile
+    expose:
+      - *backend_apps_internal_port
+    networks:
+      - human_protocol
+    ports:
+      - name: server_port
+        target: *backend_apps_internal_port
+        published: ${JOB_LAUNCHER_PORT:-5005}
+    env_file: ./.env.job-launcher.local
+    environment:
+      <<: [*nodejs_app_vars, *nodejs_app_postgres_vars, *nodejs_app_s3_vars]
+      HOST: *all_interfaces_ip
+      PORT: *backend_apps_internal_port
+      POSTGRES_DATABASE: job-launcher
+      S3_BUCKET: *bucket_name_manifests
+      REPUTATION_ORACLES: *exchange_oracle_address
+      CVAT_EXCHANGE_ORACLE_ADDRESS: *exchange_oracle_address
+      CVAT_RECORDING_ORACLE_ADDRESS: *recording_oracle_address
+      REPUTATION_ORACLE_ADDRESS: *reputation_oracle_address
+      FE_URL: http://localhost:${JOB_LAUNCHER_CLIENT_PORT:?}
+
+  job-launcher-client:
+    container_name: job-launcher-client
+    image: human-protocol/job-launcher-client
+    pull_policy: build
+    depends_on:
+      job-launcher:
+        condition: service_started
+    restart: *default-restart
+    logging:
+      <<: *default-logging
+    build:
+      context: ../../
+      dockerfile: packages/apps/job-launcher/client/Dockerfile
+    expose:
+      - *frontend_default_port
+    networks:
+      - human_protocol
+    ports:
+      - name: server_port
+        target: *frontend_default_port
+        published: ${JOB_LAUNCHER_CLIENT_PORT:?}
+    environment:
+      PORT: *frontend_default_port
+
+volumes:
+  # When init for the first time postgres requires empty directory
+  # that is exclusive to its user, so providing a separate volume
+  postgres-data:
+  redis-data:
+  minio-data:
+
+networks:
+  human_protocol:
+    name: human-protocol
+  # CVAT oracles since they need to access CVAT
+  human_cvat_bridge:
+    name: human-cvat-bridge
+    driver: bridge
+    driver_opts:
+      # Default is also 'true'
+      com.docker.network.bridge.enable_icc: 'true'
+      # Default is also 'true'
+      com.docker.network.bridge.enable_ip_masquerade: 'true'
+      com.docker.network.driver.mtu: 1500
diff --git a/scripts/cvat/env-files/.env.compose b/scripts/cvat/env-files/.env.compose
new file mode 100644
index 0000000000..9a307825f1
--- /dev/null
+++ b/scripts/cvat/env-files/.env.compose
@@ -0,0 +1,21 @@
+MINIO_PORT=9000
+
+BACKEND_APPS_INTERNAL_PORT=5000
+REPUTATION_ORACLE_EXPOSED_PORT=5001
+HUMAN_APP_CLIENT_PORT=3001
+JOB_LAUNCHER_CLIENT_PORT=3002
+
+HUMAN_APP_EMAIL=human-app@local.app
+REPUTATION_ORACLE_JWT_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkPekD3q96LHt4IfvY1UY1YukTeEf
+K+XryPXhU57nKuhZXBPRrQ+lMDeFpYpHWpGqA/K576n+rDvjbBgHfQiHKg==
+-----END PUBLIC KEY-----"
+
+RPC_URL_POLYGON_AMOY=https://rpc-amoy.polygon.technology
+# Oracle addresses
+REPUTATION_ORACLE_ADDRESS=replace_me
+EXCHANGE_ORACLE_ADDRESS=replace_me
+RECORDING_ORACLE_ADDRESS=replace_me
+
+# Might be empty
+SUBGRAPH_API_KEY=
diff --git a/scripts/cvat/env-files/.env.exchange-oracle b/scripts/cvat/env-files/.env.exchange-oracle
new file mode 100644
index 0000000000..6ee37a5497
--- /dev/null
+++ b/scripts/cvat/env-files/.env.exchange-oracle
@@ -0,0 +1,57 @@
+## Polygon Amoy Config
+POLYGON_AMOY_PRIVATE_KEY=replace_me
+
+## Cron Config
+## To make environment more convenient with faster updates
+PROCESS_JOB_LAUNCHER_WEBHOOKS_INT=10
+PROCESS_RECORDING_ORACLE_WEBHOOKS_INT=10
+TRACK_COMPLETED_PROJECTS_INT=10
+TRACK_COMPLETED_TASKS_INT=10
+TRACK_COMPLETED_ESCROWS_INT=10
+TRACK_CREATING_TASKS_INT=10
+TRACK_ASSIGNMENTS_INT=10
+TRACK_ESCROW_CREATION_INT=100
+
+## Features
+ENABLE_CUSTOM_CLOUD_HOST="yes"
+REQUEST_LOGGING_ENABLED="yes"
+PROFILING_ENABLED="yes"
+
+## Core
+DEFAULT_ASSIGNMENT_TIME=600
+
+## PGP Keys data
+PGP_PRIVATE_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZ4+2FxYJKwYBBAHaRw8BAQdAodfgvZwd1/s2tStzumk9T+WhuirhI8AD
+eEOG4jdMhdD+CQMI9hA7Uf00eCXgAmMXD7ffmZaIpOjJXd3I4GM8mvKqP2DV
+Ts6iDtfTy0f/jqEdTgNoh9Q5Q6uXW3/zAXivDtc7hGaMMA6/ITQsk7tg7LtL
+HM0rRXhjaGFuZ2UgT3JhY2xlIDxleGNoYW5nZS1vcmFjbGVAbG9jYWwuYXBw
+PsKMBBAWCgA+BYJnj7YXBAsJBwgJkNHy48FpPLsnAxUICgQWAAIBAhkBApsD
+Ah4BFiEEydMT95OC9OCzQFjL0fLjwWk8uycAALavAP9RKP8wUxhuFKxFQ7IB
+SQTTAZgamwezk0KqEuy6U70UtwEAiWyjFo3Y5oTzaOABs3YTogumq3v+Kmnn
+yYNl/UHyZwXHiwRnj7YXEgorBgEEAZdVAQUBAQdA0THKoGl7/bviCOOm0MZ2
+6CSyN/PbPL5j9C6m5T/90GcDAQgH/gkDCBJs91BQdiVL4PZj8WlKnyu+7sBD
+p1pKRAqCxx/DDnYWGTFyW8JMgM6bcEfCIl+q5WeO35k1SXFJKUu2Wd1Cl5r1
+kp/DonyJmiRM+Lo/evbCeAQYFgoAKgWCZ4+2FwmQ0fLjwWk8uycCmwwWIQTJ
+0xP3k4L04LNAWMvR8uPBaTy7JwAAVCEBAKBllZtzefLZsoE0behnwu5SCnSS
+ORb+9kItQJMdBcnWAP9HcsCq3Ve6pOUXBuMWlmQ8IspXQ/oPHdQ7gEJ8+q6H
+Bw==
+=w1I+
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PASSPHRASE=exc-o-pgp-password
+PGP_PUBLIC_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEZ4+2FxYJKwYBBAHaRw8BAQdAodfgvZwd1/s2tStzumk9T+WhuirhI8AD
+eEOG4jdMhdDNK0V4Y2hhbmdlIE9yYWNsZSA8ZXhjaGFuZ2Utb3JhY2xlQGxv
+Y2FsLmFwcD7CjAQQFgoAPgWCZ4+2FwQLCQcICZDR8uPBaTy7JwMVCAoEFgAC
+AQIZAQKbAwIeARYhBMnTE/eTgvTgs0BYy9Hy48FpPLsnAAC2rwD/USj/MFMY
+bhSsRUOyAUkE0wGYGpsHs5NCqhLsulO9FLcBAIlsoxaN2OaE82jgAbN2E6IL
+pqt7/ipp58mDZf1B8mcFzjgEZ4+2FxIKKwYBBAGXVQEFAQEHQNExyqBpe/27
+4gjjptDGdugksjfz2zy+Y/QupuU//dBnAwEIB8J4BBgWCgAqBYJnj7YXCZDR
+8uPBaTy7JwKbDBYhBMnTE/eTgvTgs0BYy9Hy48FpPLsnAABUIQEAoGWVm3N5
+8tmygTRt6GfC7lIKdJI5Fv72Qi1Akx0FydYA/0dywKrdV7qk5RcG4xaWZDwi
+yldD+g8d1DuAQnz6rocH
+=AVB0
+-----END PGP PUBLIC KEY BLOCK-----"
+PGP_PUBLIC_KEY_URL=http://minio:9000/exchange-oracle/pgp-public-key
diff --git a/scripts/cvat/env-files/.env.human-app-client b/scripts/cvat/env-files/.env.human-app-client
new file mode 100644
index 0000000000..30464f42d5
--- /dev/null
+++ b/scripts/cvat/env-files/.env.human-app-client
@@ -0,0 +1,28 @@
+VITE_API_URL=http://localhost:5002
+VITE_NETWORK=testnet
+# Reown project id
+VITE_WALLET_CONNECT_PROJECT_ID=replace_me
+VITE_DAPP_ICONS=icon1,icon2
+VITE_DAPP_META_DESCRIPTION=Complete jobs, earn HMT
+VITE_DAPP_META_NAME=Human App Local
+VITE_DAPP_META_URL=http://localhost:3001
+# Keep it empty
+VITE_H_CAPTCHA_EXCHANGE_URL=
+# Keep it empty
+VITE_H_CAPTCHA_LABELING_BASE_URL=
+VITE_H_CAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
+VITE_DAILY_SOLVED_CAPTCHA_LIMIT=0
+VITE_HMT_DAILY_SPENT_LIMIT=0
+VITE_HUMAN_PROTOCOL_HELP_URL=https://docs.humanprotocol.org/
+VITE_HUMAN_PROTOCOL_URL=https://humanprotocol.org/
+VITE_HUMAN_SUPPORT_EMAIL=support@local.app
+VITE_NAVBAR__LINK__HOW_IT_WORK_URL=https://humanprotocol.org/
+VITE_NAVBAR__LINK__PROTOCOL_URL=https://humanprotocol.org/
+VITE_PRIVACY_POLICY_URL=http://local.app/privacy-policy/
+VITE_TERMS_OF_SERVICE_URL=http://local.app/terms-and-conditions/
+VITE_H_CAPTCHA_ORACLE_ANNOTATION_TOOL=hcaptcha
+VITE_H_CAPTCHA_ORACLE_ROLE=hcaptcha
+# Keep it empty
+VITE_H_CAPTCHA_ORACLE_ADDRESS=
+VITE_H_CAPTCHA_ORACLE_TASK_TYPES=image_points,image_boxes
+VITE_FEATURE_FLAG_JOBS_DISCOVERY=true
\ No newline at end of file
diff --git a/scripts/cvat/env-files/.env.human-app-server b/scripts/cvat/env-files/.env.human-app-server
new file mode 100644
index 0000000000..7eef62257c
--- /dev/null
+++ b/scripts/cvat/env-files/.env.human-app-server
@@ -0,0 +1,14 @@
+CHAIN_IDS_ENABLED=80002
+HCAPTCHA_LABELING_STATS_API_URL=disabled
+HCAPTCHA_LABELING_VERIFY_API_URL=disabled
+HCAPTCHA_LABELING_API_KEY=disabled
+# Should be the one you will use to access human-app-server API
+ALLOWED_HOST=localhost:5002
+HUMAN_APP_PASSWORD=HumanAppPassword
+# CORS
+CORS_ALLOWED_ORIGIN=*
+CORS_ALLOWED_HEADERS='Content-Type,Authorization,X-Requested-With,Accept,Origin'
+CORS_ENABLED=true
+IS_CACHE_TO_RESTART=false
+# FEATURE FLAGS
+FEATURE_FLAG_JOBS_DISCOVERY=true
diff --git a/scripts/cvat/env-files/.env.job-launcher b/scripts/cvat/env-files/.env.job-launcher
new file mode 100644
index 0000000000..5784c6b2ca
--- /dev/null
+++ b/scripts/cvat/env-files/.env.job-launcher
@@ -0,0 +1,66 @@
+# Database
+POSTGRES_DATABASE=job-launcher
+
+# Web3
+WEB3_PRIVATE_KEY=replace_me
+
+GAS_PRICE_MULTIPLIER=1
+
+# Encryption
+PGP_ENCRYPT=true
+PGP_PRIVATE_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZ4+y/xYJKwYBBAHaRw8BAQdAlIkUUttKB25Zf/g3lf26lU15V4PcS6eM
+YiqfFUeyZGn+CQMIW8oNkxnBpSfgI4VBMN4ZamblXNYjg3u6HdSvuPrSjryR
+zEVPcE/QPTE+sljRLve2E4MEcGcs9c/JWxmD0Dlq7gpbctghQKkEbViwsj36
+L80lSm9iIExhdW5jaGVyIDxqb2ItbGF1bmNoZXJAbG9jYWwuYXBwPsKMBBAW
+CgA+BYJnj7L/BAsJBwgJkFvOlfsfiS2NAxUICgQWAAIBAhkBApsDAh4BFiEE
+nhDZweAQiTFNFnMEW86V+x+JLY0AAFrrAQDUTb30NvyMX1rvIAUdX7OnEQFu
+u+IkL52ZcvH0lJBHsAEA+iDL/03LCLIDK1g1l2mBZNUudEqncB0i0rAifeli
+hwLHiwRnj7L/EgorBgEEAZdVAQUBAQdASe/9TcJE/EnMLYE2K0o/ROxsRDi8
+cRtPEKSNVNLeCB4DAQgH/gkDCHtTPVsCMa9X4H1NkDo5Ijnyp74a2ZklE5l6
+coHvKRndTyT/UwxRPUo38pq3mI5U/bRCvrwFD6ehWWhlsfjm/D0Xsjj7J6jF
+uKxZgW+CGwfCeAQYFgoAKgWCZ4+y/wmQW86V+x+JLY0CmwwWIQSeENnB4BCJ
+MU0WcwRbzpX7H4ktjQAAZqoBAJ5Llw1V+5i9w9bOTS2NlQDSqtQAClCECEhD
+z9cFhU1RAQCBG62i7Cjsy+4RXxubBqVhNWCk02JhSn+vDAYT/TeqBA==
+=B2Ed
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PASSPHRASE=job-launcher-pgp-password
+# Put it here just to easily set up KV later
+PGP_PUBLIC_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEZ4+y/xYJKwYBBAHaRw8BAQdAlIkUUttKB25Zf/g3lf26lU15V4PcS6eM
+YiqfFUeyZGnNJUpvYiBMYXVuY2hlciA8am9iLWxhdW5jaGVyQGxvY2FsLmFw
+cD7CjAQQFgoAPgWCZ4+y/wQLCQcICZBbzpX7H4ktjQMVCAoEFgACAQIZAQKb
+AwIeARYhBJ4Q2cHgEIkxTRZzBFvOlfsfiS2NAABa6wEA1E299Db8jF9a7yAF
+HV+zpxEBbrviJC+dmXLx9JSQR7ABAPogy/9NywiyAytYNZdpgWTVLnRKp3Ad
+ItKwIn3pYocCzjgEZ4+y/xIKKwYBBAGXVQEFAQEHQEnv/U3CRPxJzC2BNitK
+P0TsbEQ4vHEbTxCkjVTS3ggeAwEIB8J4BBgWCgAqBYJnj7L/CZBbzpX7H4kt
+jQKbDBYhBJ4Q2cHgEIkxTRZzBFvOlfsfiS2NAABmqgEAnkuXDVX7mL3D1s5N
+LY2VANKq1AAKUIQISEPP1wWFTVEBAIEbraLsKOzL7hFfG5sGpWE1YKTTYmFK
+f68MBhP9N6oE
+=dNxu
+-----END PGP PUBLIC KEY BLOCK-----"
+
+FORTUNE_EXCHANGE_ORACLE_ADDRESS=disabled
+FORTUNE_RECORDING_ORACLE_ADDRESS=disabled
+HCAPTCHA_RECORDING_ORACLE_URI=disabled
+HCAPTCHA_REPUTATION_ORACLE_URI=disabled
+HCAPTCHA_ORACLE_ADDRESS=disabled
+
+# Auth
+JWT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgjwW8ZeWIKizY9pSl
+phyKfwYFp3aRHeMuV+jOKp49hX6hRANCAATeitytad5Rh0tx6AP/VHptsRvsZ+Xp
+/24PICdk4nsMxZEAe76InmWdqhud13JV76Jl02DVenFEJVM5IjRk+mLG
+-----END PRIVATE KEY-----"
+JWT_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3orcrWneUYdLcegD/1R6bbEb7Gfl
+6f9uDyAnZOJ7DMWRAHu+iJ5lnaobnddyVe+iZdNg1XpxRCVTOSI0ZPpixg==
+-----END PUBLIC KEY-----"
+
+# Stripe
+STRIPE_SECRET_KEY=disabled
+STRIPE_APP_NAME=Launcher Server Local
+STRIPE_APP_VERSION=1.0.0
+STRIPE_APP_INFO_URL=http://local.app
diff --git a/scripts/cvat/env-files/.env.job-launcher-client b/scripts/cvat/env-files/.env.job-launcher-client
new file mode 100644
index 0000000000..aaa46b98bf
--- /dev/null
+++ b/scripts/cvat/env-files/.env.job-launcher-client
@@ -0,0 +1,10 @@
+VITE_APP_JOB_LAUNCHER_SERVER_URL=http://localhost:5005
+# Reown project id
+VITE_APP_WALLETCONNECT_PROJECT_ID=replace_me
+VITE_APP_STRIPE_PUBLISHABLE_KEY=disabled
+VITE_APP_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
+VITE_APP_HCAPTCHA_EXCHANGE_URL=disabled
+VITE_APP_HCAPTCHA_LABELING_BASE_URL=disabled
+VITE_APP_ENVIRONMENT=testnet
+VITE_APP_RPC_URL_POLYGON_AMOY=https://rpc-amoy.polygon.technology
+VITE_APP_SUPPORTED_CHAINS=80002
diff --git a/scripts/cvat/env-files/.env.recording-oracle b/scripts/cvat/env-files/.env.recording-oracle
new file mode 100644
index 0000000000..6c8bbb1a88
--- /dev/null
+++ b/scripts/cvat/env-files/.env.recording-oracle
@@ -0,0 +1,50 @@
+# Polygon Amoy
+POLYGON_AMOY_PRIVATE_KEY=replace_me
+
+# Cron jobs
+PROCESS_EXCHANGE_ORACLE_WEBHOOKS_INT=10
+PROCESS_REPUTATION_ORACLE_WEBHOOKS_INT=10
+
+# Features
+ENABLE_CUSTOM_CLOUD_HOST="yes"
+
+
+# Encryption
+PGP_PRIVATE_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZ4+5NBYJKwYBBAHaRw8BAQdAB8sDU5DxBk145aSEDgzsDqVvSbxoQffZ
+6wybUtZ/s+3+CQMI6+l2w9YuLXDgz7GAmnrbFaUciZFIfAzjng3ZjbABRoWI
+5+qwhJ4AITBpNzrju6SZV+NGlkgnYaljDk+cO+eIIL2N8D+v+UDGJokWy9P5
+PM0yQ1ZBVCByZWNvcmRpbmcgb3JhY2xlIDxyZWNvcmRpbmctb3JhY2xlQGxv
+Y2FsLmFwcD7CjAQQFgoAPgWCZ4+5NAQLCQcICZDA/EkpGIzNeAMVCAoEFgAC
+AQIZAQKbAwIeARYhBL5Bsw7o2pz/KrGZjMD8SSkYjM14AAA+wgEAzTwwMKXJ
+QUlIeUwmLR3OHrCuyHQIPWFzxLQcxESPftkA/1PTr20UozX+YNUV9XRLehJt
+3pmBtFzQZdndN3rTNJQKx4sEZ4+5NBIKKwYBBAGXVQEFAQEHQBJRjDJjbOVh
+k0ofZQv6VZF+GtvMzoZTErWOBSZnjJ5lAwEIB/4JAwhW7zmaNYAF+uA6JpwB
+zaAC1o2Cm5IRnBp66vdGG7RsyZBoca0R6aHht/UfzlrUwPKUmP13oTSQ1vxU
+Z5Fx+owW1V+w8ZDuxyN1zTWGgQh7wngEGBYKACoFgmePuTQJkMD8SSkYjM14
+ApsMFiEEvkGzDujanP8qsZmMwPxJKRiMzXgAANG2AQCA5PVDyVwo54y9Givv
+4V8HSyNHNVgxj0dLknOxJB3HSAEA/jO1djl9b99okxC3cgfic0ArMIT1V3gm
+9SSdFWQpfww=
+=X8yi
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PASSPHRASE=rec-o-pgp-password
+PGP_PUBLIC_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZ4+5NBYJKwYBBAHaRw8BAQdAB8sDU5DxBk145aSEDgzsDqVvSbxoQffZ
+6wybUtZ/s+3+CQMI6+l2w9YuLXDgz7GAmnrbFaUciZFIfAzjng3ZjbABRoWI
+5+qwhJ4AITBpNzrju6SZV+NGlkgnYaljDk+cO+eIIL2N8D+v+UDGJokWy9P5
+PM0yQ1ZBVCByZWNvcmRpbmcgb3JhY2xlIDxyZWNvcmRpbmctb3JhY2xlQGxv
+Y2FsLmFwcD7CjAQQFgoAPgWCZ4+5NAQLCQcICZDA/EkpGIzNeAMVCAoEFgAC
+AQIZAQKbAwIeARYhBL5Bsw7o2pz/KrGZjMD8SSkYjM14AAA+wgEAzTwwMKXJ
+QUlIeUwmLR3OHrCuyHQIPWFzxLQcxESPftkA/1PTr20UozX+YNUV9XRLehJt
+3pmBtFzQZdndN3rTNJQKx4sEZ4+5NBIKKwYBBAGXVQEFAQEHQBJRjDJjbOVh
+k0ofZQv6VZF+GtvMzoZTErWOBSZnjJ5lAwEIB/4JAwhW7zmaNYAF+uA6JpwB
+zaAC1o2Cm5IRnBp66vdGG7RsyZBoca0R6aHht/UfzlrUwPKUmP13oTSQ1vxU
+Z5Fx+owW1V+w8ZDuxyN1zTWGgQh7wngEGBYKACoFgmePuTQJkMD8SSkYjM14
+ApsMFiEEvkGzDujanP8qsZmMwPxJKRiMzXgAANG2AQCA5PVDyVwo54y9Givv
+4V8HSyNHNVgxj0dLknOxJB3HSAEA/jO1djl9b99okxC3cgfic0ArMIT1V3gm
+9SSdFWQpfww=
+=X8yi
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PUBLIC_KEY_URL=http://minio:9000/recording-oracle/pgp-public-key
diff --git a/scripts/cvat/env-files/.env.reputation-oracle b/scripts/cvat/env-files/.env.reputation-oracle
new file mode 100644
index 0000000000..f53545576b
--- /dev/null
+++ b/scripts/cvat/env-files/.env.reputation-oracle
@@ -0,0 +1,48 @@
+# Auth
+JWT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9T4TcNz4sFIvOZTE
+wBHX986G90H20Cryp4++7APQfu6hRANCAASQ96QPer3ose3gh+9jVRjVi6RN4R8r
+5evI9eFTnucq6FlcE9GtD6UwN4WlikdakaoD8rnvqf6sO+NsGAd9CIcq
+-----END PRIVATE KEY-----"
+
+# web3
+WEB3_PRIVATE_KEY=replace_me
+
+# Encryption
+PGP_ENCRYPT=true
+PGP_PRIVATE_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZ4+FFhYJKwYBBAHaRw8BAQdA/BEzpkXk107UOpQrUro20UxYryOW4g8x
+yAXIh2cH5ff+CQMI0h7UaI9LgBXgKHJF0y9LMaRyjZwkKYQa/yn5T1pfkgTn
+T2piULy9a+2w8EWyve2cv8zMBtZAcno75sV0X3BbMpkf9ru8hOoWQvkv8arN
+Wc01UmVwdXRhdGlvbiBPcmFjbGUgTG9jYWwgPHJlcHV0YXRpb24tb3JhY2xl
+QGxvY2FsLmFwcD7CjAQQFgoAPgWCZ4+FFgQLCQcICZCe6Z27JtHYsAMVCAoE
+FgACAQIZAQKbAwIeARYhBMXQP7WbhM4roaDkzZ7pnbsm0diwAACDdAEAkLuS
+rUp2eLBD2MEBP96wU8FqIUGsyju5Esd+yS7VGzIBAO8hmR8QEwk/+P2lKqLg
+6lgQnT0xubb7PqcNmJNoSX8Hx4sEZ4+FFhIKKwYBBAGXVQEFAQEHQJHtNaFR
+30ahNwXuUoYRyIA22K3B686H+mZCF5Nfy6JDAwEIB/4JAwj2Ltq6kZ0KfuC6
+78oX1t2wh/ZYJA9hZRa+8qyizfHZ9WKe7IWEXBW8yRc4IHNL0nYFCF5w5zoc
+NMHddSoQdIWhja8s5odZqA0uV1YaDHuOwngEGBYKACoFgmePhRYJkJ7pnbsm
+0diwApsMFiEExdA/tZuEziuhoOTNnumduybR2LAAAFNTAQDL0L2pHyi6CPPV
+fw6LtGasCu9iLT59kNj+gUabWgYVtQEApNxRcbFcYRyqmFjDDNXtyZhZB8Jj
+F8tN26blow3txgI=
+=68Rz
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PASSPHRASE=rep-o-pgp-password
+# Put it here just to easily set up KV later
+PGP_PUBLIC_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEZ4+FFhYJKwYBBAHaRw8BAQdA/BEzpkXk107UOpQrUro20UxYryOW4g8x
+yAXIh2cH5ffNNVJlcHV0YXRpb24gT3JhY2xlIExvY2FsIDxyZXB1dGF0aW9u
+LW9yYWNsZUBsb2NhbC5hcHA+wowEEBYKAD4FgmePhRYECwkHCAmQnumduybR
+2LADFQgKBBYAAgECGQECmwMCHgEWIQTF0D+1m4TOK6Gg5M2e6Z27JtHYsAAA
+g3QBAJC7kq1KdniwQ9jBAT/esFPBaiFBrMo7uRLHfsku1RsyAQDvIZkfEBMJ
+P/j9pSqi4OpYEJ09Mbm2+z6nDZiTaEl/B844BGePhRYSCisGAQQBl1UBBQEB
+B0CR7TWhUd9GoTcF7lKGEciANtitwevOh/pmQheTX8uiQwMBCAfCeAQYFgoA
+KgWCZ4+FFgmQnumduybR2LACmwwWIQTF0D+1m4TOK6Gg5M2e6Z27JtHYsAAA
+U1MBAMvQvakfKLoI89V/Dou0ZqwK72ItPn2Q2P6BRptaBhW1AQCk3FFxsVxh
+HKqYWMMM1e3JmFkHwmMXy03bpuWjDe3GAg==
+=pqBc
+-----END PGP PUBLIC KEY BLOCK-----"
+
+KYC_API_KEY=disabled
diff --git a/scripts/cvat/initdb/create-dbs.sql b/scripts/cvat/initdb/create-dbs.sql
new file mode 100644
index 0000000000..3b5f93e98e
--- /dev/null
+++ b/scripts/cvat/initdb/create-dbs.sql
@@ -0,0 +1,4 @@
+CREATE DATABASE "reputation-oracle";
+CREATE DATABASE "exchange-oracle";
+CREATE DATABASE "recording-oracle";
+CREATE DATABASE "job-launcher";
diff --git a/yarn.lock b/yarn.lock
index e77a6b67f3..6c76e2b646 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1188,7 +1188,7 @@
     core-js-pure "^3.30.2"
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.9", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.25.6", "@babel/runtime@^7.25.7", "@babel/runtime@^7.26.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.9", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.25.7", "@babel/runtime@^7.26.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
   integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
@@ -2007,11 +2007,6 @@
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.1.0.tgz#ab629b2c662457022d2d6a29854b8dc8ba538c47"
   integrity sha512-zKZR3kf1G0noIes1frLfOHP5EXVVm0M7sV/l9f/AaYf+M/DId35FO4LkigWjqWYjTJZGgplhdv4cB+ssvCqr5A==
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@gerrit0/mini-shiki@^1.24.0":
   version "1.24.1"
   resolved "https://registry.yarnpkg.com/@gerrit0/mini-shiki/-/mini-shiki-1.24.1.tgz#60ef10f4e2cfac7a9223e10b88c128438aa44fd8"
@@ -3056,12 +3051,13 @@
     "@mui/utils" "^5.16.8"
     prop-types "^15.8.1"
 
-"@mui/styled-engine-sc@6.1.3":
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine-sc/-/styled-engine-sc-6.1.3.tgz#f7f7db4c0e9d4c9a0d076060c99e47744bd2659b"
-  integrity sha512-Y+BZHQxygyKklawo9eMilthFALQpndcfDdEz0LpoZmkvVtWBD3kAPCyYeSAlqFRFQ++MdiQWlWY8O1R9ORuxJg==
+"@mui/styled-engine-sc@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine-sc/-/styled-engine-sc-6.4.0.tgz#70503295703c350c1b4ac7c97b844757049a6804"
+  integrity sha512-DkR/10Zn+/uL9mqZS+YA/vyWuz/zpnBGSDv8IWE7kqdFHRAnVSzz70tBffAiBNMuHKr+0r5dLnvOW9xfz6u6/g==
   dependencies:
-    "@babel/runtime" "^7.25.6"
+    "@babel/runtime" "^7.26.0"
+    "@types/hoist-non-react-statics" "^3.3.6"
     csstype "^3.1.3"
     hoist-non-react-statics "^3.3.2"
     prop-types "^15.8.1"
@@ -3249,15 +3245,15 @@
   integrity sha512-znJ9Y4S8ZDVY+j4doWAJ8EuuVO7SkQN3yOBmzxbGaXbvcSwFDAdGJ+OMCg52NdzIO4tQoN4pYKx8W6M0ArfFRQ==
 
 "@nestjs/platform-express@^10.3.10":
-  version "10.4.11"
-  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-10.4.11.tgz#5c80ae93dda45c3bac146bc560e0307747661b9a"
-  integrity sha512-YjhoIOdCbpxy3p5Em2pqYsUY+5cpyocguCzMI91qh41/jTAUzBD25K+hAiMyENZXEkDyscoF8OajyZvWm1ihdQ==
+  version "10.4.15"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-10.4.15.tgz#117fe7470c2b93e4ac07687b7fa604a17ca240c5"
+  integrity sha512-63ZZPkXHjoDyO7ahGOVcybZCRa7/Scp6mObQKjcX/fTEq1YJeU75ELvMsuQgc8U2opMGOBD7GVuc4DV0oeDHoA==
   dependencies:
     body-parser "1.20.3"
     cors "2.8.5"
-    express "4.21.1"
+    express "4.21.2"
     multer "1.4.4-lts.1"
-    tslib "2.7.0"
+    tslib "2.8.1"
 
 "@nestjs/schedule@^4.0.1":
   version "4.1.1"
@@ -3278,7 +3274,7 @@
     jsonc-parser "3.3.1"
     pluralize "8.0.0"
 
-"@nestjs/serve-static@^4.0.1":
+"@nestjs/serve-static@^4.0.1", "@nestjs/serve-static@^4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@nestjs/serve-static/-/serve-static-4.0.2.tgz#f003bbd90922bdc73d0261edacf001dfef174c96"
   integrity sha512-cT0vdWN5ar7jDI2NKbhf4LcwJzU4vS5sVpMkVrHuyLcltbrz6JdGi1TfIMMatP2pNiq5Ie/uUdPSFDVaZX/URQ==
@@ -3425,53 +3421,53 @@
   resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
   integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
 
-"@nomicfoundation/edr-darwin-arm64@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.6.5.tgz#37a31565d7ef42bed9028ac44aed82144de30bd1"
-  integrity sha512-A9zCCbbNxBpLgjS1kEJSpqxIvGGAX4cYbpDYCU2f3jVqOwaZ/NU761y1SvuCRVpOwhoCXqByN9b7HPpHi0L4hw==
+"@nomicfoundation/edr-darwin-arm64@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.7.0.tgz#2be3338a61508ed1d24326c82b9aa9224a844dd7"
+  integrity sha512-vAH20oh4GaSB/iQFTRcoO8jLc0CLd9XuLY9I7vtcqZWAiM4U1J4Y8cu67PWmtxbvUQOqXR7S6FtAr8/AlWm14g==
 
-"@nomicfoundation/edr-darwin-x64@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.6.5.tgz#3252f6e86397af460b7a480bfe1b889464d75b89"
-  integrity sha512-x3zBY/v3R0modR5CzlL6qMfFMdgwd6oHrWpTkuuXnPFOX8SU31qq87/230f4szM+ukGK8Hi+mNq7Ro2VF4Fj+w==
+"@nomicfoundation/edr-darwin-x64@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.7.0.tgz#d2f782fc43bcae1c9aca3130aca6aa2a964e8559"
+  integrity sha512-WHDdIrPvLlgXQr2eKypBM5xOZAwdxhDAEQIvEMQL8tEEm2qYW2bliUlssBPrs8E3bdivFbe1HizImslMAfU3+g==
 
-"@nomicfoundation/edr-linux-arm64-gnu@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.6.5.tgz#e7dc2934920b6cfabeb5ee7a5e26c8fb0d4964ac"
-  integrity sha512-HGpB8f1h8ogqPHTyUpyPRKZxUk2lu061g97dOQ/W4CxevI0s/qiw5DB3U3smLvSnBHKOzYS1jkxlMeGN01ky7A==
+"@nomicfoundation/edr-linux-arm64-gnu@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.7.0.tgz#48b156744989acc8e6b0b754158a26e10ad865ed"
+  integrity sha512-WXpJB54ukz1no7gxCPXVEw9pgl/9UZ/WO3l1ctyv/T7vOygjqA4SUd6kppTs6MNXAuTiisPtvJ/fmvHiMBLrsw==
 
-"@nomicfoundation/edr-linux-arm64-musl@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.6.5.tgz#00459cd53e9fb7bd5b7e32128b508a6e89079d89"
-  integrity sha512-ESvJM5Y9XC03fZg9KaQg3Hl+mbx7dsSkTIAndoJS7X2SyakpL9KZpOSYrDk135o8s9P9lYJdPOyiq+Sh+XoCbQ==
+"@nomicfoundation/edr-linux-arm64-musl@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.7.0.tgz#60351352ec26704fed8a232430bf3793d17c29cd"
+  integrity sha512-1iZYOcEgc+zJI7JQrlAFziuy9sBz1WgnIx3HIIu0J7lBRZ/AXeHHgATb+4InqxtEx9O3W8A0s7f11SyFqJL4Aw==
 
-"@nomicfoundation/edr-linux-x64-gnu@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.6.5.tgz#5c9e4e2655caba48e0196977cba395bbde6fe97d"
-  integrity sha512-HCM1usyAR1Ew6RYf5AkMYGvHBy64cPA5NMbaeY72r0mpKaH3txiMyydcHibByOGdQ8iFLWpyUdpl1egotw+Tgg==
+"@nomicfoundation/edr-linux-x64-gnu@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.7.0.tgz#a7b056bfd46ccfde4d55c9601da5a410c2fce40f"
+  integrity sha512-wSjC94WcR5MM8sg9w3OsAmT6+bbmChJw6uJKoXR3qscps/jdhjzJWzfgT0XGRq3XMUfimyafW2RWOyfX3ouhrQ==
 
-"@nomicfoundation/edr-linux-x64-musl@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.6.5.tgz#9c220751b66452dc43a365f380e1e236a0a8c5a9"
-  integrity sha512-nB2uFRyczhAvWUH7NjCsIO6rHnQrof3xcCe6Mpmnzfl2PYcGyxN7iO4ZMmRcQS7R1Y670VH6+8ZBiRn8k43m7A==
+"@nomicfoundation/edr-linux-x64-musl@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.7.0.tgz#0fe9f5ace05072e845f71c8fbd28e57798dd6ab5"
+  integrity sha512-Us22+AZ7wkG1mZwxqE4S4ZcuwkEA5VrUiBOJSvKHGOgy6vFvB/Euh5Lkp4GovwjrtiXuvyGO2UmtkzymZKDxZw==
 
-"@nomicfoundation/edr-win32-x64-msvc@0.6.5":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.6.5.tgz#90d3ac2a6a8a687522bda5ff2e92dd97e68126ea"
-  integrity sha512-B9QD/4DSSCFtWicO8A3BrsnitO1FPv7axB62wq5Q+qeJ50yJlTmyeGY3cw62gWItdvy2mh3fRM6L1LpnHiB77A==
+"@nomicfoundation/edr-win32-x64-msvc@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.7.0.tgz#f1b9a0a643db8dffcf5edb827c18e1cef25c4367"
+  integrity sha512-HAry0heTsWkzReVtjHwoIq3BgFCvXpVhJ5qPmTnegZGsr/KxqvMmHyDMifzKao4bycU8yrpTSyOiAJt27RWjzQ==
 
-"@nomicfoundation/edr@^0.6.4":
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr/-/edr-0.6.5.tgz#b3b1ebcdd0148cfe67cca128e7ebe8092e200359"
-  integrity sha512-tAqMslLP+/2b2sZP4qe9AuGxG3OkQ5gGgHE4isUuq6dUVjwCRPFhAOhpdFl+OjY5P3yEv3hmq9HjUGRa2VNjng==
+"@nomicfoundation/edr@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr/-/edr-0.7.0.tgz#175cb8a81eac585dc76ad41585c908542acb9383"
+  integrity sha512-+Zyu7TE47TGNcPhOfWLPA/zISs32WDMXrhSWdWYyPHDVn/Uux5TVuOeScKb0BR/R8EJ+leR8COUF/EGxvDOVKg==
   dependencies:
-    "@nomicfoundation/edr-darwin-arm64" "0.6.5"
-    "@nomicfoundation/edr-darwin-x64" "0.6.5"
-    "@nomicfoundation/edr-linux-arm64-gnu" "0.6.5"
-    "@nomicfoundation/edr-linux-arm64-musl" "0.6.5"
-    "@nomicfoundation/edr-linux-x64-gnu" "0.6.5"
-    "@nomicfoundation/edr-linux-x64-musl" "0.6.5"
-    "@nomicfoundation/edr-win32-x64-msvc" "0.6.5"
+    "@nomicfoundation/edr-darwin-arm64" "0.7.0"
+    "@nomicfoundation/edr-darwin-x64" "0.7.0"
+    "@nomicfoundation/edr-linux-arm64-gnu" "0.7.0"
+    "@nomicfoundation/edr-linux-arm64-musl" "0.7.0"
+    "@nomicfoundation/edr-linux-x64-gnu" "0.7.0"
+    "@nomicfoundation/edr-linux-x64-musl" "0.7.0"
+    "@nomicfoundation/edr-win32-x64-msvc" "0.7.0"
 
 "@nomicfoundation/ethereumjs-common@4.0.4":
   version "4.0.4"
@@ -3647,22 +3643,6 @@
     lru-cache "^10.0.1"
     socks-proxy-agent "^8.0.3"
 
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
 "@npmcli/fs@^3.1.0":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
@@ -3670,22 +3650,6 @@
   dependencies:
     semver "^7.3.5"
 
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/redact@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/redact/-/redact-2.0.1.tgz#95432fd566e63b35c04494621767a4312c316762"
@@ -5061,11 +5025,6 @@
     "@testing-library/dom" "^10.0.0"
     "@types/react-dom" "^18.0.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
@@ -5415,10 +5374,10 @@
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
   integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
 
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
-  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
+"@types/hoist-non-react-statics@^3.3.1", "@types/hoist-non-react-statics@^3.3.6":
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz#6bba74383cdab98e8db4e20ce5b4a6b98caed010"
+  integrity sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
@@ -5495,7 +5454,7 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/jsonwebtoken@*":
+"@types/jsonwebtoken@*", "@types/jsonwebtoken@^9.0.7":
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.7.tgz#e49b96c2b29356ed462e9708fc73b833014727d2"
   integrity sha512-ugo316mmTYBl2g81zDFnZ7cfxlut3o+/EQdaP7J8QN2kY6lJ22hmQYCK5EHcJHbrW+dkCGSCPgbG8JtYj6qSrg==
@@ -5521,6 +5480,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
   integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
 
+"@types/lodash@^4.17.14":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff"
+  integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==
+
 "@types/long@^4.0.0", "@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
@@ -5556,11 +5520,6 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/minimist@^1.2.0":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
-  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
-
 "@types/mocha@^10.0.8":
   version "10.0.10"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.10.tgz#91f62905e8d23cbd66225312f239454a23bebfa0"
@@ -5860,14 +5819,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/xml2js@0.4.13":
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.13.tgz#219134d550c21e2f1d7b0e2fbb9174144c6053ed"
-  integrity sha512-nuT42GzgoUa4zZgBoF4d+Zqc12/FlVxXCT4xU6j3RfqTFVQWrUAClI/0sNJ5ImM9Wv6KB42KMG2xsVMn4cSBzA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/xml2js@^0.4.14":
+"@types/xml2js@0.4.14", "@types/xml2js@^0.4.14":
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.14.tgz#5d462a2a7330345e2309c6b549a183a376de8f9a"
   integrity sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==
@@ -6946,7 +6898,7 @@ aes-js@4.0.0-beta.5:
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873"
   integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -6960,13 +6912,6 @@ agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
   dependencies:
     debug "^4.3.4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
-  dependencies:
-    humanize-ms "^1.2.1"
-
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -7179,14 +7124,6 @@ are-we-there-yet@^2.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 arg@5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
@@ -7416,11 +7353,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==
-
 async-listen@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/async-listen/-/async-listen-3.0.0.tgz#2e5941390b7d8c753d4dbe94bc6aecbdde52ec5e"
@@ -7768,7 +7700,7 @@ bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@1.20.3, body-parser@^1.20.0, body-parser@^1.20.2:
+body-parser@1.20.3, body-parser@^1.20.0, body-parser@^1.20.2, body-parser@^1.20.3:
   version "1.20.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
   integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
@@ -8090,54 +8022,6 @@ cac@^6.7.14:
   resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
   integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
 
-cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
 cacache@^18.0.0:
   version "18.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5"
@@ -8196,15 +8080,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
-  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
-  dependencies:
-    camelcase "^5.3.1"
-    map-obj "^4.0.0"
-    quick-lru "^4.0.1"
-
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -8690,7 +8565,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.2, color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -9330,7 +9205,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@~4.4.0:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
   integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
@@ -9358,15 +9233,7 @@ debug@~4.3.1, debug@~4.3.2:
   dependencies:
     ms "^2.1.3"
 
-decamelize-keys@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
-  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
-  dependencies:
-    decamelize "^1.1.0"
-    map-obj "^1.0.0"
-
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
@@ -9831,7 +9698,7 @@ encodeurl@~2.0.0:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
 
-encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -10917,7 +10784,44 @@ express-rate-limit@^7.3.0:
   resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.4.1.tgz#90954ecbcde9e7ae7b5000325395f86991191d94"
   integrity sha512-KS3efpnpIDVIXopMc65EMbWbUht7qvTCdtCR2dD/IZmi9MIkopYESwyRqLgv8Pfu589+KqDqOdzJWW7AHoACeg==
 
-express@4.21.1, express@^4.21.0:
+express@4.21.2:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.20.3"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.7.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "2.0.0"
+    encodeurl "~2.0.0"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.3.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    merge-descriptors "1.0.3"
+    methods "~1.1.2"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.12"
+    proxy-addr "~2.0.7"
+    qs "6.13.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.19.0"
+    serve-static "1.16.2"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+express@^4.21.0:
   version "4.21.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
   integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
@@ -11374,7 +11278,7 @@ fs-jetpack@4.3.1:
     minimatch "^3.0.2"
     rimraf "^2.6.3"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -11438,20 +11342,6 @@ gauge@^3.0.0:
     strip-ansi "^6.0.1"
     wide-align "^1.1.2"
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 gaxios@^6.0.0, gaxios@^6.1.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb"
@@ -11463,13 +11353,6 @@ gaxios@^6.0.0, gaxios@^6.1.1:
     node-fetch "^2.6.9"
     uuid "^9.0.1"
 
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gcp-metadata@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.0.tgz#9b0dd2b2445258e7597f2024332d20611cbd6b8c"
@@ -11534,11 +11417,6 @@ get-port@^3.1.0:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
   integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==
-
 get-stdin@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
@@ -11614,7 +11492,7 @@ glob@10.4.5, glob@^10.2.2, glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@7.1.7, glob@~7.1.1:
+glob@7.1.7:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -11647,7 +11525,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.0, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -11659,7 +11537,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1, glob@^8.1.0:
+glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -11732,15 +11610,6 @@ globby@^11.0.3, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globule@^1.0.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.4.tgz#7c11c43056055a75a6e68294453c17f2796170fb"
-  integrity sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==
-  dependencies:
-    glob "~7.1.1"
-    lodash "^4.17.21"
-    minimatch "~3.0.2"
-
 gluegun@5.1.6, gluegun@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/gluegun/-/gluegun-5.2.0.tgz#88ba1f76f20e68a135557a4a4c8ea283291a7491"
@@ -11819,7 +11688,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -11936,11 +11805,6 @@ happy-dom@^12.9.1:
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
 
-hard-rejection@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
-  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-
 hardhat-abi-exporter@^2.10.1:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/hardhat-abi-exporter/-/hardhat-abi-exporter-2.10.1.tgz#b14884e233c73fe3f43360f014ad7fd6df4b6d25"
@@ -12014,14 +11878,14 @@ hardhat-gas-reporter@^2.0.2:
     sha1 "^1.1.1"
     viem "2.7.14"
 
-hardhat@^2.22.10:
-  version "2.22.16"
-  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.16.tgz#6cf3413f63b14770f863f35452da891ac2bd50cb"
-  integrity sha512-d52yQZ09u0roL6GlgJSvtknsBtIuj9JrJ/U8VMzr/wue+gO5v2tQayvOX6llerlR57Zw2EOTQjLAt6RpHvjwHA==
+hardhat@^2.22.18:
+  version "2.22.18"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.18.tgz#e299a26a67b521bbb225370eb47a032d4e097e3a"
+  integrity sha512-2+kUz39gvMo56s75cfLBhiFedkQf+gXdrwCcz4R/5wW0oBdwiyfj2q9BIkMoaA0WIGYYMU2I1Cc4ucTunhfjzw==
   dependencies:
     "@ethersproject/abi" "^5.1.2"
     "@metamask/eth-sig-util" "^4.0.0"
-    "@nomicfoundation/edr" "^0.6.4"
+    "@nomicfoundation/edr" "^0.7.0"
     "@nomicfoundation/ethereumjs-common" "4.0.4"
     "@nomicfoundation/ethereumjs-tx" "5.0.4"
     "@nomicfoundation/ethereumjs-util" "9.0.4"
@@ -12211,13 +12075,6 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 hosted-git-info@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
@@ -12261,7 +12118,7 @@ http-basic@^8.1.1:
     http-response-object "^3.0.1"
     parse-cache-control "^1.0.1"
 
-http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -12277,15 +12134,6 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
 http-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@@ -12346,13 +12194,6 @@ human-signals@^5.0.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
   integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
 husky@^9.1.6:
   version "9.1.7"
   resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d"
@@ -12469,11 +12310,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -12761,7 +12597,7 @@ is-callable@^1.1.3, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.1.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.5.0:
+is-core-module@^2.1.0, is-core-module@^2.13.0, is-core-module@^2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
   integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
@@ -12909,11 +12745,6 @@ is-path-inside@^3.0.3:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
-
 is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -13662,11 +13493,6 @@ joi@^17.13.3:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
-js-base64@^2.4.9:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-
 js-cookie@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
@@ -13907,7 +13733,7 @@ jsonschema@^1.2.4, jsonschema@^1.4.1:
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
   integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
 
-jsonwebtoken@9.0.2, jsonwebtoken@^9.0.0:
+jsonwebtoken@9.0.2, jsonwebtoken@^9.0.0, jsonwebtoken@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
   integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
@@ -13993,7 +13819,7 @@ keyvaluestorage-interface@^1.0.0:
   resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff"
   integrity sha512-8t6Q3TclQ4uZynJY9IGr2+SsIGwK9JHcO6ootkHCGA0CrQCRy+VkouYNO2xicET6b9al7QKzpebNow+gkpCL8g==
 
-kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -14411,18 +14237,6 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
 lru_map@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
@@ -14476,28 +14290,6 @@ make-error@^1.1.1, make-error@^1.3.6:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^10.0.4:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
 make-fetch-happen@^13.0.0:
   version "13.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
@@ -14516,28 +14308,6 @@ make-fetch-happen@^13.0.0:
     promise-retry "^2.0.1"
     ssri "^10.0.0"
 
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -14545,16 +14315,6 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
-
-map-obj@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
-  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
-
 markdown-it@^14.1.0:
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
@@ -14586,7 +14346,7 @@ matchstick-as@^0.6.0:
   dependencies:
     wabt "1.0.24"
 
-material-react-table@^3.0.1:
+material-react-table@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-react-table/-/material-react-table-3.0.1.tgz#a6d592a1e370acfd453c37f1deaa870c47e7bf5b"
   integrity sha512-RP+bnpsOAH5j6zwP04u9HB37fyqbd6mVv9mkT4IUJC3e3gEqixZmkNdJMVM1ZVHoq7yIaM381xf22mpBVe0IaA==
@@ -14627,24 +14387,6 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
 
-meow@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
-  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    camelcase-keys "^6.2.2"
-    decamelize "^1.2.0"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "4.1.0"
-    normalize-package-data "^3.0.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.18.0"
-    yargs-parser "^20.2.3"
-
 merge-descriptors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
@@ -14814,22 +14556,6 @@ minimatch@^9.0.4, minimatch@^9.0.5:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@~3.0.2:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
-  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist-options@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
-  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
-  dependencies:
-    arrify "^1.0.1"
-    is-plain-obj "^1.1.0"
-    kind-of "^6.0.3"
-
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -14875,13 +14601,6 @@ minio@^7.1.3:
     web-encoding "^1.1.5"
     xml2js "^0.5.0"
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
 minipass-collect@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
@@ -14889,28 +14608,6 @@ minipass-collect@^2.0.1:
   dependencies:
     minipass "^7.0.3"
 
-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
 minipass-fetch@^3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
@@ -14929,7 +14626,7 @@ minipass-flush@^1.0.5:
   dependencies:
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -14943,7 +14640,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@^3.0.0:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
@@ -14965,7 +14662,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -15070,7 +14767,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -15150,11 +14847,6 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.17.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
-  integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
-
 nanoid@^3.0.2, nanoid@^3.1.20, nanoid@^3.1.23, nanoid@^3.3.7:
   version "3.3.8"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
@@ -15206,7 +14898,7 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@^0.6.3:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
   integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
@@ -15298,22 +14990,6 @@ node-gyp-build@^4.2.0, node-gyp-build@^4.2.2, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
   integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
 
-node-gyp@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -15324,26 +15000,6 @@ node-releases@^2.0.18:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-node-sass@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-9.0.0.tgz#c21cd17bd9379c2d09362b3baf2cbf089bce08ed"
-  integrity sha512-yltEuuLrfH6M7Pq2gAj5B6Zm7m+gdZoG66wTqG6mIZV/zijq3M2OO2HswtT6oBspPyFhHDcaxWpsBm0fRNDHPg==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^4.1.2"
-    cross-spawn "^7.0.3"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    lodash "^4.17.15"
-    make-fetch-happen "^10.0.4"
-    meow "^9.0.0"
-    nan "^2.17.0"
-    node-gyp "^8.4.1"
-    sass-graph "^4.0.1"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^2.2.1"
-
 node-stdlib-browser@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/node-stdlib-browser/-/node-stdlib-browser-1.3.0.tgz#6e04d149f9abfc345a2271b2820a75df0f9cd7de"
@@ -15406,16 +15062,6 @@ normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
-  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    is-core-module "^2.5.0"
-    semver "^7.3.4"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -15484,16 +15130,6 @@ npmlog@^5.0.1:
     gauge "^3.0.0"
     set-blocking "^2.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
 number-to-bn@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0"
@@ -15997,6 +15633,11 @@ path-to-regexp@0.1.10:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
   integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
+
 path-to-regexp@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.2.5.tgz#0b426991e387fc4c675de23557f358715eb66fb0"
@@ -16415,11 +16056,6 @@ promise-coalesce@^1.1.2:
   resolved "https://registry.yarnpkg.com/promise-coalesce/-/promise-coalesce-1.1.2.tgz#5d3bc4d0b2cf2e41e9df7cbeb6519b2a09459e3d"
   integrity sha512-zLaJ9b8hnC564fnJH6NFSOGZYYdzrAJn2JUUIwzoQb32fG2QAakpDNM+CZo1km6keXkRXRM+hml1BFAPVnPkxg==
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -16662,11 +16298,6 @@ quick-format-unescaped@^4.0.3:
   resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
   integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
 
-quick-lru@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
-  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-
 radix3@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0"
@@ -16778,10 +16409,10 @@ react-native-fetch-api@^3.0.0:
   dependencies:
     p-defer "^3.0.0"
 
-react-number-format@^5.3.4, react-number-format@^5.4.0:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-5.4.2.tgz#aec282241f36cee31da13dc5e0f364c0fc6902ab"
-  integrity sha512-cg//jVdS49PYDgmcYoBnMMHl4XNTMuV723ZnHD2aXYtWWWqbVF3hjQ8iB+UZEuXapLbeA8P8H+1o6ZB1lcw3vg==
+react-number-format@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-5.4.3.tgz#e634df907da7742faf597afab3f25f9a59689d60"
+  integrity sha512-VCY5hFg/soBighAoGcdE+GagkJq0230qN6jcS5sp8wQX1qy1fYN/RX7/BXkrs0oyzzwqR8/+eSUrqXbGeywdUQ==
 
 react-redux@^9.1.0:
   version "9.1.2"
@@ -16865,7 +16496,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stre
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.8:
+readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -17402,27 +17033,6 @@ safe-stable-stringify@^2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e"
-  integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.17.11"
-    scss-tokenizer "^0.4.3"
-    yargs "^17.2.1"
-
-sass@^1.78.0:
-  version "1.81.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.81.0.tgz#a9010c0599867909dfdbad057e4a6fbdd5eec941"
-  integrity sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==
-  dependencies:
-    chokidar "^4.0.0"
-    immutable "^5.0.2"
-    source-map-js ">=0.6.2 <2.0.0"
-  optionalDependencies:
-    "@parcel/watcher" "^2.4.1"
-
 sass@^1.83.4:
   version "1.83.4"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.4.tgz#5ccf60f43eb61eeec300b780b8dcb85f16eec6d1"
@@ -17487,14 +17097,6 @@ scrypt-js@3.0.1, scrypt-js@^3.0.0:
   resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312"
   integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==
 
-scss-tokenizer@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c"
-  integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==
-  dependencies:
-    js-base64 "^2.4.9"
-    source-map "^0.7.3"
-
 secp256k1@^4.0.1:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.4.tgz#58f0bfe1830fe777d9ca1ffc7574962a8189f8ab"
@@ -17514,9 +17116,9 @@ secp256k1@^5.0.1:
     node-gyp-build "^4.2.0"
 
 "semver@2 || 3 || 4 || 5", semver@7.3.5, semver@7.4.0, semver@^5.5.0, semver@^6.0.0, semver@^6.3.0, semver@^6.3.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.0.tgz#9c6fe61d0c6f9fa9e26575162ee5a9180361b09c"
+  integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==
 
 send@0.19.0:
   version "0.19.0"
@@ -17789,24 +17391,6 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
 socks-proxy-agent@^8.0.3:
   version "8.0.4"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz#9071dca17af95f483300316f4b063578fa0db08c"
@@ -17816,7 +17400,7 @@ socks-proxy-agent@^8.0.3:
     debug "^4.3.4"
     socks "^2.8.3"
 
-socks@^2.6.2, socks@^2.8.3:
+socks@^2.8.3:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
   integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
@@ -17914,7 +17498,7 @@ source-map-support@^0.5.13, source-map-support@^0.5.20, source-map-support@~0.5.
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.7.4, source-map@^0.7.3, source-map@^0.7.4:
+source-map@0.7.4, source-map@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
@@ -18011,20 +17595,6 @@ ssri@^10.0.0:
   dependencies:
     minipass "^7.0.3"
 
-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stable-hash@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7"
@@ -18059,13 +17629,6 @@ std-env@^3.5.0, std-env@^3.7.0:
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.8.0.tgz#b56ffc1baf1a29dcc80a3bdf11d7fca7c315e7d5"
   integrity sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
@@ -18564,7 +18127,7 @@ tar-stream@^1.1.2:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.1.0, tar@^6.1.11:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -18860,16 +18423,6 @@ tree-kill@1.2.2, tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-trim-newlines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
-  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
-
-"true-case-path@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf"
-  integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==
-
 ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.2.tgz#a6a6dff26117ac7965624fc118525971edc6a82a"
@@ -19018,7 +18571,7 @@ tslib@2.7.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
   integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.0, tslib@^2.6.2, tslib@^2.7.0, tslib@^2.8.1:
+tslib@2.8.1, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.0, tslib@^2.6.2, tslib@^2.7.0, tslib@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -19079,11 +18632,6 @@ type-detect@^4.0.0, type-detect@^4.1.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c"
   integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==
 
-type-fest@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
-  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -19360,20 +18908,6 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
 unique-filename@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
@@ -19381,20 +18915,6 @@ unique-filename@^3.0.0:
   dependencies:
     unique-slug "^4.0.0"
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-slug@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
@@ -20258,7 +19778,7 @@ which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.2:
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
-which@2.0.2, which@^2.0.1, which@^2.0.2:
+which@2.0.2, which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -20280,7 +19800,7 @@ why-is-node-running@^2.2.2:
     siginfo "^2.0.0"
     stackback "0.0.2"
 
-wide-align@^1.1.2, wide-align@^1.1.5:
+wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -20477,7 +19997,7 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+yargs-parser@^20.2.2, yargs-parser@^20.2.9:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
@@ -20522,7 +20042,7 @@ yargs@^16.0.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.2.1, yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
+yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==