diff --git a/remix-lib/src/execution/execution-context.js b/remix-lib/src/execution/execution-context.js
index 7d206d534..9e4ffd8d2 100644
--- a/remix-lib/src/execution/execution-context.js
+++ b/remix-lib/src/execution/execution-context.js
@@ -155,7 +155,7 @@ function ExecutionContext () {
         else if (id === '2') name = 'Morden (deprecated)'
         else if (id === '3') name = 'Ropsten'
         else if (id === '4') name = 'Rinkeby'
-        else if (id === '5') name = 'Görli'
+        else if (id === '5') name = 'Goerli'
         else if (id === '42') name = 'Kovan'
         else name = 'Custom'
 
@@ -322,7 +322,8 @@ var transactionDetailsLinks = {
   'Main': 'https://www.etherscan.io/tx/',
   'Rinkeby': 'https://rinkeby.etherscan.io/tx/',
   'Ropsten': 'https://ropsten.etherscan.io/tx/',
-  'Kovan': 'https://kovan.etherscan.io/tx/'
+  'Kovan': 'https://kovan.etherscan.io/tx/',
+  'Goerli': 'https://goerli.etherscan.io/tx/'
 }
 
 module.exports = new ExecutionContext()
diff --git a/remix-lib/src/init.js b/remix-lib/src/init.js
index 32261870d..7f1978267 100644
--- a/remix-lib/src/init.js
+++ b/remix-lib/src/init.js
@@ -69,7 +69,8 @@ module.exports = {
 
 var web3DebugNodes = {
   'Main': 'https://mainnet.infura.io/remix',
-  'Rinkeby': 'http://52.56.126.137:8545',
-  'Ropsten': 'http://35.178.125.92:8545',
-  'Kovan': 'http://35.176.227.86:8545'
+  'Rinkeby': 'https://remix-rinkeby.ethdevops.io',
+  'Ropsten': 'https://remix-ropsten.ethdevops.io',
+  'Goerli': 'https://remix-goerli.ethdevops.io',
+  'Kovan': 'https://remix-kovan.ethdevops.io'
 }