diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 86c9ab7658..256acf8b2c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,9 +8,6 @@ on:
     branches:
     - master
 
-env:
-  WASM_BUILD_TOOLCHAIN: nightly-2020-07-20
-
 jobs:
   get-variables:
     runs-on: ubuntu-latest
@@ -71,14 +68,16 @@ jobs:
           ~/.cargo/git
           target
           node/standalone/target
-        key: ${{ runner.OS }}-build-${{ env.WASM_BUILD_TOOLCHAIN }}-${{ hashFiles('**/Cargo.lock') }}
+        key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
-          ${{ runner.OS }}-build-${{ env.WASM_BUILD_TOOLCHAIN }}
+          ${{ runner.OS }}-build
     -
       uses: actions-rs/toolchain@v1
       with:
         target: wasm32-unknown-unknown
-        toolchain: ${{ env.WASM_BUILD_TOOLCHAIN }}
+        # Toolchain is autodetected from `rust-toolchain` file
+        # https://github.com/actions-rs/toolchain#the-toolchain-file
+        #toolchain: ${{ env.WASM_BUILD_TOOLCHAIN }}
         default: true
     -
       id: get-rust-versions
diff --git a/README.md b/README.md
index a8b833a5c5..66c4465541 100644
--- a/README.md
+++ b/README.md
@@ -2,28 +2,28 @@
 # ![moonbeam](media/moonbeam-cover.jpg)
 ![Tests](https://github.com/PureStake/moonbeam/workflows/Tests/badge.svg)
 
-Run an Ethereum compatible ~~parachain~~ (blockchain for now, until parachains are available) based on Substrate.
+Run an Ethereum compatible ~~parachain~~ (and blockchain for now, until parachains are more stable) based on Substrate.
 
 *See [moonbeam.network](https://moonbeam.network) for the moonbeam blockchain description.*  
 *See [www.substrate.io](https://www.substrate.io/) for substrate information.*
 
 ## Install (linux)
 
-### Moonbeam
+### Get the code
 
 ```bash
 git clone -b moonbeam-tutorials https://github.com/PureStake/moonbeam
 cd moonbeam
 ```
 
-### Dependencies
+### Rust developer environment
 
-Install Substrate and its pre-requisites (including Rust):  
+Install Substrate pre-requisites (including Rust):  
 ```bash
 curl https://getsubstrate.io -sSf | bash -s -- --fast
 ```
 
-## Build
+## Build Parachain
 
 Build Wasm and native code:  
 ```bash
@@ -36,12 +36,18 @@ If a _cargo not found_ error appears in the terminal, manually add Rust to your
 source $HOME/.cargo/env
 ```
 
+## Build Standalone
+```bash
+cd node/standalone
+cargo build --release
+```  
+
 ## Run
 
 ### Single node dev
 
 ```bash
-./target/release/moonbase-standalone --dev
+./node/standalone/target/release/moonbase-standalone --dev
 ```
 ### Docker image
 
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 0000000000..80184fde89
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+nightly-2020-07-20
diff --git a/scripts/_init_var.sh b/scripts/_init_var.sh
index 4e95c8bb41..78ed1a3e2c 100644
--- a/scripts/_init_var.sh
+++ b/scripts/_init_var.sh
@@ -8,7 +8,7 @@ mkdir -p $PARACHAIN_BUILD_FOLDER
 
 
 if [ -z "$STANDALONE_BINARY" ]; then
-    STANDALONE_BINARY="target/release/moonbase-standalone"
+    STANDALONE_BINARY="node/standalone/target/release/moonbase-standalone"
 fi
 
 if [ -z "$PARACHAIN_BINARY" ]; then
diff --git a/tools/truffle/migrations/2_deploy_contracts.js b/tools/truffle/migrations/2_deploy_contracts.js
index 066b4f0cc5..52e4370ad4 100644
--- a/tools/truffle/migrations/2_deploy_contracts.js
+++ b/tools/truffle/migrations/2_deploy_contracts.js
@@ -2,6 +2,6 @@ var MyToken = artifacts.require("MyToken");
 
 module.exports = function (deployer) {
   // deployment steps
-  deployer.deploy(MyToken, "8000000000000000000000000", { gas: 4294967295 });
+  deployer.deploy(MyToken, "8000000000000000000000000");
 };