diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 772c84c4..c8d107f2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -20,7 +20,7 @@ jobs:
         cargo +$WASM_BUILD_TOOLCHAIN --version
         rustc +$WASM_BUILD_TOOLCHAIN --version
       env:
-        WASM_BUILD_TOOLCHAIN: nightly-2021-03-15
+        WASM_BUILD_TOOLCHAIN: nightly-2022-06-02
     - name: Cache Cargo
       uses: actions/cache@v2
       with:
diff --git a/Dockerfile b/Dockerfile
index 521c00fc..d5ce5b1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 #FROM paritytech/ci-linux:production as builder
 #FROM decentration/edgeware:v3.3.3 as builder
-FROM depthhoar/edgeware-node:v3.3.3 as builder
+#FROM depthhoar/edgeware-node:v3.3.3 as builder
+FROM eteissonniere/edgeware:latest as builder
 
 LABEL description="This is the build stage for edgeware. Here we create the binary."
 
@@ -10,9 +11,9 @@ WORKDIR /edgeware
 COPY . /edgeware/
 #RUN  fallocate -l 1G /swapfile
 RUN rustup uninstall nightly
-RUN rustup install nightly-2021-05-31
+RUN rustup install nightly-2022-06-02
 RUN rustup update nightly
-RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2021-05-31
+RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2022-06-02
 
 
 RUN cargo build --$PROFILE -j 1
diff --git a/README.md b/README.md
index 82daa30a..fa1fc5d6 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Images that have failed to build typically are hard to remove. The best way to r
 If the above image failed to compile `edgeware-cli`, then it's because your machine doesnt have enough memory; or your docker doesn't have enough memory available. Try and increase Docker's available memory by a few notches, by going to Docker Desktop settings.
 
 #### Pull image and run (no compile)
-If you want to use our previously-built image `depthhoar/edgeware-node:v3.3.3`, you can use docker-compose:
+If you want to use our previously-built image `eteissonniere/edgeware:latest`, you can use docker-compose:
 
 ```
 cd docker; docker-compose up
@@ -97,7 +97,7 @@ You will have exposed ports 9933, 9944 and 30333.
 Then run:
 
 ```
-docker run --rm -it depthhoar/edgeware-node:v3.3.3 edgeware --chain=edgeware --name <INSERT NAME> --wasm-execution Compiled
+docker run --rm -it eteissonniere/edgeware:latest edgeware --chain=edgeware --name <INSERT NAME> --wasm-execution Compiled
 ```
 
 ### Benchmarking
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e335a2ae..fea3a94e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,9 +8,9 @@ WORKDIR /edgeware
 COPY . /edgeware/
 #RUN  fallocate -l 1G /swapfile
 RUN rustup uninstall nightly
-RUN rustup install nightly-2021-05-31
+RUN rustup install nightly-2022-06-02
 RUN rustup update nightly
-RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2021-05-31
+RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2022-06-02
 
 
 RUN cargo build --$PROFILE -j 1
diff --git a/docker/docker-compose-3.yml b/docker/docker-compose-3.yml
new file mode 100644
index 00000000..b22b0835
--- /dev/null
+++ b/docker/docker-compose-3.yml
@@ -0,0 +1,16 @@
+version: '3.3'
+services:
+  edgeware:
+    build:
+      context: .
+    ports:
+      - "0.0.0.0:9933:9933/tcp"
+      - "0.0.0.0:9944:9944/tcp"
+      - "0.0.0.0:30333:30333/tcp"
+    image: depthhoar/edgeware-node:v3.3.3
+    command: bash -c "edgeware --chain=edgeware --name <INSERT NAME> --wasm-execution Compiled"
+    volumes:
+     - "edgeware-data:/data"
+    
+volumes:
+  edgeware-data:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f426f667..37956856 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '4.0.0'
 services:
   edgeware:
     build:
@@ -7,10 +7,10 @@ services:
       - "0.0.0.0:9933:9933/tcp"
       - "0.0.0.0:9944:9944/tcp"
       - "0.0.0.0:30333:30333/tcp"
-    image: depthhoar/edgeware-node:v3.3.3
+    image: eteissonniere/edgeware:latest
     command: bash -c "edgeware --chain=edgeware --name <INSERT NAME> --wasm-execution Compiled"
     volumes:
      - "edgeware-data:/data"
     
 volumes:
-  edgeware-data:
\ No newline at end of file
+  edgeware-data:
diff --git a/docker/mainnet.yml b/docker/mainnet.yml
index f5937bb0..3b82c761 100644
--- a/docker/mainnet.yml
+++ b/docker/mainnet.yml
@@ -1,7 +1,7 @@
-version: '3.3'
+version: '4.0.0'
 services:
   edgeware:
-    image: hicommonwealth/edgeware:v3.3.3
+    image: eteissonniere/edgeware:latest
     logging:
       driver: "json-file"
       options:
diff --git a/scripts/init.sh b/scripts/init.sh
index d51d2045..da4a7fea 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -18,11 +18,11 @@ fi
 if [[ $(cargo --version) ]]; then
     echo "Found cargo"
 else
-    curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2021-03-15
+    curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2022-06-02
     source $HOME/.cargo/env
     export PATH=$HOME/.cargo/bin:$PATH
 fi
 
 rustup update stable
 rustup update nightly
-rustup target add wasm32-unknown-unknown --toolchain nightly-2021-03-15
+rustup target add wasm32-unknown-unknown --toolchain nightly-2022-06-02