diff --git a/.github/workflows/voting-subgraph-ci-cd.yml b/.github/workflows/voting-subgraph-ci-cd.yml
index 9793242f..786eaa25 100644
--- a/.github/workflows/voting-subgraph-ci-cd.yml
+++ b/.github/workflows/voting-subgraph-ci-cd.yml
@@ -34,13 +34,13 @@ jobs:
           path: '**/node_modules'
           key: yarn-${{ hashFiles('yarn.lock') }}
 
-      - name: Deploy rinkeby
+      - name: Deploy goerli
         if: github.ref == 'refs/heads/develop'
-        run: yarn deploy-rinkeby
+        run: yarn deploy-goerli
 
-      - name: Deploy rinkeby staging
+      - name: Deploy goerli staging
         if: github.ref == 'refs/heads/develop'
-        run: yarn deploy-rinkeby-staging
+        run: yarn deploy-goerli-staging
 
       - name: Deploy mainnet
         if: github.ref == 'refs/heads/master'
diff --git a/docs/advanced/app-subgraphs.md b/docs/advanced/app-subgraphs.md
index d623a916..14b761d6 100644
--- a/docs/advanced/app-subgraphs.md
+++ b/docs/advanced/app-subgraphs.md
@@ -92,4 +92,4 @@ As a rule of thumb, if your data source will be triggered by a base Aragon data
 
 ### My `callHandlers` aren’t working
 
