diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6b38d105b1..7a8af78434 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -108,7 +108,7 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }},iotaledger/wasp:latest
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BUILD_LD_FLAGS=-X=github.com/iotaledger/wasp/core/app.Version=${{ steps.tagger.outputs.tag }}
diff --git a/tools/local-setup/README.md b/tools/local-setup/README.md
index 0315d2f81e..b7bec8e1d4 100644
--- a/tools/local-setup/README.md
+++ b/tools/local-setup/README.md
@@ -7,12 +7,13 @@ setup.
 
 ### Starting
 
-**Note** You need to build the wasp container using `build_container.sh` if
-you're on Mac/Linux or `build_container.cmd` on windows so that the `wasp`
-version is properly set.
+Run `docker-compose pull` to fetch the dependencies.
 
 Run `docker-compose up` to start the setup.
 
+After startup, you should be able to see the wasp dashboard on:
+http://localhost/wasp/dashboard/
+
 ### Stopping
 
 Press `Ctrl-C` to shut down the setup, but don't press it twice to force it.
@@ -25,12 +26,9 @@ You can also shut down the setup with `docker-compose down` in a new terminal.
 Run `docker-compose down --volumes` to shut down the nodes and to remove all
 databases.
 
-### Recreation
-
-If you made changes to the Wasp code and want to use it inside the setup, you
-need to recreate the Wasp image.
+### Re-build
 
-Run `docker-compose build`
+If you made changes to the Wasp code and want to use it inside the setup, you can re-build the Wasp image using `build_container.sh` or `build_container.cmd`.
 
 ## Ports
 
@@ -46,14 +44,9 @@ The nodes will then be reachable under these ports:
 
 ## Wasp-cli setup
 
-To configure a new wasp-cli you can use the following commands:
-
-:::note
-
-You can either use a wasp-cli installed on your system, or use the one built-in
-to the wasp docker container by doing: `docker exec  wasp /app/wasp-cli init`
+Download the wasp cli from the [releases page](https://github.com/iotaledger/wasp/releases)
 
-:::
+To configure a new wasp-cli you can use the following commands:
 
 ```shell
 wasp-cli init
@@ -66,7 +59,7 @@ To create a chain:
 
 ```shell
 wasp-cli request-funds
-wasp-cli chain deploy --nodes=0 --quorum=1 --chain=testchain --description="Test Chain"
+wasp-cli chain deploy --chain=testchain
 ```
 
 After a chain has been created, the EVM JSON-RPC can be accessed via:
diff --git a/tools/local-setup/docker-compose.yml b/tools/local-setup/docker-compose.yml
index 796ab92b27..53158324dc 100644
--- a/tools/local-setup/docker-compose.yml
+++ b/tools/local-setup/docker-compose.yml
@@ -1,6 +1,5 @@
 version: "3.9"
 services:
-
   #####################################################
   # Reverse Proxy (needed to rewrite dashboard route) #
   #####################################################
@@ -18,7 +17,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   ###############
-  # HORNET nest #                                         
+  # HORNET nest #
   ###############
 
   hornet-nest:
@@ -65,23 +64,23 @@ services:
       - ALL
 
   ########
-  # WASP #                                         
+  # WASP #
   ########
 
   wasp:
     container_name: wasp
     image: iotaledger/wasp:latest
+
     build:
       context: ../../
       dockerfile: Dockerfile.noncached
       args:
-        BUILD_TAGS: "${BUILD_TAGS:-rocksdb}"
         BUILD_LD_FLAGS: "${BUILD_LD_FLAGS:--X=github.com/iotaledger/wasp/core/app.Version=v0.0.0-testing}"
     ulimits:
       nofile:
         soft: 16384
         hard: 16384
-    restart: on-failure:10
+    restart: on-failure:1
     stop_grace_period: 5m
     depends_on:
       traefik: