diff --git a/.github/workflows/manual-acala.yml b/.github/workflows/manual-acala.yml
index b1c2047..3273aea 100644
--- a/.github/workflows/manual-acala.yml
+++ b/.github/workflows/manual-acala.yml
@@ -8,7 +8,7 @@ on:
     inputs:
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
         required: false
       ref:
         description: The ref to be used for the repo
@@ -47,7 +47,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -76,7 +76,7 @@ jobs:
           subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.chain }} | tee ${{ matrix.chain }}-diff.txt
 
       - name: Archive Subwasm results
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/.github/workflows/manual-fellow-runtimes.yml b/.github/workflows/manual-fellow-runtimes.yml
index b0f7ecb..c4d2a65 100644
--- a/.github/workflows/manual-fellow-runtimes.yml
+++ b/.github/workflows/manual-fellow-runtimes.yml
@@ -12,7 +12,7 @@ on:
         default: paritytech/srtool
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
         required: false
       repo:
         description: The repo to be used to build runtimes from
@@ -59,7 +59,7 @@ jobs:
       - name: Cache runtimes list for ${{ steps.get_commit_hash.outputs.commit_hash }}
         id: cache_runtimes_list
         if: inputs.cache == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: runtimes-list-${{ steps.get_commit_hash.outputs.commit_hash }}
           path: |
@@ -106,7 +106,7 @@ jobs:
       - name: Cache ${{ matrix.chain }} runtime for ${{ needs.find-runtimes.outputs.commit_hash }}
         id: cache_runtime
         if: inputs.cache == 'true'
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
+        uses: actions/cache@v4
         with:
           key: ${{ matrix.chain }}-${{ needs.find-runtimes.outputs.commit_hash }}
           path: |
@@ -170,7 +170,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -205,7 +205,7 @@ jobs:
           subwasm diff ${{ steps.get_values.outputs.wasm }} --chain-b ${{ matrix.chain }} | tee ${{ matrix.chain }}-diff.txt
 
       - name: Archive Subwasm results
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/.github/workflows/manual-moonbeam.yml b/.github/workflows/manual-moonbeam.yml
index 9df8636..b531b14 100644
--- a/.github/workflows/manual-moonbeam.yml
+++ b/.github/workflows/manual-moonbeam.yml
@@ -8,7 +8,7 @@ on:
     inputs:
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
         required: false
       ref:
         description: The ref to be used for the repo
@@ -46,7 +46,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -76,7 +76,7 @@ jobs:
           echo "No live chain to compare" > ${{ matrix.chain }}-diff.txt
 
       - name: Archive Subwasm results
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/.github/workflows/manual-polkadot-sdk.yml b/.github/workflows/manual-polkadot-sdk.yml
index cf35413..05761b9 100644
--- a/.github/workflows/manual-polkadot-sdk.yml
+++ b/.github/workflows/manual-polkadot-sdk.yml
@@ -12,7 +12,7 @@ on:
         default: paritytech/srtool
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
       repo:
         description: The repo to be used to build runtimes from
         default: paritytech/polkadot-sdk
@@ -64,7 +64,7 @@ jobs:
       - name: Cache runtimes list for ${{ steps.get_commit_hash.outputs.commit_hash }}
         id: cache_runtimes_list
         if: github.event.inputs.cache == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: runtimes-list-${{ steps.get_commit_hash.outputs.commit_hash }}
           path: |
@@ -129,7 +129,7 @@ jobs:
       - name: Cache ${{ matrix.chain }} runtime for ${{ needs.find-runtimes.outputs.commit_hash }}
         id: cache_runtime
         if: github.event.inputs.cache == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ matrix.chain }}-${{ needs.find-runtimes.outputs.commit_hash }}
           path: |
@@ -187,7 +187,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -216,7 +216,7 @@ jobs:
           subwasm meta --format=json ${{ steps.get_values.outputs.wasm }} | tee ${{ matrix.chain }}-metadata.json
 
       - name: Archive Subwasm information
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -248,7 +248,7 @@ jobs:
 
       - name: Archive Subwasm diff
         if: steps.check-reference-chain.outputs.ref_chain_found == 'true'
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime-diff
           path: |
diff --git a/.github/workflows/manual-shiden.yml b/.github/workflows/manual-shiden.yml
index f2127eb..f5d99c6 100644
--- a/.github/workflows/manual-shiden.yml
+++ b/.github/workflows/manual-shiden.yml
@@ -8,7 +8,7 @@ on:
     inputs:
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
         required: false
       ref:
         description: The ref to be used for the repo
@@ -47,7 +47,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -77,7 +77,7 @@ jobs:
           echo "No live chain to compare" > ${{ matrix.chain }}-diff.txt
 
       - name: Archive Subwasm results
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index ffec576..7e185cb 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -8,7 +8,7 @@ on:
     inputs:
       srtool_tag:
         description: The SRTOOL tag to use
-        default: 1.81.0
+        default: 1.84.0
         required: false
       srtool_image:
         description: The SRTOOL image to use
@@ -74,7 +74,7 @@ jobs:
 
       # it takes a while to build the runtime, so let's save the artifact as soon as we have it
       - name: Archive Artifacts for ${{ github.event.inputs.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.inputs.chain }}-runtime
           path: |
@@ -103,7 +103,7 @@ jobs:
           subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ github.event.inputs.chain }} | tee ${{ github.event.inputs.chain }}-diff.txt
 
       - name: Archive Subwasm results
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.inputs.chain }}-runtime
           path: |
diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
index a7fc6d3..568ac6d 100644
--- a/.github/workflows/quick-test.yml
+++ b/.github/workflows/quick-test.yml
@@ -10,6 +10,10 @@ on:
 
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build Srtool Docker image
@@ -36,7 +40,7 @@ jobs:
           docker save srtool | gzip > srtool.tar.gz
 
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -48,7 +52,7 @@ jobs:
     continue-on-error: false
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -87,7 +91,7 @@ jobs:
           ls -al
 
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -126,7 +130,7 @@ jobs:
         chain: ["westend"]
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -211,7 +215,7 @@ jobs:
             echo "json=$JSON" >> $GITHUB_OUTPUT
             echo "JSON=$JSON" >> $GITHUB_ENV
 
-            echo $JSON | jq .
+            echo $JSON
 
             WASM=`echo $JSON | jq -r .runtimes.compact.wasm`
             echo "wasm=$WASM" >> $GITHUB_OUTPUT
@@ -240,7 +244,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 209fad9..997f75b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
           docker save srtool | gzip > srtool.tar.gz
 
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -52,7 +52,7 @@ jobs:
           echo "SRTOOL_VERSION=$SRTOOL_VERSION" >> $GITHUB_ENV
           echo "RUSTC_VERSION=$RUSTC_VERSION" >> $GITHUB_ENV
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -99,7 +99,7 @@ jobs:
     needs: ["create_draft"]
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6627760..d83f0fb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,6 +13,10 @@ on:
   schedule:
     - cron: "00 05 * * 1" # 5AM weekly on mondays
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build Srtool Docker image
@@ -39,7 +43,7 @@ jobs:
           docker save srtool | gzip > srtool.tar.gz
 
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -51,7 +55,7 @@ jobs:
     continue-on-error: false
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -90,7 +94,7 @@ jobs:
           ls -al
 
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -129,7 +133,7 @@ jobs:
         chain: ["westend"]
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -235,7 +239,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
@@ -282,7 +286,7 @@ jobs:
 
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -343,9 +347,11 @@ jobs:
           CMD="docker run --rm -i \
             -e PACKAGE=$PACKAGE \
             -e RUNTIME_DIR=$RUNTIME_DIR \
+            -e RUSTC_VERSION=1.81.0 \
             -e WASM_BUILD_STD=0 \
             -v ${PWD}:/build \
             srtool build --app --json"
+
           echo ::debug::build::docker_run $CMD
 
           echo "::group::SRTOOL Build Output"
@@ -388,7 +394,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.runtime }}
           path: |
@@ -412,7 +418,7 @@ jobs:
             chain: bridge-hub-westend
     steps:
       - name: Cache the image
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@v4
         with:
           key: srtool-docker-image-${{ github.sha }}
           path: |
@@ -489,23 +495,23 @@ jobs:
       - name: Summary for ${{ matrix.chain }}
         working-directory: sdk
         run: |
-            echo "::group::JSON digest"
-            echo $JSON | jq . | tee ${{ matrix.chain }}-srtool-digest.json
-            echo "::endgroup::"
+          echo "::group::JSON digest"
+          echo $JSON | jq . | tee ${{ matrix.chain }}-srtool-digest.json
+          echo "::endgroup::"
 
-            echo "::group::Runtimes paths"
-            echo "Compact Runtime: ${{ steps.srtool_build.outputs.wasm }}"
-            echo "Compressed Runtime: ${{ steps.srtool_build.outputs.wasm_compressed }}"
-            echo "::endgroup::"
+          echo "::group::Runtimes paths"
+          echo "Compact Runtime: ${{ steps.srtool_build.outputs.wasm }}"
+          echo "Compressed Runtime: ${{ steps.srtool_build.outputs.wasm_compressed }}"
+          echo "::endgroup::"
 
-            echo "::group::Debugging"
-            pwd; ls -al
-            ls -al ${{ steps.srtool_build.outputs.wasm_compressed }}
-            ls -al ${{ steps.srtool_build.outputs.wasm_compressed }}
-            echo "::endgroup::"
+          echo "::group::Debugging"
+          pwd; ls -al
+          ls -al ${{ steps.srtool_build.outputs.wasm_compressed }}
+          ls -al ${{ steps.srtool_build.outputs.wasm_compressed }}
+          echo "::endgroup::"
 
       - name: Archive Artifacts for ${{ matrix.chain }}
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.chain }}-runtime
           path: |
diff --git a/Dockerfile b/Dockerfile
index 06292ad..95dc261 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM docker.io/library/ubuntu:22.04
 LABEL maintainer "chevdor@gmail.com"
 LABEL description="This image contains tools for Substrate blockchains runtimes."
 
-ARG RUSTC_VERSION="1.81.0"
+ARG RUSTC_VERSION="1.84.0"
 ENV RUSTC_VERSION=$RUSTC_VERSION
 ENV DOCKER_IMAGE="paritytech/srtool"
 ENV PROFILE=release
@@ -56,6 +56,7 @@ RUN echo $SHELL && \
     . $CARGO_HOME/env && \
     rustup toolchain add stable ${RUSTC_VERSION} && \
     rustup target add wasm32-unknown-unknown --toolchain $RUSTC_VERSION && \
+    rustup target add wasm32v1-none --toolchain $RUSTC_VERSION && \
     rustup component add rust-src --toolchain $RUSTC_VERSION && \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \
     rustup show && rustc -V
diff --git a/README.md b/README.md
index 3d9fdec..b1b77cb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Substrate Runtime Toolbox: srtool v0.17.0
+# Substrate Runtime Toolbox: srtool v0.18.0
 
 ![srtool docker 128px](resources/srtool-docker_128px.png)
 
@@ -18,11 +18,11 @@ The Docker images are tagged with both the rustc version used internally as well
 
 You may find for instance the following:
 
--   `paritytech/srtool:1.81.0-0.17.0`
+-   `paritytech/srtool:1.84.0-0.18.0`
 
--   `paritytech/srtool:1.81.0`
+-   `paritytech/srtool:1.84.0`
 
-The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.81.0` is the same image than `paritytech/srtool:1.81.0-0.17.0`.
+The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.84.0` is the same image than `paritytech/srtool:1.84.0-0.18.0`.
 
 ## Related tools
 