-Unfortunately, [The Graph does not support callHandlers in Rinkeby](https://thegraph.com/docs/define-a-subgraph#call-handlers). For this reason, our templates avoid them altogether. In general, we prefer to code Subgraphs in a way that is compatible with all networks. Alternatively, if you have no other choice than to use this feature, consider hosting your own Subgraph.
+Unfortunately, [The Graph does not support callHandlers in Goerli](https://thegraph.com/docs/define-a-subgraph#call-handlers). For this reason, our templates avoid them altogether. In general, we prefer to code Subgraphs in a way that is compatible with all networks. Alternatively, if you have no other choice than to use this feature, consider hosting your own Subgraph.
diff --git a/docs/api-reference/types.md b/docs/api-reference/types.md
index 55bb818d..6e043d6b 100644
--- a/docs/api-reference/types.md
+++ b/docs/api-reference/types.md
@@ -16,7 +16,7 @@ Networkish can be a number, a string or an object.
 
 | Type                              | Description                                                    |
 | --------------------------------- | -------------------------------------------------------------- |
-| `"ethereum" | "rinkeby" | "xdai"` | Name of a network, from a selection (prefer using a chain ID). |
+| `"ethereum" | "goerli" | "xdai"` | Name of a network, from a selection (prefer using a chain ID). |
 
 ### As an object
 
diff --git a/docs/guides/getting-started.md b/docs/guides/getting-started.md
index b40190fc..6412758a 100644
--- a/docs/guides/getting-started.md
+++ b/docs/guides/getting-started.md
@@ -91,11 +91,11 @@ Aragon Connect connects to the Ethereum mainnet by default, but other networks a
 To do so, use the [Chain ID](https://chainid.network/) assigned to the network:
 
 ```javascript
-// Connect to the Rinkeby test network
-const org = await connect('example.aragonid.eth', 'thegraph', { network: 4 })
+// Connect to the Goerli test network
+const org = await connect('example.aragonid.eth', 'thegraph', { network: 5 })
 ```
 
-Note: other than the Ethereum main network \(default\), only [Rinkeby](https://docs.ethhub.io/using-ethereum/test-networks/#rinkeby) and [xDAI](https://www.xdaichain.com/) are supported by the `thegraph` connector at the moment.
+Note: other than the Ethereum main network \(default\), only [Goerli](https://docs.ethhub.io/using-ethereum/test-networks/#gorli) and [xDAI](https://www.xdaichain.com/) are supported by the `thegraph` connector at the moment.
 
 ## Fetching an app’s state
 
diff --git a/examples/list-balances-cli/package.json b/examples/list-balances-cli/package.json
index 3a4200d7..1834a857 100644
--- a/examples/list-balances-cli/package.json
+++ b/examples/list-balances-cli/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "start": "ts-node ./src/index.ts",
-    "start:rinkeby": "CHAIN_ID=4 ts-node ./src/index.ts"
+    "start:goerli": "CHAIN_ID=5 ts-node ./src/index.ts"
   },
   "devDependencies": {
     "ts-node": "^8.10.2",
diff --git a/examples/list-votes-cli/package.json b/examples/list-votes-cli/package.json
index 45d6869a..1e387460 100644
--- a/examples/list-votes-cli/package.json
+++ b/examples/list-votes-cli/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "start": "ts-node ./src/index.ts",
-    "start:rinkeby": "CHAIN_ID=4 ts-node ./src/index.ts"
+    "start:goerli": "CHAIN_ID=5 ts-node ./src/index.ts"
   },
   "devDependencies": {
     "ts-node": "^8.10.2",
diff --git a/examples/nodejs/src/create-org.ts b/examples/nodejs/src/create-org.ts
index 00181138..11037649 100644
--- a/examples/nodejs/src/create-org.ts
+++ b/examples/nodejs/src/create-org.ts
@@ -4,19 +4,19 @@ import { fetchRepo, getOrgAddress } from './helpers'
 const ARAGON_MNEMONIC =
   'explain tackle mirror kit van hammer degree position ginger unfair soup bonus'
 
-const MAIN_SUBGRAPH_RINKEBY =
-  'https://api.thegraph.com/subgraphs/name/aragon/aragon-rinkeby'
+const MAIN_SUBGRAPH_GOERLI =
+  'https://api.thegraph.com/subgraphs/name/aragon/aragon-goerli'
 
 const TEMPLATE_NAME = 'bare-template'
 
 async function main() {
   // fetch repo
-  const { lastVersion } = await fetchRepo(TEMPLATE_NAME, MAIN_SUBGRAPH_RINKEBY)
+  const { lastVersion } = await fetchRepo(TEMPLATE_NAME, MAIN_SUBGRAPH_GOERLI)
   const templateAddress = lastVersion.codeAddress
   const templateArtifact = JSON.parse(lastVersion.artifact)
 
   // create signer
-  const provider = ethers.getDefaultProvider('rinkeby')
+  const provider = ethers.getDefaultProvider('goerli')
   const wallet = ethers.Wallet.fromMnemonic(ARAGON_MNEMONIC)
   const signer = wallet.connect(provider)
 
diff --git a/examples/nodejs/src/subscriptions-low-level.ts b/examples/nodejs/src/subscriptions-low-level.ts
index 8996cfab..78ffe461 100644
--- a/examples/nodejs/src/subscriptions-low-level.ts
+++ b/examples/nodejs/src/subscriptions-low-level.ts
@@ -5,7 +5,7 @@ import { keepRunning } from './helpers'
 const DAO_ADDRESS = '0x059bcfbc477c46ab39d76c05b7b40f3a42e7de3b'
 const VOTING_APP_ADDRESS = '0xc73e86aab9d232495399d62fc80a36ae52952b81'
 const ALL_VOTING_SUBGRAPH_URL =
-  'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-rinkeby'
+  'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-goerli'
 
 async function main() {
   console.log('\nLow-level inspection of a voting app using subscriptions:')
@@ -32,7 +32,7 @@ async function main() {
       }
       console.log(JSON.stringify(results.data, null, 2))
       console.log(
-        `\nTry creating a new vote at https://rinkeby.aragon.org/#/${DAO_ADDRESS}/${VOTING_APP_ADDRESS}/`
+        `\nTry creating a new vote at https://goerli.aragon.org/#/${DAO_ADDRESS}/${VOTING_APP_ADDRESS}/`
       )
     }
   )
diff --git a/examples/nodejs/src/subscriptions-org.ts b/examples/nodejs/src/subscriptions-org.ts
index 21fb74c5..59ba971a 100644
--- a/examples/nodejs/src/subscriptions-org.ts
+++ b/examples/nodejs/src/subscriptions-org.ts
@@ -18,7 +18,7 @@ async function main() {
         console.log(permission)
       }
       console.log(
-        `\nTry creating or granting new permissions at https://rinkeby.aragon.org/#/${ORG_ADDRESS}/permissions/`
+        `\nTry creating or granting new permissions at https://goerli.aragon.org/#/${ORG_ADDRESS}/permissions/`
       )
     }
   )
diff --git a/examples/nodejs/src/subscriptions-voting.ts b/examples/nodejs/src/subscriptions-voting.ts
index 6133a887..fb499d8d 100644
--- a/examples/nodejs/src/subscriptions-voting.ts
+++ b/examples/nodejs/src/subscriptions-voting.ts
@@ -31,7 +31,7 @@ async function main() {
         })
 
       console.log(
-        `\nTry creating a new vote at https://rinkeby.aragon.org/#/${ORG_ADDRESS}/${VOTING_APP_ADDRESS}/\n`
+        `\nTry creating a new vote at https://goerli.aragon.org/#/${ORG_ADDRESS}/${VOTING_APP_ADDRESS}/\n`
       )
     }
   )
