diff --git a/build-linux.sh b/build-linux.sh
index 9fd6587..48a08fb 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -13,5 +13,5 @@ docker run -it --rm \
   -u jenkins:$(getent group $(whoami) | cut -d: -f3) \
   -v "${PWD}:/status-node" \
   -w /status-node \
-  statusteam/status-node-build:0.1.0 \
+  statusteam/nim-status-client-build:1.0.2 \
   ./docker-linux-app-image.sh
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 6f746ba..39e2b90 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,7 +17,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
  && sudo apt purge -yq gnupg \
  && sudo apt install -yq --fix-missing \
       build-essential cmake jq git s3cmd gnupg2 \
-      libpcre3-dev libnss3 libxcomposite1 libxtst6
+      libpcre3-dev libnss3 libxcomposite1 libxtst6 \
+      gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
+      gstreamer1.0-plugins-ugly gstreamer1.0-libav \
+      gstreamer1.0-tools gstreamer1.0-alsa gstreamer1.0-pulseaudio
 
 # Installing Golang
 RUN GOLANG_SHA256="aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067" \
@@ -42,5 +45,5 @@ USER jenkins
 ENV HOME="/home/jenkins"
 
 LABEL maintainer="jakub@status.im"
-LABEL source="https://github.com/status-im/status-node"
-LABEL description="Build image for Status Desktop Node"
+LABEL source="https://github.com/status-im/status-desktop"
+LABEL description="Build image for the Status Desktop client written in Nim."
diff --git a/ui/app/AppLayout.qml b/ui/app/AppLayout.qml
index 4906aa4..2db463f 100644
--- a/ui/app/AppLayout.qml
+++ b/ui/app/AppLayout.qml
@@ -126,6 +126,7 @@ Column {
                 wakuV2Nodes = Object.keys(fleetConfig["waku"]).map(function(k){return fleetConfig["waku"][k]});
             } else {
                 boot =  Object.keys(fleetConfig["boot"]).map(function(k){return fleetConfig["boot"][k]});
+                boot = boot.concat(Object.keys(fleetConfig["whisper"]).map(function(k){return fleetConfig["whisper"][k]}));
                 mailservers = Object.keys(fleetConfig["mail"]).map(function(k){return fleetConfig["mail"][k]});
             }
 
@@ -163,7 +164,7 @@ Column {
                     "Min": 2
                 }
             },
-            "NoDiscovery": useWakuV2 ? true : false,
+            "NoDiscovery": false,//useWakuV2 ? true : false,
             "Rendezvous": false,
             "ClusterConfig": {
                 "Enabled": true,
@@ -177,6 +178,8 @@ Column {
                 "WakuStoreNodes": wakuV2Nodes
             }
         }
+
+        console.log(JSON.stringify(configJSON))
         nodeModel.startNode(JSON.stringify(configJSON))
         }
     }