@@ -47,7 +47,7 @@ You may also want to have a look at [subwasm](https://github.com/chevdor/subwasm
 The project was initially developed by <https://gitlab.com/chevdor>.
 It has now moved to Github under the [Parity Technologies](https://www.github.com/paritytech) organisation to simplify the developement and the integration with other Parity products such as Polkadot and Kusama.
 
-The last version hosted on Gitlab has been built using Rust Stable 1.81.0. It is tagged as v0.17.0 and there is no plan on updating the Gitlab repository further. New versions will be available from [this repository](https://www.github.com/paritytech/srtool) only. The functionalities remain the same so you can (and should!) simply swap `chevdor/srtool` for `paritytech/srtool` in your workflows. The [srtool-actions](https://github.com/chevdor/srtool-actions) will remain available as `chevdor/srtool-actions@<version>` and will be updated to point at the paritytech image.
+The last version hosted on Gitlab has been built using Rust Stable 1.84.0. It is tagged as v0.18.0 and there is no plan on updating the Gitlab repository further. New versions will be available from [this repository](https://www.github.com/paritytech/srtool) only. The functionalities remain the same so you can (and should!) simply swap `chevdor/srtool` for `paritytech/srtool` in your workflows. The [srtool-actions](https://github.com/chevdor/srtool-actions) will remain available as `chevdor/srtool-actions@<version>` and will be updated to point at the paritytech image.
 
 ## Install
 
@@ -63,7 +63,7 @@ This method is legacy and deprecated. It is recommended to use the `srtool-cli`
 
 Creating an alias helps hiding the docker complexity behind one simple command. We will see more powerful options but this one is simple enough.
 
-        export RUSTC_VERSION=1.81.0; export PACKAGE=kusama-runtime; alias srtool='docker run --rm -it -e PACKAGE=$PACKAGE -v $PWD:/build -v $TMPDIR/cargo:/cargo-home paritytech/srtool:$RUSTC_VERSION'
+        export RUSTC_VERSION=1.84.0; export PACKAGE=kusama-runtime; alias srtool='docker run --rm -it -e PACKAGE=$PACKAGE -v $PWD:/build -v $TMPDIR/cargo:/cargo-home paritytech/srtool:$RUSTC_VERSION'
 
 Note that defining the alias as done above will hardcode the runtime. Using `kusama-runtime` as shown above means you will **always** check the Kusama runtime. If you need more, check the next chapter.
 
@@ -91,9 +91,9 @@ Invoking `srtool build` with
 
 will output something that looks like this:
 
-        🧰 Substrate Runtime Toolbox - srtool v0.17.0 🧰
+        🧰 Substrate Runtime Toolbox - srtool v0.18.0 🧰
                   - by Chevdor -
-        🏗  Building polkadot-runtime as release using rustc 1.81.0
+        🏗  Building polkadot-runtime as release using rustc 1.84.0
         ⏳ That can take a little while, be patient... subsequent builds will be faster.
         Since you have to wait a little, you may want to learn more about Substrate runtimes:
         https://docs.substrate.io/learn/architecture/
@@ -104,7 +104,7 @@ and finally …​
 
     ✨ Your Substrate WASM Runtime is ready! ✨
     Summary:
-      Generator  : srtool v0.17.0
+      Generator  : srtool v8
       Version    : null
       GIT commit : 56b9e95a9b634695f59a7c699bc68a5cfb695f03
       GIT tag    : moonriver-genesis
@@ -134,13 +134,13 @@ If you prefer a json output, srtool has you covered:
 The output will look something like:
 
     {
-        "gen": "srtool v0.17.0",
+        "gen": "srtool v0.18.0",
         "src": "git",
         "version": "1.0.0",
         "commit": "85cad2ef48f123d7475385b00d113bc900324ad6",
         "tag": "statemine-v1.0.0",
         "branch": "wk-gh-actions",
-        "rustc": "rustc 1.81.0 (...)",
+        "rustc": "rustc 1.84.0 (...)",
         "pkg": "statemine-runtime",
         "tmsp": "2021-06-22T18:08:50Z",
         "size": "1538747",
@@ -151,7 +151,7 @@ The output will look something like:
         "info": {
           "generator": {
             "name": "srtool",
-            "version": "0.17.0"
+            "version": "0.18.0"
           },
           "src": "git",
           "version": "1.0.0",
@@ -160,7 +160,7 @@ The output will look something like:
             "tag": "statemine-v1.0.0",
             "branch": "wk-gh-actions"
           },
-          "rustc": "rustc 1.81.0 (...)",
+          "rustc": "rustc 1.84.0 (...)",
           "pkg": "statemine-runtime",
           "profile": "release"
         },
@@ -301,7 +301,7 @@ You can see the list of available scripts in the `/scripts` folder:
 
 -   `scan`: Scan a repo for runtimes
 
-The `info` and `version` scripts pass any arguments you pass to the script to `jq`. So you can play with `c` (compact), `-M` (monochrome), `-C` color output. For instance `docker run --rm -it -v $PWD:/build chevdor/srtool:1.81.0 info -cM` shows a monochrome output on a single line.
+The `info` and `version` scripts pass any arguments you pass to the script to `jq`. So you can play with `c` (compact), `-M` (monochrome), `-C` color output. For instance `docker run --rm -it -v $PWD:/build chevdor/srtool:1.84.0 info -cM` shows a monochrome output on a single line.
 
 ## Build your custom chain / parachain
 
@@ -332,7 +332,7 @@ If you mount this docker volume, you will find the wasm on your local filesystem
         # REPO=fellowship-runtimes
         podman run --rm -it \
             -v $REPO:/build \
-            `paritytech/srtool:1.81.0-0.17.0` scan
+            `paritytech/srtool:1.84.0-0.18.0` scan
 
 ## ZSH/ Zinit users
 
@@ -360,6 +360,6 @@ First you may want to double check what rustc versions are available as you will
 
     rustup check
 
-So say you want to build a builder for rustc 1.81.0:
+So say you want to build a builder for rustc 1.84.0:
 
-        RUSTC_VERSION=1.81.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION .
+        RUSTC_VERSION=1.84.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION .
diff --git a/README_src.adoc b/README_src.adoc
index 8475dd2..22722c9 100644
--- a/README_src.adoc
+++ b/README_src.adoc
@@ -1,6 +1,6 @@
 :name: paritytech/srtool
-:rsversion: 1.81.0
-:version: 0.17.0
+:rsversion: 1.84.0
+:version: 0.18.0
 // :rsversion: pass:m[include:RUSTC_VERSION[]] // TODO: not working...
 :toc: right
 :sectnums:
diff --git a/RUSTC_VERSION b/RUSTC_VERSION
index dbd4126..bd0f9e6 100644
--- a/RUSTC_VERSION
+++ b/RUSTC_VERSION
@@ -1 +1 @@
-1.81.0
+1.84.0
diff --git a/VERSION b/VERSION
index c5523bd..6633391 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17.0
+0.18.0
diff --git a/scripts/build b/scripts/build
index 95c535a..ea92c22 100755
--- a/scripts/build
+++ b/scripts/build
@@ -53,6 +53,8 @@ fi
 
 # The following is to prevent user's overrides to disturb srtool
 rustup override set $RUSTC_VERSION
+rustup target add wasm32-unknown-unknown
+rustup component add rust-src
 
 export RUSTCV=`rustc -V`