diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
index 7db976b3b..42ab0b73a 100644
--- a/contracts/hardhat.config.ts
+++ b/contracts/hardhat.config.ts
@@ -42,7 +42,7 @@ const config: HardhatUserConfig = {
       url: process.env.JSONRPC_HTTP_URL || 'http://127.0.0.1:8545',
       accounts,
     },
-    xdai: {
+    gnosis: {
       url: process.env.JSONRPC_HTTP_URL || 'https://rpc.xdaichain.com',
       timeout: 60000,
       accounts,
diff --git a/docs/brightid.md b/docs/brightid.md
index ef381a401..c1d9c004d 100644
--- a/docs/brightid.md
+++ b/docs/brightid.md
@@ -29,7 +29,7 @@ VUE_APP_BRIGHTID_CONTEXT={CONTEXT}
 BRIGHTID_CONTEXT={CONTEXT}
 ```
 
-Note: the BrightID context is specific to the BrightID network - it's independent from the Ethereum network you choose to run the app on. It refers to the BrightID app context where you want to burn sponsorship tokens. For instance, you could use the production `clr.fund` context on xDAI or Arbitrum (or any network).
+Note: the BrightID context is specific to the BrightID network - it's independent from the Ethereum network you choose to run the app on. It refers to the BrightID app context where you want to burn sponsorship tokens. For instance, you could use the production `clr.fund` context on Gnosis Chain (formerly xDai) or Arbitrum (or any network).
 
 [Learn more about context in the BrightID docs](https://dev.brightid.org/docs/guides/ZG9jOjQxNTE1NDU-basic-integration).
 
diff --git a/subgraph/config/xdai.json b/subgraph/config/gnosis.json
similarity index 85%
rename from subgraph/config/xdai.json
rename to subgraph/config/gnosis.json
index 5021104c0..7dede2e05 100644
--- a/subgraph/config/xdai.json
+++ b/subgraph/config/gnosis.json
@@ -1,5 +1,5 @@
 {
-  "network": "xdai",
+  "network": "gnosis",
   "address": "0x549F91A93c94358C5f5380D7ABF23E1340CfF2db",
   "factoryStartBlock": 15217676,
   "recipientRegistryStartBlock": 0
diff --git a/subgraph/package.json b/subgraph/package.json
index 66ed7fcec..d1b56adba 100644
--- a/subgraph/package.json
+++ b/subgraph/package.json
@@ -17,7 +17,7 @@
     "prepare:hardhat": "mustache config/hardhat.json subgraph.template.yaml > subgraph.yaml",
     "prepare:arbitrum": "mustache config/arbitrum.json subgraph.template.yaml > subgraph.yaml",
     "prepare:arbitrum-rinkeby": "mustache config/arbitrum-rinkeby.json subgraph.template.yaml > subgraph.yaml",
-    "prepare:xdai": "mustache config/xdai.json subgraph.template.yaml > subgraph.yaml",
+    "prepare:gnosis": "mustache config/gnosis.json subgraph.template.yaml > subgraph.yaml",
     "codegen": "graph codegen",
     "lint:js": "eslint 'src/*.ts'",
     "lint": "yarn lint:js",
diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml
index 6072a6e6d..c1e4c5a51 100644
--- a/subgraph/subgraph.yaml
+++ b/subgraph/subgraph.yaml
@@ -6,7 +6,7 @@ schema:
 dataSources:
   - kind: ethereum/contract
     name: FundingRoundFactory
-    network: xdai
+    network: gnosis
     source:
       address: '0x549F91A93c94358C5f5380D7ABF23E1340CfF2db'
       abi: FundingRoundFactory
@@ -52,7 +52,7 @@ dataSources:
       file: ./src/FundingRoundFactoryMapping.ts
   - kind: ethereum/contract
     name: OptimisticRecipientRegistry
-    network: xdai
+    network: gnosis
     source:
       abi: OptimisticRecipientRegistry
       startBlock: 15217676
@@ -77,7 +77,7 @@ dataSources:
 templates:
   - name: FundingRound
     kind: ethereum/contract
-    network: xdai
+    network: gnosis
     source:
       abi: FundingRound
     mapping:
@@ -113,7 +113,7 @@ templates:
       file: ./src/FundingRoundMapping.ts
   - name: OptimisticRecipientRegistry
     kind: ethereum/contract
-    network: xdai
+    network: gnosis
     source:
       abi: OptimisticRecipientRegistry
     mapping:
@@ -136,7 +136,7 @@ templates:
       file: ./src/OptimisticRecipientRegistryMapping.ts
   - name: BrightIdUserRegistry
     kind: ethereum/contract
-    network: xdai
+    network: gnosis
     source:
       abi: BrightIdUserRegistry
     mapping:
@@ -159,7 +159,7 @@ templates:
       file: ./src/BrightIdUserRegistryMapping.ts
   - name: MACI
     kind: ethereum/contract
-    network: xdai
+    network: gnosis
     source:
       abi: MACI
     mapping:
diff --git a/vue-app/src/assets/gnosis-chain.svg b/vue-app/src/assets/gnosis-chain.svg
new file mode 100644
index 000000000..4aede5fa2
--- /dev/null
+++ b/vue-app/src/assets/gnosis-chain.svg
@@ -0,0 +1,6 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M100 50C100 77.6142 77.6142 100 50 100C22.3858 100 0 77.6142 0 50C0 40.5792 2.60545 31.7669 7.13507 24.2445L15.3396 32.4495C9.21099 39.6897 9.56064 50.5427 16.3886 57.3706C23.2163 64.1983 34.0687 64.5482 41.309 58.4203L50.0278 67.1397L58.7404 58.4266C65.9806 64.548 76.828 64.196 83.6533 57.3706C90.4789 50.545 90.8307 39.6971 84.7086 32.4569L92.8858 24.2792C97.4026 31.7941 100 40.5937 100 50Z" fill="#06795D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M90.0668 20.0842C90.0182 20.0192 89.9694 19.9544 89.9205 19.8896L49.9991 59.811L10.0787 19.8906C19.2057 7.80838 33.691 0 50 0C66.3959 0 80.9486 7.89185 90.0668 20.0842ZM80.8068 19.3913L50.0286 50.1695L19.2334 19.3743C27.0967 11.4721 37.9829 6.58073 50.0117 6.58073C62.049 6.58073 72.9422 11.4791 80.8068 19.3913Z" fill="#06795D"/>
+<path d="M62.6633 54.5035L80.7865 36.3793C84.7648 41.4448 84.4198 48.7995 79.7514 53.4679C75.0831 58.1362 67.7288 58.4814 62.6633 54.5035Z" fill="#06795D"/>
+<path d="M19.2575 36.3676L37.3911 54.5022C32.3229 58.4885 24.9599 58.1452 20.287 53.4723C15.6139 48.7992 15.2707 41.4358 19.2575 36.3676Z" fill="#06795D"/>
+</svg>
diff --git a/vue-app/src/plugins/Web3/constants/chains.ts b/vue-app/src/plugins/Web3/constants/chains.ts
index 7d8538385..099d5bd0f 100644
--- a/vue-app/src/plugins/Web3/constants/chains.ts
+++ b/vue-app/src/plugins/Web3/constants/chains.ts
@@ -5,7 +5,7 @@ export enum ChainId {
   ARBITRUM_ONE = 42161,
   ARBITRUM_RINKEBY = 421611,
   OPTIMISM = 10,
-  XDAI = 100,
+  GNOSIS = 100,
   POLYGON = 137,
 }
 
@@ -86,15 +86,15 @@ export const CHAIN_INFO: ChainInfo = {
     rpcUrl: 'https://mainnet.optimism.io',
     bridge: 'https://gateway.optimism.io',
   },
-  [ChainId.XDAI]: {
-    label: 'xDai',
+  [ChainId.GNOSIS]: {
+    label: 'Gnosis Chain',
     currency: 'xDai',
     logo: 'xdai.svg',
     isLayer2: false,
-    explorer: 'https://blockscout.com/poa/xdai',
-    explorerLogo: 'xdai-explorer.svg',
+    explorer: 'https://blockscout.com/xdai/mainnet/',
+    explorerLogo: 'gnosis-chain.svg',
     explorerLabel: 'Blockscout',
-    rpcUrl: 'https://rpc.xdaichain.com/',
+    rpcUrl: 'https://rpc.xdaichain.com',
     bridge: 'https://bridge.xdaichain.com',
   },
   [ChainId.POLYGON]: {