diff --git a/charts/backend/Chart.yaml b/charts/backend/Chart.yaml
index 0cd7c9efd..fd677e5cb 100644
--- a/charts/backend/Chart.yaml
+++ b/charts/backend/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: backend
-version: 2.4.24
-appVersion: v2.4.23
+version: 2.4.25
+appVersion: v2.5.13
 kubeVersion: "^1.18.0-0"
 description: The StakeWise backend application.
 type: application
diff --git a/charts/backend/values.yaml b/charts/backend/values.yaml
index 2e931674a..0f122f510 100644
--- a/charts/backend/values.yaml
+++ b/charts/backend/values.yaml
@@ -48,7 +48,7 @@ commonConf:
 image:
   registry: "europe-west4-docker.pkg.dev"
   repository: "stakewiselabs/private/backend"
-  tag: "v2.4.23"
+  tag: "v2.5.13"
   pullPolicy: IfNotPresent
   pullSecrets: [ ]
 
@@ -322,20 +322,20 @@ celery:
     ## Graph
     ##
     stakewiseSubgraphUrls:
-      mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet"
+      mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/stakewise"
       goerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-goerli"
       permGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli"
-      gnosis: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis"
+      gnosis: "https://graph-gno.stakewise.io/subgraphs/name/stakewise/stakewise"
       harbourMainnet: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-harbour-mainnet"
       harbourGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli"
     uniswapV3SubgraphUrls:
-      mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet"
+      mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3"
       goerli: "https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-goerli"
     ethereumSubgraphUrls:
-      mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet"
+      mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/ethereum"
       goerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
       permGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
-      gnosis: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-gnosis"
+      gnosis: "https://graph-gno.stakewise.io/subgraphs/name/stakewise/ethereum"
       harbourMainnet: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet"
       harbourGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
 
diff --git a/charts/oracle/Chart.yaml b/charts/oracle/Chart.yaml
index 6b4e36c38..8232be3e0 100644
--- a/charts/oracle/Chart.yaml
+++ b/charts/oracle/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: oracle
-version: 3.3.0
-appVersion: v3.3.0
+version: 3.3.1
+appVersion: v4.0.4
 kubeVersion: "^1.14.0-0"
 description: The StakeWise application for submitting off-chain data to smart contracts.
 type: application
diff --git a/charts/oracle/values.yaml b/charts/oracle/values.yaml
index 53fa17169..3b0ca7baf 100644
--- a/charts/oracle/values.yaml
+++ b/charts/oracle/values.yaml
@@ -83,27 +83,27 @@ settings:
 
   ## Graph
   ## Options:
-  ## mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet"
+  ## mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/stakewise"
   ## goerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-goerli"
   ## permGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli"
-  ## gnosis: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis"
+  ## gnosis: "https://graph-gno.stakewise.io/subgraphs/name/stakewise/stakewise"
   ## harbourMainnet: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-harbour-mainnet"
   ## harbourGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli"
-  stakewiseSubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/stakewise,https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet"
+  stakewiseSubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/stakewise"
 
   ## Options:
-  ## mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet"
+  ## mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3"
   ## goerli: "https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-goerli"
-  uniswapV3SubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3,https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet"
+  uniswapV3SubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3"
 
   ## Options:
-  ## mainnet: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet"
+  ## mainnet: "https://graph.stakewise.io/subgraphs/name/stakewise/ethereum"
   ## goerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
   ## permGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
-  ## gnosis: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-gnosis"
+  ## gnosis: "https://graph-gno.stakewise.io/subgraphs/name/stakewise/ethereum"
   ## harbourMainnet: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet"
   ## harbourGoerli: "https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli"
-  ethereumSubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/ethereum,https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet"
+  ethereumSubgraphUrls: "https://graph.stakewise.io/subgraphs/name/stakewise/ethereum"
 
   ## Credentials
   ##