diff --git a/__tests__/localAgent.test.ts b/__tests__/localAgent.test.ts
index 15fba56f8d..31472e053c 100644
--- a/__tests__/localAgent.test.ts
+++ b/__tests__/localAgent.test.ts
@@ -174,7 +174,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new DIDManager({
         store: new DIDStore(dbConnection),
-        defaultProvider: 'did:ethr:rinkeby',
+        defaultProvider: 'did:ethr:goerli',
         providers: {
           'did:ethr': new EthrDIDProvider({
             defaultKms: 'local',
@@ -185,14 +185,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
                 rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
               },
               {
-                name: 'rinkeby',
-                rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
+                name: 'goerli',
+                rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
               },
               {
-                chainId: 421611,
-                name: 'arbitrum:rinkeby',
-                rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
-                registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
+                chainId: 421613,
+                name: 'arbitrum:goerli',
+                rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
+                registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
               },
               {
                 chainId: 1337,
diff --git a/__tests__/localJsonStoreAgent.test.ts b/__tests__/localJsonStoreAgent.test.ts
index 4cb0ce395f..c05a7ce095 100644
--- a/__tests__/localJsonStoreAgent.test.ts
+++ b/__tests__/localJsonStoreAgent.test.ts
@@ -148,7 +148,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new DIDManager({
         store: new DIDStoreJson(jsonFileStore),
-        defaultProvider: 'did:ethr:rinkeby',
+        defaultProvider: 'did:ethr:goerli',
         providers: {
           'did:ethr': new EthrDIDProvider({
             defaultKms: 'local',
@@ -159,14 +159,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
                 rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
               },
               {
-                name: 'rinkeby',
-                rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
+                name: 'goerli',
+                rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
               },
               {
-                chainId: 421611,
-                name: 'arbitrum:rinkeby',
-                rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
-                registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
+                chainId: 421613,
+                name: 'arbitrum:goerli',
+                rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
+                registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
               },
             ],
           }),
diff --git a/__tests__/localMemoryStoreAgent.test.ts b/__tests__/localMemoryStoreAgent.test.ts
index 51ac855e41..3f47560397 100644
--- a/__tests__/localMemoryStoreAgent.test.ts
+++ b/__tests__/localMemoryStoreAgent.test.ts
@@ -147,7 +147,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new DIDManager({
         store: new MemoryDIDStore(),
-        defaultProvider: 'did:ethr:rinkeby',
+        defaultProvider: 'did:ethr:goerli',
         providers: {
           'did:ethr': new EthrDIDProvider({
             defaultKms: 'local',
@@ -158,14 +158,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
                 rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
               },
               {
-                name: 'rinkeby',
-                rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
+                name: 'goerli',
+                rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
               },
               {
-                chainId: 421611,
-                name: 'arbitrum:rinkeby',
-                rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
-                registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
+                chainId: 421613,
+                name: 'arbitrum:goerli',
+                rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
+                registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
               },
             ],
           }),
diff --git a/__tests__/restAgent.test.ts b/__tests__/restAgent.test.ts
index cd07c10d34..f145fd69e1 100644
--- a/__tests__/restAgent.test.ts
+++ b/__tests__/restAgent.test.ts
@@ -193,7 +193,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
       }),
       new DIDManager({
         store: new DIDStore(dbConnection),
-        defaultProvider: 'did:ethr:rinkeby',
+        defaultProvider: 'did:ethr:goerli',
         providers: {
           'did:ethr': new EthrDIDProvider({
             defaultKms: 'local',
@@ -204,14 +204,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
                 rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
               },
               {
-                name: 'rinkeby',
-                rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
+                name: 'goerli',
+                rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
               },
               {
-                chainId: 421611,
-                name: 'arbitrum:rinkeby',
-                rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
-                registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
+                chainId: 421613,
+                name: 'arbitrum:goerli',
+                rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
+                registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
               },
             ],
           }),
diff --git a/__tests__/shared/didManager.ts b/__tests__/shared/didManager.ts
index 343fcefaf2..1c3da7c4d3 100644
--- a/__tests__/shared/didManager.ts
+++ b/__tests__/shared/didManager.ts
@@ -33,29 +33,29 @@ export default (testContext: {
       expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
     })
 
-    it('should create identifier using did:ethr:arbitrum:rinkeby provider', async () => {
+    it('should create identifier using did:ethr:arbitrum:goerli provider', async () => {
       identifier = await agent.didManagerCreate({
-        // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:rinkeby` network specifier
-        provider: 'did:ethr:arbitrum:rinkeby',
+        // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
+        provider: 'did:ethr:arbitrum:goerli',
       })
-      expect(identifier.provider).toEqual('did:ethr:arbitrum:rinkeby')
-      expect(identifier.did).toMatch(/^did:ethr:arbitrum:rinkeby:0x.*$/)
+      expect(identifier.provider).toEqual('did:ethr:arbitrum:goerli')
+      expect(identifier.did).toMatch(/^did:ethr:arbitrum:goerli:0x.*$/)
       expect(identifier.keys.length).toEqual(1)
       expect(identifier.services.length).toEqual(0)
       expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
     })
 
-    it('should create identifier using chainId 421611', async () => {
+    it('should create identifier using chainId 3', async () => {
       identifier = await agent.didManagerCreate({
         provider: 'did:ethr',
         options: {
-          // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:rinkeby` network specifier
+          // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
           // because the configured network has that name
-          network: 421611,
+          network: 421613,
         },
       })
       expect(identifier.provider).toEqual('did:ethr')
-      expect(identifier.did).toMatch(/^did:ethr:arbitrum:rinkeby:0x.*$/)
+      expect(identifier.did).toMatch(/^did:ethr:arbitrum:goerli:0x.*$/)
       expect(identifier.keys.length).toEqual(1)
       expect(identifier.services.length).toEqual(0)
       expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
@@ -88,12 +88,12 @@ export default (testContext: {
     it('should get or create identifier', async () => {
       const identifier3 = await agent.didManagerGetOrCreate({
         alias: 'alice',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
       })
 
       const identifier4 = await agent.didManagerGetOrCreate({
         alias: 'alice',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
       })
 
       expect(identifier3).toEqual(identifier4)
@@ -126,7 +126,7 @@ export default (testContext: {
 
       const identifier7 = await agent.didManagerGetByAlias({
         alias: 'alice',
-        // default provider is 'did:ethr:rinkeby'
+        // default provider is 'did:ethr:goerli'
       })
 
       expect(identifier7).toEqual(identifier4)
@@ -141,18 +141,18 @@ export default (testContext: {
       })
       expect(aliceIdentifiers.length).toEqual(2)
 
-      const rinkebyIdentifiers = await agent.didManagerFind({
-        provider: 'did:ethr:rinkeby',
+      const goerliIdentifiers = await agent.didManagerFind({
+        provider: 'did:ethr:goerli',
       })
-      expect(rinkebyIdentifiers.length).toBeGreaterThanOrEqual(1)
+      expect(goerliIdentifiers.length).toBeGreaterThanOrEqual(1)
 
-      // Default provider 'did:ethr:rinkeby'
-      await agent.didManagerCreate({ provider: 'did:ethr:rinkeby' })
+      // Default provider 'did:ethr:goerli'
+      await agent.didManagerCreate({ provider: 'did:ethr:goerli' })
 
-      const rinkebyIdentifiers2 = await agent.didManagerFind({
-        provider: 'did:ethr:rinkeby',
+      const goerliIdentifiers2 = await agent.didManagerFind({
+        provider: 'did:ethr:goerli',
       })
-      expect(rinkebyIdentifiers2.length).toEqual(rinkebyIdentifiers.length + 1)
+      expect(goerliIdentifiers2.length).toEqual(goerliIdentifiers.length + 1)
     })
 
     it('should delete identifier', async () => {
diff --git a/__tests__/shared/documentationExamples.ts b/__tests__/shared/documentationExamples.ts
index d1fab36569..802518a09c 100644
--- a/__tests__/shared/documentationExamples.ts
+++ b/__tests__/shared/documentationExamples.ts
@@ -39,7 +39,7 @@ export default (testContext: {
     //DO NOT EDIT MANUALLY START
 
     it('core-IResolver-getDIDComponentById example', async () => {
-      const did = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
+      const did = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
       const didFragment = `${did}#controller`
       const fragment = await agent.getDIDComponentById({
         didDocument: (await agent.resolveDid({ didUrl: did }))?.didDocument,
@@ -47,40 +47,40 @@ export default (testContext: {
         section: 'authentication',
       })
       expect(fragment).toEqual({
-        id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
+        id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
         type: 'EcdsaSecp256k1RecoveryMethod2020',
-        controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-        blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
+        controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+        blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
       })
     })
 
     it('core-IResolver-resolveDid example', async () => {
       const doc = await agent.resolveDid({
-        didUrl: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+        didUrl: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
       })
       expect(doc.didDocument).toEqual({
         '@context': [
           'https://www.w3.org/ns/did/v1',
           'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
         ],
-        id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+        id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
         verificationMethod: [
           {
-            id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
+            id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
             type: 'EcdsaSecp256k1RecoveryMethod2020',
-            controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-            blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
+            controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+            blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
           },
         ],
-        authentication: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
-        assertionMethod: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
+        authentication: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
+        assertionMethod: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
       })
     })
 
     it('core-IDIDManager-didManagerCreate example', async () => {
       const identifier = await agent.didManagerCreate({
         alias: 'charlie',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
         kms: 'local',
       })
     })
@@ -90,15 +90,15 @@ export default (testContext: {
         alias: 'alice',
       })
 
-      const rinkebyIdentifiers = await agent.didManagerFind({
-        provider: 'did:ethr:rinkeby',
+      const goerliIdentifiers = await agent.didManagerFind({
+        provider: 'did:ethr:goerli',
       })
     })
 
     it('core-IDIDManager-didManagerGetByAlias example', async () => {
       const identifier = await agent.didManagerGetByAlias({
         alias: 'charlie',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
       })
     })
 
diff --git a/__tests__/shared/messageHandler.ts b/__tests__/shared/messageHandler.ts
index eee57d6eac..93d969fc06 100644
--- a/__tests__/shared/messageHandler.ts
+++ b/__tests__/shared/messageHandler.ts
@@ -23,7 +23,7 @@ export default (testContext: {
 
     it('should parse raw message', async () => {
       const raw =
-        'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1ODg2NzY3MzksInZwIjp7IkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZVByZXNlbnRhdGlvbiJdLCJ2ZXJpZmlhYmxlQ3JlZGVudGlhbCI6WyJleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpGVXpJMU5rc3RVaUo5LmV5SnBZWFFpT2pFMU9ESTJNVGsyTnpZc0luTjFZaUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJaXdpZG1NaU9uc2lRR052Ym5SbGVIUWlPbHNpYUhSMGNITTZMeTkzZDNjdWR6TXViM0puTHpJd01UZ3ZZM0psWkdWdWRHbGhiSE12ZGpFaVhTd2lkSGx3WlNJNld5SldaWEpwWm1saFlteGxRM0psWkdWdWRHbGhiQ0pkTENKamNtVmtaVzUwYVdGc1UzVmlhbVZqZENJNmV5SnVZVzFsSWpvaVFXeHBZMlVpZlgwc0ltbHpjeUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJbjAuSUdGMUxGT2M0X1BjR1ZlcTdZdzdPR3o0R2o3eFhaSzZwOGJQOUNTRUlYejdtTkZQTTB2MG51ZXZUWjQ3YTBJOFhnTGZDRk5rVXJJSXNjakg4TUZ4X3dFIl19LCJ0YWciOiJ0YWcxMjMiLCJhdWQiOlsiZGlkOmV4YW1wbGU6MzQ1NiIsImRpZDp3ZWI6dXBvcnQubWUiXSwiaXNzIjoiZGlkOmV0aHI6cmlua2VieToweGIwOWI2NjAyNmJhNTkwOWE3Y2ZlOTliNzY4NzU0MzFkMmI4ZDUxOTAifQ.4SWpp8siCBHP47KrOT_28IJIQPZLCWO9VS0Ir-VVYOGUAVj7vHtXLxl3Y6lLAxYeNqWrRPCAVkDArBFCNRjYUgA'
+        'eyJhbGciOiJFUzI1NksiLCJ0eXAiOiJKV1QifQ.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vdmVyYW1vLmlvL2NvbnRleHRzL3Byb2ZpbGUvdjEiXSwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJ5b3UiOiJSb2NrIn19LCJzdWIiOiJkaWQ6d2ViOmV4YW1wbGUuY29tIiwibmJmIjoxNjY1NDQ2NTgxLCJpc3MiOiJkaWQ6ZXRocjpnb2VybGk6MHgwMmExNDYzZDIyMDVjN2NkN2ZiMjkzY2RlNGQ5ZTM2YWRjYTk5MGY3ZWZhOTBiOTVlNTRmNTBkZjBhMTZjMTc0MjIifQ.cOUOSic-8YGQfUGPmHjj5HDS09LXGj9nEe6UOsbYRbl-VZMoLBNHcFgp2B-ZWNhe202B-pbCK51xM3viO3OfZA'
       parsedMessage = await agent.handleMessage({
         raw,
         save: false,
@@ -39,7 +39,12 @@ export default (testContext: {
 
     it('should get message from db', async () => {
       const message = await agent.dataStoreGetMessage({ id: parsedMessage.id })
-      expect(message).toEqual(parsedMessage)
+      // message has empty `presentations` array (not present in `parsedMessage`), when 
+      // using db (not json store)
+      // expect(message).toEqual(parsedMessage)
+      expect(message.raw).toEqual(parsedMessage.raw)
+      expect(message.data).toEqual(parsedMessage.data)
+      expect(message.metaData).toEqual(parsedMessage.metaData)
     })
 
     it('should throw error for non existing message', async () => {
diff --git a/__tests__/shared/resolveDid.ts b/__tests__/shared/resolveDid.ts
index 882bf3b872..d25fa34eff 100644
--- a/__tests__/shared/resolveDid.ts
+++ b/__tests__/shared/resolveDid.ts
@@ -20,7 +20,7 @@ export default (testContext: {
     afterAll(testContext.tearDown)
 
     it('should resolve didUrl', async () => {
-      const didUrl = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
+      const didUrl = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
       const didDoc = (await agent.resolveDid({ didUrl })).didDocument
       expect(didDoc?.id).toEqual(didUrl)
     })
diff --git a/__tests__/shared/utils.ts b/__tests__/shared/utils.ts
index eb6aa70555..df7e5b6ad2 100644
--- a/__tests__/shared/utils.ts
+++ b/__tests__/shared/utils.ts
@@ -21,21 +21,21 @@ export default (testContext: {
     afterAll(testContext.tearDown)
 
     it('should get chainId for ethr did', async () => {
-      const didUrl = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
+      const didUrl = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
       const didDoc = await resolveDidOrThrow(didUrl, { agent })
       if (didDoc.verificationMethod) {
         const chainId = getChainIdForDidEthr(didDoc.verificationMethod[0])
-        expect(chainId).toEqual(4)
+        expect(chainId).toEqual(5)
       }
     })
 
     it('should map identifier keys to did doc', async () => {
       const account = `0xb09b66026ba5909a7cfe99b76875431d2b8d5190`
-      const did = `did:ethr:0x4:${account}`
+      const did = `did:ethr:0x5:${account}`
       const controllerKeyId = `metamask-${account}`
       await agent.didManagerImport({
         did,
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
         controllerKeyId,
         keys: [
           {
@@ -56,7 +56,7 @@ export default (testContext: {
       const identifier = await agent.didManagerGet({ did })
       const extendedKeys = await mapIdentifierKeysToDoc(identifier, 'verificationMethod', { agent })
       expect(extendedKeys[0].meta.verificationMethod?.blockchainAccountId?.toLocaleLowerCase()).toEqual(
-        `eip155:4:${account}`,
+        `eip155:5:${account}`,
       )
     })
   })
diff --git a/__tests__/shared/verifiableDataJWT.ts b/__tests__/shared/verifiableDataJWT.ts
index c3ec820263..24025d7661 100644
--- a/__tests__/shared/verifiableDataJWT.ts
+++ b/__tests__/shared/verifiableDataJWT.ts
@@ -255,8 +255,8 @@ export default (testContext: {
 
     describe('using testvectors', () => {
       const importedDID = {
-        did: 'did:ethr:rinkeby:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
-        provider: 'did:ethr:rinkeby',
+        did: 'did:ethr:goerli:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
+        provider: 'did:ethr:goerli',
         controllerKeyId:
           '04155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c7037e2bd897812170c92a4c978d6a10481491a37299d74c4bd412a111a4ac875',
         keys: [
@@ -291,7 +291,7 @@ export default (testContext: {
         expect(comparableOutput).toEqual({
           credentialSubject: { name: 'Alice', id: 'did:example:subject' },
           issuer: {
-            id: 'did:ethr:rinkeby:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
+            id: 'did:ethr:goerli:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
           },
           type: ['VerifiableCredential', 'Example'],
           '@context': ['https://www.w3.org/2018/credentials/v1'],
diff --git a/__tests__/shared/webDidFlow.ts b/__tests__/shared/webDidFlow.ts
index 64791b7da0..9df43ba510 100644
--- a/__tests__/shared/webDidFlow.ts
+++ b/__tests__/shared/webDidFlow.ts
@@ -66,10 +66,10 @@ export default (testContext: {
     it('should create identifier with alias: alice', async () => {
       alice = await agent.didManagerGetOrCreate({
         alias: 'alice',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
       })
 
-      expect(alice.provider).toEqual('did:ethr:rinkeby')
+      expect(alice.provider).toEqual('did:ethr:goerli')
       expect(alice.alias).toEqual('alice')
       expect(alice.did).toBeDefined()
     })
@@ -77,10 +77,10 @@ export default (testContext: {
     it('should create identifier with alias: bob', async () => {
       bob = await agent.didManagerGetOrCreate({
         alias: 'bob',
-        provider: 'did:ethr:rinkeby',
+        provider: 'did:ethr:goerli',
       })
 
-      expect(bob.provider).toEqual('did:ethr:rinkeby')
+      expect(bob.provider).toEqual('did:ethr:goerli')
       expect(bob.alias).toEqual('bob')
       expect(bob.did).toBeDefined()
     })
diff --git a/package.json b/package.json
index de0f2c3762..004bd5a9d4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules \" jest --config=jest.config.json --detectOpenHandles",
     "test:watch": "yarn test --watch --verbose",
     "test:browser": "cd packages/test-react-app && yarn test:browser",
-    "veramo": "./packages/cli/bin/veramo.js",
+    "veramo": "cross-env ./packages/cli/bin/veramo.js",
     "prettier": "prettier --write '{packages,docs,__tests__,!build}/**/*.{ts,js,json,md,yml}'",
     "build-clean": "rimraf ./packages/*/build ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo && jest --clearCache",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org/:_authToken=${NPM_TOKEN}",
diff --git a/packages/cli/default/default.yml b/packages/cli/default/default.yml
index 9fafe50764..e19d15c7fe 100644
--- a/packages/cli/default/default.yml
+++ b/packages/cli/default/default.yml
@@ -219,7 +219,7 @@ didManager:
         $require: '@veramo/data-store#DIDStore'
         $args:
           - $ref: /dbConnection
-      defaultProvider: did:ethr:rinkeby
+      defaultProvider: did:ethr:goerli
       providers:
         did:ethr:
           $require: '@veramo/did-provider-ethr#EthrDIDProvider'
@@ -229,22 +229,6 @@ didManager:
               rpcUrl: https://mainnet.infura.io/v3/3586660d179141e3801c3895de1c2eba
               gas: 1000001
               ttl: 31104001
-        did:ethr:rinkeby:
-          $require: '@veramo/did-provider-ethr#EthrDIDProvider'
-          $args:
-            - defaultKms: local
-              network: rinkeby
-              rpcUrl: https://rinkeby.infura.io/v3/3586660d179141e3801c3895de1c2eba
-              gas: 1000001
-              ttl: 31104001
-        did:ethr:ropsten:
-          $require: '@veramo/did-provider-ethr#EthrDIDProvider'
-          $args:
-            - defaultKms: local
-              network: ropsten
-              rpcUrl: https://ropsten.infura.io/v3/3586660d179141e3801c3895de1c2eba
-              gas: 1000001
-              ttl: 31104001
         did:ethr:kovan:
           $require: '@veramo/did-provider-ethr#EthrDIDProvider'
           $args:
diff --git a/packages/cli/src/credential.ts b/packages/cli/src/credential.ts
index 1e41025530..abe0b59e94 100644
--- a/packages/cli/src/credential.ts
+++ b/packages/cli/src/credential.ts
@@ -109,7 +109,8 @@ credential
           type: 'input',
           name: 'id',
           message: 'Credential status ID',
-          default: 'rinkeby:0x97fd27892cdcD035dAe1fe71235c636044B59348',
+          // TODO(nickreynolds): deploy
+          default: 'goerli:0x97fd27892cdcD035dAe1fe71235c636044B59348',
         },
       ])
 
diff --git a/packages/cli/src/presentation.ts b/packages/cli/src/presentation.ts
index 06f1b613a6..667e8fe86e 100644
--- a/packages/cli/src/presentation.ts
+++ b/packages/cli/src/presentation.ts
@@ -32,7 +32,7 @@ presentation
       ...ids.map((id) => id.did),
     ]
 
-    let aud = null
+    let aud:string[] = []
     const answers = await inquirer.prompt([
       {
         type: 'list',
@@ -51,10 +51,10 @@ presentation
         default: 'xyz123',
       },
       {
-        type: 'list',
-        name: 'aud',
-        message: 'Verifier DID',
-        choices: identifiers,
+        type: 'input',
+        name: 'audnum',
+        message: 'Number of Verifiers',
+        default: 1,
       },
       {
         type: 'input',
@@ -64,17 +64,28 @@ presentation
       },
     ])
 
-    if (answers.aud === 'manual') {
+    for (let i = 0; i < answers.audnum; i++) {
+      let answer = null
       const audAnswer = await inquirer.prompt([
         {
-          type: 'input',
+          type: 'list',
           name: 'aud',
-          message: 'Enter Verifier DID',
-        },
+          message: 'Select Verifier or enter manually',
+          choices: identifiers
+        }
       ])
-      aud = audAnswer.aud
-    } else {
-      aud = answers.aud
+      answer = audAnswer.aud
+      if (answer === 'manual') {
+        const manualAnswer = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'aud',
+            message: 'Enter Verifier DID',
+          },
+        ])
+        answer = manualAnswer.aud
+      }
+      aud = [...aud, answer]
     }
 
     const credentials = await agent.dataStoreORMGetVerifiableCredentials({
@@ -122,7 +133,7 @@ presentation
         save: true,
         presentation: {
           holder: answers.iss,
-          verifier: [aud],
+          verifier: aud,
           tag: answers.tag,
           '@context': ['https://www.w3.org/2018/credentials/v1'],
           type: answers.type.split(','),
@@ -133,19 +144,21 @@ presentation
       })
 
       if (cmd.send) {
-        try {
-          const message = await agent.sendMessageDIDCommAlpha1({
-            save: true,
-            data: {
-              from: answers.iss,
-              to: aud,
-              type: 'jwt',
-              body: verifiablePresentation.proof.jwt,
-            },
-          })
-          console.dir(message, { depth: 10 })
-        } catch (e) {
-          console.error(e)
+        for(var verifier in aud) {
+          try {
+            const message = await agent.sendMessageDIDCommAlpha1({
+              save: true,
+              data: {
+                from: answers.iss,
+                to: verifier,
+                type: 'jwt',
+                body: verifiablePresentation.proof.jwt,
+              },
+            })
+            console.dir(message, { depth: 10 })
+          } catch (e) {
+            console.error(e)
+          }
         }
       }
 
diff --git a/packages/core/src/types/IDIDManager.ts b/packages/core/src/types/IDIDManager.ts
index c6d278cccf..464aa939b0 100644
--- a/packages/core/src/types/IDIDManager.ts
+++ b/packages/core/src/types/IDIDManager.ts
@@ -258,8 +258,8 @@ export interface IDIDManager extends IPluginMethodMap {
    *   alias: 'alice'
    * })
    *
-   * const rinkebyIdentifiers = await agent.didManagerFind({
-   *   provider: 'did:ethr:rinkeby'
+   * const goerliIdentifiers = await agent.didManagerFind({
+   *   provider: 'did:ethr:goerli'
    * })
    * ```
    */
@@ -279,7 +279,7 @@ export interface IDIDManager extends IPluginMethodMap {
    * ```typescript
    * const identifier = await agent.didManagerGetByAlias({
    *   alias: 'charlie',
-   *   provider: 'did:ethr:rinkeby'
+   *   provider: 'did:ethr:goerli'
    * })
    * ```
    */
@@ -297,7 +297,7 @@ export interface IDIDManager extends IPluginMethodMap {
    * ```typescript
    * const identifier = await agent.didManagerCreate({
    *   alias: 'charlie',
-   *   provider: 'did:ethr:rinkeby',
+   *   provider: 'did:ethr:goerli',
    *   kms: 'local'
    * })
    * ```
diff --git a/packages/core/src/types/IResolver.ts b/packages/core/src/types/IResolver.ts
index 04e943207d..447cc726c8 100644
--- a/packages/core/src/types/IResolver.ts
+++ b/packages/core/src/types/IResolver.ts
@@ -75,24 +75,24 @@ export interface IResolver extends IPluginMethodMap {
    * @example
    * ```typescript
    * const doc = await agent.resolveDid({
-   *   didUrl: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
+   *   didUrl: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
    * })
    * expect(doc.didDocument).toEqual({
    *   '@context': [
    *     'https://www.w3.org/ns/did/v1',
    *     'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
    *   ],
-   *   id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+   *   id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
    *   verificationMethod: [
    *     {
-   *       id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
+   *       id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
    *       type: 'EcdsaSecp256k1RecoveryMethod2020',
-   *       controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-   *       blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
+   *       controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+   *       blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
    *     },
    *   ],
-   *   authentication: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
-   *   assertionMethod: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
+   *   authentication: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
+   *   assertionMethod: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
    * })
    * ```
    *
@@ -106,7 +106,7 @@ export interface IResolver extends IPluginMethodMap {
    *
    * @example
    * ```typescript
-   * const did = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
+   * const did = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
    * const didFragment = `${did}#controller`
    * const fragment = await agent.getDIDComponentById({
    *   didDocument: (await agent.resolveDid({didUrl: did}))?.didDocument,
@@ -114,10 +114,10 @@ export interface IResolver extends IPluginMethodMap {
    *   section: 'authentication'
    * })
    * expect(fragment).toEqual({
-   *   id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
+   *   id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
    *   type: 'EcdsaSecp256k1RecoveryMethod2020',
-   *   controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-   *   blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
+   *   controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+   *   blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
    * })
    * ```
    *
diff --git a/packages/credential-w3c/src/__tests__/message-handler.test.ts b/packages/credential-w3c/src/__tests__/message-handler.test.ts
index 664943c24d..5878a476c7 100644
--- a/packages/credential-w3c/src/__tests__/message-handler.test.ts
+++ b/packages/credential-w3c/src/__tests__/message-handler.test.ts
@@ -8,6 +8,7 @@ import { MockDIDResolverPlugin } from './mockResolver.js'
 
 describe('@veramo/credential-w3c', () => {
   const handler = new W3cMessageHandler()
+  // don't need to replace rinkeby since test has mock resolver
   const didEthr = 'did:ethr:rinkeby:0x3c357ba458933a19c1df1c7f6b473b3302bbbe61'
   const didKey = 'did:key:z6Mkqjn1SMUbR88S7BZFAZnr7sfzPXmm3DfRdMy3Z5CdMqnd'
 
@@ -159,20 +160,18 @@ describe('@veramo/credential-w3c', () => {
   })
 
   const vpMultiAudJwt =
-    'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1ODg2NzY3MzksInZwIjp7IkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZVByZXNlbnRhdGlvbiJdLCJ2ZXJpZmlhYmxlQ3JlZGVudGlhbCI6WyJleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpGVXpJMU5rc3RVaUo5LmV5SnBZWFFpT2pFMU9ESTJNVGsyTnpZc0luTjFZaUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJaXdpZG1NaU9uc2lRR052Ym5SbGVIUWlPbHNpYUhSMGNITTZMeTkzZDNjdWR6TXViM0puTHpJd01UZ3ZZM0psWkdWdWRHbGhiSE12ZGpFaVhTd2lkSGx3WlNJNld5SldaWEpwWm1saFlteGxRM0psWkdWdWRHbGhiQ0pkTENKamNtVmtaVzUwYVdGc1UzVmlhbVZqZENJNmV5SnVZVzFsSWpvaVFXeHBZMlVpZlgwc0ltbHpjeUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJbjAuSUdGMUxGT2M0X1BjR1ZlcTdZdzdPR3o0R2o3eFhaSzZwOGJQOUNTRUlYejdtTkZQTTB2MG51ZXZUWjQ3YTBJOFhnTGZDRk5rVXJJSXNjakg4TUZ4X3dFIl19LCJ0YWciOiJ0YWcxMjMiLCJhdWQiOlsiZGlkOmV4YW1wbGU6MzQ1NiIsImRpZDp3ZWI6dXBvcnQubWUiXSwiaXNzIjoiZGlkOmV0aHI6cmlua2VieToweGIwOWI2NjAyNmJhNTkwOWE3Y2ZlOTliNzY4NzU0MzFkMmI4ZDUxOTAifQ.4SWpp8siCBHP47KrOT_28IJIQPZLCWO9VS0Ir-VVYOGUAVj7vHtXLxl3Y6lLAxYeNqWrRPCAVkDArBFCNRjYUgA'
+    'eyJhbGciOiJFUzI1NksiLCJ0eXAiOiJKV1QifQ.eyJ2cCI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSJdLCJ0eXBlIjpbIlZlcmlmaWFibGVQcmVzZW50YXRpb24iXSwidmVyaWZpYWJsZUNyZWRlbnRpYWwiOlsiZXlKaGJHY2lPaUpGVXpJMU5rc2lMQ0owZVhBaU9pSktWMVFpZlEuZXlKMll5STZleUpBWTI5dWRHVjRkQ0k2V3lKb2RIUndjem92TDNkM2R5NTNNeTV2Y21jdk1qQXhPQzlqY21Wa1pXNTBhV0ZzY3k5Mk1TSXNJbWgwZEhCek9pOHZkbVZ5WVcxdkxtbHZMMk52Ym5SbGVIUnpMM0J5YjJacGJHVXZkakVpWFN3aWRIbHdaU0k2V3lKV1pYSnBabWxoWW14bFEzSmxaR1Z1ZEdsaGJDSmRMQ0pqY21Wa1pXNTBhV0ZzVTNWaWFtVmpkQ0k2ZXlKdVlXMWxJam9pUVd4cFkyVWlmWDBzSW5OMVlpSTZJbVJwWkRwbGRHaHlPbWR2WlhKc2FUb3dlREF5WkdJMllqZ3pZVE00WlRNeFpHVmtabU5rTURBeE4yRTBPRE5qT0dJd01EY3pZV1EwTURRNU5UZG1OV1l6TXpjNFpEVmtPR1l6WkRneU5USXhNRFE0T1NJc0ltNWlaaUk2TVRZMk5UUTFNalUwT0N3aWFYTnpJam9pWkdsa09tVjBhSEk2WjI5bGNteHBPakI0TURKa1lqWmlPRE5oTXpobE16RmtaV1JtWTJRd01ERTNZVFE0TTJNNFlqQXdOek5oWkRRd05EazFOMlkxWmpNek56aGtOV1E0WmpOa09ESTFNakV3TkRnNUluMC56ZXRBSXVTVWtxNGlmbmxhelg3c1RodTlpd3VzNjZDVHBfaDVObW0xc2RyZXZ4ck02WklSZGJEVExrZlZ6MmxGR3BxeU1aLW9tMVBtUHNOOFluY2ZSZyJdfSwidGFnIjoidGFnMTIzIiwibmJmIjoxNjY1NDUzMDYwLCJpc3MiOiJkaWQ6ZXRocjpnb2VybGk6MHgwMmRiNmI4M2EzOGUzMWRlZGZjZDAwMTdhNDgzYzhiMDA3M2FkNDA0OTU3ZjVmMzM3OGQ1ZDhmM2Q4MjUyMTA0ODkiLCJhdWQiOlsiZGlkOmV4YW1wbGU6MzQ1NiIsImRpZDp3ZWI6dXBvcnQubWUiXX0.NfQjQb3_mo956o5guLTV5iKF9mna-Yy70MBZQlNDu9OujpDhbsaQ5MHFw5GGG1M47_74ZAaMTOx9Wc7iY7eLZw'
 
   const vpMultiAudPayload = {
     iat: 1588676739,
     vp: {
       '@context': ['https://www.w3.org/2018/credentials/v1'],
       type: ['VerifiablePresentation'],
-      verifiableCredential: [
-        'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1ODI2MTk2NzYsInN1YiI6ImRpZDpldGhyOnJpbmtlYnk6MHgzYzM1N2JhNDU4OTMzYTE5YzFkZjFjN2Y2YjQ3M2IzMzAyYmJiZTYxIiwidmMiOnsiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJuYW1lIjoiQWxpY2UifX0sImlzcyI6ImRpZDpldGhyOnJpbmtlYnk6MHgzYzM1N2JhNDU4OTMzYTE5YzFkZjFjN2Y2YjQ3M2IzMzAyYmJiZTYxIn0.IGF1LFOc4_PcGVeq7Yw7OGz4Gj7xXZK6p8bP9CSEIXz7mNFPM0v0nuevTZ47a0I8XgLfCFNkUrIIscjH8MFx_wE',
-      ],
+      verifiableCredential: [vpMultiAudJwt],
     },
     tag: 'tag123',
     aud: ['did:example:3456', 'did:web:uport.me'],
-    iss: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+    iss: 'did:ethr:goerli:0x02db6b83a38e31dedfcd0017a483c8b0073ad404957f5f3378d5d8f3d825210489',
   }
 
   it('should use the first audience did as a message.to field', async () => {
@@ -213,7 +212,8 @@ describe('@veramo/credential-w3c', () => {
       },
       credentialStatus: {
         type: 'EthrStatusRegistry2019',
-        id: 'rinkeby:0x97fd27892cdcD035dAe1fe71235c636044B59348',
+        // TODO(nickreynolds): deploy
+        id: 'goerli:0x97fd27892cdcD035dAe1fe71235c636044B59348',
       },
       iss: 'did:ethr:0x54d59e3ffd76917f62db702ac354b17f3842955e',
     }
diff --git a/packages/did-provider-ethr/src/__tests__/identity-provider.test.ts b/packages/did-provider-ethr/src/__tests__/identity-provider.test.ts
index a87bfb973f..26b6de62ab 100644
--- a/packages/did-provider-ethr/src/__tests__/identity-provider.test.ts
+++ b/packages/did-provider-ethr/src/__tests__/identity-provider.test.ts
@@ -14,7 +14,7 @@ describe('dummy', () => {
 
 // describe('@veramo/did-provider-ethr', () => {
 // const infuraProjectId = '3586660d179141e3801c3895de1c2eba'
-// const rpcUrl = 'https://rinkeby.infura.io/v3/' + infuraProjectId
+// const rpcUrl = 'https://goerli.infura.io/v3/' + infuraProjectId
 // const resolver = new DIDResolverPlugin({ infuraProjectId })
 // const key = {
 //   privateKey: 'da1ed1d75b6e3d28d306af4dcab9b893189cf248e52fe526e264b39b5e587ccf',
@@ -24,13 +24,13 @@ describe('dummy', () => {
 // }
 
 // const serialized = {
-//   did: 'did:ethr:rinkeby:0x76d331386cec35862a73aabdbfa5ef97cdac58cf',
+//   did: 'did:ethr:goerli:0x76d331386cec35862a73aabdbfa5ef97cdac58cf',
 //   controller: key,
 //   keys: [key],
 // }
 
 // const fileName = './store.json'
-// const network = 'rinkeby'
+// const network = 'goerli'
 // const identifierProvider = new IdentifierProvider({
 //   fileName,
 //   network,
diff --git a/packages/did-resolver/src/__tests__/integration.test.ts b/packages/did-resolver/src/__tests__/integration.test.ts
index b57922e90b..96961808e0 100644
--- a/packages/did-resolver/src/__tests__/integration.test.ts
+++ b/packages/did-resolver/src/__tests__/integration.test.ts
@@ -9,7 +9,7 @@ jest.setTimeout(60000)
 
 const providerConfig = {
   networks: [
-    { name: 'rinkeby', rpcUrl: 'https://rinkeby.infura.io/v3/3586660d179141e3801c3895de1c2eba' },
+    { name: 'goerli', rpcUrl: 'https://goerli.infura.io/v3/3586660d179141e3801c3895de1c2eba' },
     { name: 'goerli', rpcUrl: 'https://goerli.infura.io/v3/3586660d179141e3801c3895de1c2eba' },
     { name: 'development', rpcUrl: 'http://localhost:7545' },
     // FIXME: add this example
@@ -69,24 +69,24 @@ describe('@veramo/did-resolver', () => {
   it('should resolve ethr-did with RPC URL', async () => {
     expect.assertions(1)
     await expect(
-      resolverPlugin.resolveDid({ didUrl: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6' }),
+      resolverPlugin.resolveDid({ didUrl: 'did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6' }),
     ).resolves.toEqual({
       didDocument: {
         '@context': [
           'https://www.w3.org/ns/did/v1',
           'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
         ],
-        id: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
+        id: 'did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
         verificationMethod: [
           {
-            id: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller',
+            id: 'did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller',
             type: 'EcdsaSecp256k1RecoveryMethod2020',
-            controller: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
-            blockchainAccountId: 'eip155:4:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
+            controller: 'did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
+            blockchainAccountId: 'eip155:5:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
           },
         ],
-        authentication: ['did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller'],
-        assertionMethod: ['did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller'],
+        authentication: ['did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller'],
+        assertionMethod: ['did:ethr:goerli:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller'],
       },
       didDocumentMetadata: {},
       didResolutionMetadata: { contentType: 'application/did+ld+json' },
diff --git a/packages/test-react-app/headless-tests/browserAgent.browser-test.ts b/packages/test-react-app/headless-tests/browserAgent.browser-test.ts
index f8de3ad5ab..7a1a37305c 100644
--- a/packages/test-react-app/headless-tests/browserAgent.browser-test.ts
+++ b/packages/test-react-app/headless-tests/browserAgent.browser-test.ts
@@ -56,17 +56,17 @@ describe('Browser integration tests', () => {
             'https://www.w3.org/ns/did/v1',
             'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
           ],
-          id: 'did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
+          id: 'did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
           verificationMethod: [
             {
-              id: 'did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller',
+              id: 'did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller',
               type: 'EcdsaSecp256k1RecoveryMethod2020',
-              controller: 'did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
-              blockchainAccountId: 'eip155:4:0x6AcF3bB1eF0eE84559De2bC2Bd9D91532062a730',
+              controller: 'did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
+              blockchainAccountId: 'eip155:5:0x6AcF3bB1eF0eE84559De2bC2Bd9D91532062a730',
             },
           ],
-          authentication: ['did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller'],
-          assertionMethod: ['did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller'],
+          authentication: ['did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller'],
+          assertionMethod: ['did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730#controller'],
         },
       }
 
@@ -82,7 +82,7 @@ describe('Browser integration tests', () => {
         didDocumentMetadata: {},
         didResolutionMetadata: {
           error: 'invalidDid',
-          message: 'Not a valid did:ethr: rinkeby:0x6acf3bb1ef0ee8459de2bc2bd9d91532062a730',
+          message: 'Not a valid did:ethr: goerli:0x6acf3bb1ef0ee8459de2bc2bd9d91532062a730',
         },
         didDocument: null,
       }
diff --git a/packages/test-react-app/src/App.tsx b/packages/test-react-app/src/App.tsx
index e119e55235..b8f62ac576 100644
--- a/packages/test-react-app/src/App.tsx
+++ b/packages/test-react-app/src/App.tsx
@@ -25,15 +25,15 @@ function App() {
   }
 
   const resolve = async () => {
-    const doc = await (agent).resolveDid({
-      didUrl: 'did:ethr:rinkeby:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
+    const doc = await agent.resolveDid({
+      didUrl: 'did:ethr:goerli:0x6acf3bb1ef0ee84559de2bc2bd9d91532062a730',
     })
     setDidDoc(doc)
   }
 
   const resolveInvalid = async () => {
-    const doc = await (agent).resolveDid({
-      didUrl: 'did:ethr:rinkeby:0x6acf3bb1ef0ee8459de2bc2bd9d91532062a730',
+    const doc = await agent.resolveDid({
+      didUrl: 'did:ethr:goerli:0x6acf3bb1ef0ee8459de2bc2bd9d91532062a730',
     })
     setInvalidDidDoc(doc)
   }
diff --git a/packages/test-react-app/src/veramo/setup.ts b/packages/test-react-app/src/veramo/setup.ts
index 5b9d377011..3543f94f7c 100644
--- a/packages/test-react-app/src/veramo/setup.ts
+++ b/packages/test-react-app/src/veramo/setup.ts
@@ -93,7 +93,7 @@ export async function setup(options?: IAgentOptions): Promise<boolean> {
       }),
       new DIDManager({
         store: new DIDStoreJson(memoryJsonStore),
-        defaultProvider: 'did:ethr:rinkeby',
+        defaultProvider: 'did:ethr:goerli',
         providers: {
           'did:ethr': new EthrDIDProvider({
             defaultKms: 'local',
@@ -104,14 +104,14 @@ export async function setup(options?: IAgentOptions): Promise<boolean> {
                 rpcUrl: 'https://mainnet.infura.io/v3/' + INFURA_PROJECT_ID,
               },
               {
-                name: 'rinkeby',
-                rpcUrl: 'https://rinkeby.infura.io/v3/' + INFURA_PROJECT_ID,
+                name: 'goerli',
+                rpcUrl: 'https://goerli.infura.io/v3/' + INFURA_PROJECT_ID,
               },
               {
-                chainId: 421611,
-                name: 'arbitrum:rinkeby',
-                rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + INFURA_PROJECT_ID,
-                registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
+                chainId: 421613,
+                name: 'arbitrum:goerli',
+                rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + INFURA_PROJECT_ID,
+                registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
               },
             ],
           }),
diff --git a/packages/utils/src/__tests__/did-utils.test.ts b/packages/utils/src/__tests__/did-utils.test.ts
index dba52f9d46..db30b2aea8 100644
--- a/packages/utils/src/__tests__/did-utils.test.ts
+++ b/packages/utils/src/__tests__/did-utils.test.ts
@@ -23,9 +23,9 @@ describe('@veramo/utils did utils', () => {
     expect(getChainIdForDidEthr({
       'id': 'did:ethr:0x1B54DaD834f2017ab66C1a1ffF74425889141e51#controller',
       'type': 'EcdsaSecp256k1RecoveryMethod2020',
-      'controller': 'did:ethr:rinkeby:0x1B54DaD834f2017ab66C1a1ffF74425889141e51',
-      'blockchainAccountId':'eip155:4:0x1B54DaD834f2017ab66C1a1ffF74425889141e51'
-    })).toEqual(4)
+      'controller': 'did:ethr:goerli:0x1B54DaD834f2017ab66C1a1ffF74425889141e51',
+      'blockchainAccountId':'eip155:5:0x1B54DaD834f2017ab66C1a1ffF74425889141e51'
+    })).toEqual(5)
   })
 
   it('should return blockchainAccountId for did:ethr', () => {