@@ -52,7 +52,7 @@ async function main() {
         console.log(cast)
       }
       console.log(
-        `\nTry casting a vote on https://rinkeby.aragon.org/#/${ORG_ADDRESS}/${VOTING_APP_ADDRESS}/vote/1 (You must first mint yourself a token in the Token Manager)\n`
+        `\nTry casting a vote on https://goerli.aragon.org/#/${ORG_ADDRESS}/${VOTING_APP_ADDRESS}/vote/1 (You must first mint yourself a token in the Token Manager)\n`
       )
     }
   )
diff --git a/examples/nodejs/src/voting-low-level.ts b/examples/nodejs/src/voting-low-level.ts
index da403d12..3816f591 100644
--- a/examples/nodejs/src/voting-low-level.ts
+++ b/examples/nodejs/src/voting-low-level.ts
@@ -3,7 +3,7 @@ import { GraphQLWrapper } from '@aragon/connect-thegraph'
 
 const VOTING_APP_ADDRESS = '0xc73e86aab9d232495399d62fc80a36ae52952b81'
 const ALL_VOTING_SUBGRAPH_URL =
-  'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-rinkeby'
+  'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-goerli'
 
 const QUERY = `
 query {
diff --git a/examples/nodejs/src/voting.ts b/examples/nodejs/src/voting.ts
index fa47e962..8e3b0140 100644
--- a/examples/nodejs/src/voting.ts
+++ b/examples/nodejs/src/voting.ts
@@ -5,11 +5,11 @@ type Env = { network: number; org: string; votingSubgraphUrl: string }
 
 const envs = new Map(
   Object.entries({
-    rinkeby: {
-      network: 4,
+    goerli: {
+      network: 5,
       org: 'gardens.aragonid.eth',
       votingSubgraphUrl:
-        'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-rinkeby',
+        'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-goerli',
     },
     mainnet: {
       network: 1,
diff --git a/examples/org-viewer-react/src/environment.ts b/examples/org-viewer-react/src/environment.ts
index 9abb8e24..0422fa28 100644
--- a/examples/org-viewer-react/src/environment.ts
+++ b/examples/org-viewer-react/src/environment.ts
@@ -25,9 +25,9 @@ const ENVIRONMENTS = new Map([
     },
   ],
   [
-    'rinkeby',
+    'goerli',
     {
-      chainId: 4,
+      chainId: 5,
       addresses: ['gardens.aragonid.eth'],
     },
   ],
diff --git a/examples/org-viewer-web/src/environment.ts b/examples/org-viewer-web/src/environment.ts
index 5ea84276..eb09afa0 100644
--- a/examples/org-viewer-web/src/environment.ts
+++ b/examples/org-viewer-web/src/environment.ts
@@ -18,9 +18,9 @@ const ENVIRONMENTS = new Map([
     },
   ],
   [
-    'rinkeby',
+    'goerli',
     {
-      chainId: 4,
+      chainId: 5,
       addresses: ['gardens.aragonid.eth'],
     },
   ],
diff --git a/packages/connect-agreement/src/thegraph/connector.ts b/packages/connect-agreement/src/thegraph/connector.ts
index 7590cb3e..6c5021b4 100644
--- a/packages/connect-agreement/src/thegraph/connector.ts
+++ b/packages/connect-agreement/src/thegraph/connector.ts
@@ -36,8 +36,8 @@ export function subgraphUrlFromChainId(chainId: number) {
   if (chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-agreement-mainnet'
   }
-  if (chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-agreement-rinkeby'
+  if (chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-agreement-goerli'
   }
   if (chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-agreement-xdai'
diff --git a/packages/connect-core/src/params.ts b/packages/connect-core/src/params.ts
index 9f70a9a2..bad9c754 100644
--- a/packages/connect-core/src/params.ts
+++ b/packages/connect-core/src/params.ts
@@ -5,9 +5,9 @@ export const NETWORKS = [
     ensAddress: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
   },
   {
-    chainId: 4,
-    name: 'rinkeby',
-    ensAddress: '0x98df287b6c145399aaa709692c8d308357bc085d',
+    chainId: 5,
+    name: 'goerli',
+    ensAddress: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
   },
   {
     chainId: 100,
diff --git a/packages/connect-core/src/types.ts b/packages/connect-core/src/types.ts
index 30c36730..4c6244b6 100644
--- a/packages/connect-core/src/types.ts
+++ b/packages/connect-core/src/types.ts
@@ -224,7 +224,7 @@ export interface AragonAppJson {
    * If the appName is different per network use environments
    * ```ts
    * environments: {
-   *   rinkeby: {
+   *   goerli: {
    *     appName: "myapp.open.aragonpm.eth"
    *   }
    * }
diff --git a/packages/connect-disputable-voting/src/thegraph/connector.ts b/packages/connect-disputable-voting/src/thegraph/connector.ts
index 0a4ca37c..ee0fa790 100644
--- a/packages/connect-disputable-voting/src/thegraph/connector.ts
+++ b/packages/connect-disputable-voting/src/thegraph/connector.ts
@@ -31,8 +31,8 @@ export function subgraphUrlFromChainId(chainId: number) {
   if (chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-dvoting-mainnet'
   }
-  if (chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-dvoting-rinkeby'
+  if (chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-dvoting-goerli'
   }
   if (chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-dvoting-xdai'
diff --git a/packages/connect-disputable-voting/subgraph/package.json b/packages/connect-disputable-voting/subgraph/package.json
index 246723cc..6c929284 100644
--- a/packages/connect-disputable-voting/subgraph/package.json
+++ b/packages/connect-disputable-voting/subgraph/package.json
@@ -6,13 +6,13 @@
     "build": "rm -rf build; graph build",
     "manifest-mainnet": "scripts/build-manifest.sh mainnet",
     "manifest-mainnet-staging": "env STAGING=true scripts/build-manifest.sh mainnet",
-    "manifest-rinkeby": "scripts/build-manifest.sh rinkeby",
-    "manifest-rinkeby-staging": "env STAGING=true dvoting/build-manifest.sh rinkeby",
+    "manifest-goerli": "scripts/build-manifest.sh goerli",
+    "manifest-goerli-staging": "env STAGING=true dvoting/build-manifest.sh goerli",
     "manifest-xdai": "scripts/build-manifest.sh xdai",
     "deploy-mainnet": "scripts/deploy.sh aragon dvoting mainnet",
     "deploy-mainnet-staging": "env STAGING=true scripts/deploy.sh aragon dvoting mainnet",
-    "deploy-rinkeby": "scripts/deploy.sh aragon dvoting rinkeby",
-    "deploy-rinkeby-staging": "env STAGING=true scripts/deploy.sh aragon dvoting rinkeby",
+    "deploy-goerli": "scripts/deploy.sh aragon dvoting goerli",
+    "deploy-goerli-staging": "env STAGING=true scripts/deploy.sh aragon dvoting goerli",
     "deploy-xdai": "scripts/deploy.sh aragon dvoting xdai"
   },
   "devDependencies": {
diff --git a/packages/connect-finance/src/thegraph/connector.ts b/packages/connect-finance/src/thegraph/connector.ts
index 462b97d2..85127791 100644
--- a/packages/connect-finance/src/thegraph/connector.ts
+++ b/packages/connect-finance/src/thegraph/connector.ts
@@ -15,8 +15,8 @@ export function subgraphUrlFromChainId(chainId: number) {
   if (chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-finance-mainnet'
   }
-  if (chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-finance-rinkeby'
+  if (chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-finance-goerli'
   }
   if (chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-finance-xdai'
diff --git a/packages/connect-finance/subgraph/package.json b/packages/connect-finance/subgraph/package.json
index 56dac2a0..2f8f0062 100644
--- a/packages/connect-finance/subgraph/package.json
+++ b/packages/connect-finance/subgraph/package.json
@@ -6,13 +6,13 @@
     "build": "rm -rf build; graph build",
     "manifest-mainnet": "scripts/build-manifest.sh mainnet",
     "manifest-mainnet-staging": "env STAGING=true scripts/build-manifest.sh mainnet",
-    "manifest-rinkeby": "scripts/build-manifest.sh rinkeby",
-    "manifest-rinkeby-staging": "env STAGING=true scripts/build-manifest.sh rinkeby",
+    "manifest-goerli": "scripts/build-manifest.sh goerli",
+    "manifest-goerli-staging": "env STAGING=true scripts/build-manifest.sh goerli",
     "manifest-xdai": "scripts/build-manifest.sh xdai",
     "deploy-mainnet": "scripts/deploy.sh aragon finance mainnet",
     "deploy-mainnet-staging": "env STAGING=true scripts/deploy.sh aragon finance mainnet",
-    "deploy-rinkeby": "scripts/deploy.sh aragon finance rinkeby",
-    "deploy-rinkeby-staging": "env STAGING=true scripts/deploy.sh aragon finance rinkeby",
+    "deploy-goerli": "scripts/deploy.sh aragon finance goerli",
+    "deploy-goerli-staging": "env STAGING=true scripts/deploy.sh aragon finance goerli",
     "deploy-xdai": "scripts/deploy.sh aragon finance xdai"
   },
   "devDependencies": {
diff --git a/packages/connect-thegraph/src/connector.ts b/packages/connect-thegraph/src/connector.ts
index 9a6b4785..b2c86e7f 100644
--- a/packages/connect-thegraph/src/connector.ts
+++ b/packages/connect-thegraph/src/connector.ts
@@ -40,8 +40,8 @@ function getOrgSubgraphUrl(network: Network): string | null {
   if (network.chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-mainnet'
   }
-  if (network.chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-rinkeby'
+  if (network.chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-goerli'
   }
   if (network.chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/1hive/aragon-xdai'
diff --git a/packages/connect-tokens/src/thegraph/connector.ts b/packages/connect-tokens/src/thegraph/connector.ts
index 5e0b9067..a0e81f1d 100644
--- a/packages/connect-tokens/src/thegraph/connector.ts
+++ b/packages/connect-tokens/src/thegraph/connector.ts
@@ -15,8 +15,8 @@ export function subgraphUrlFromChainId(chainId: number) {
   if (chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-tokens-mainnet'
   }
-  if (chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-tokens-rinkeby'
+  if (chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-tokens-goerli'
   }
   if (chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-tokens-xdai'
diff --git a/packages/connect-voting/src/thegraph/connector.ts b/packages/connect-voting/src/thegraph/connector.ts
index bdf2c654..b1cc36ec 100644
--- a/packages/connect-voting/src/thegraph/connector.ts
+++ b/packages/connect-voting/src/thegraph/connector.ts
@@ -13,8 +13,8 @@ export function subgraphUrlFromChainId(chainId: number) {
   if (chainId === 1) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-mainnet'
   }
-  if (chainId === 4) {
-    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-rinkeby'
+  if (chainId === 5) {
+    return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-goerli'
   }
   if (chainId === 100) {
     return 'https://api.thegraph.com/subgraphs/name/aragon/aragon-voting-xdai'