diff --git a/ce/Dockerfile b/ce/Dockerfile
index 4fc6559..228fba0 100644
--- a/ce/Dockerfile
+++ b/ce/Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build an rviz image based on Ubuntu
 ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
-FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.0
+FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.2
 
 LABEL description="MOV.AI Graphical Tools"
 LABEL maintainer="devops@mov.ai"
diff --git a/files/bin/rviz.sh b/files/bin/rviz.sh
index 6dc4129..531347c 100755
--- a/files/bin/rviz.sh
+++ b/files/bin/rviz.sh
@@ -3,3 +3,4 @@
 set -e
 . /opt/ros/noetic/setup.bash
 ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}" "/opt/ros/noetic/bin/rviz" "-d" "/headless/default.rviz"
+
diff --git a/files/ubuntu/install/ros-tools.sh b/files/ubuntu/install/ros-tools.sh
index 0717dbe..5bb027e 100644
--- a/files/ubuntu/install/ros-tools.sh
+++ b/files/ubuntu/install/ros-tools.sh
@@ -4,7 +4,7 @@ set -e
 
 echo "Setup movai ROS-Tools mirror repo"
 curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | gpg --dearmor -o /usr/share/keyrings/ros.key
-    echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null
+echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null
 
 echo "Install ROS-Tools components"
 apt-get update
diff --git a/files/ubuntu/install/rqt.sh b/files/ubuntu/install/rqt.sh
index b2e0bd0..dc37ad6 100644
--- a/files/ubuntu/install/rqt.sh
+++ b/files/ubuntu/install/rqt.sh
@@ -2,10 +2,6 @@
 ### every exit != 0 fails the script
 set -e
 
-echo "Setup ROS-Tools repo"
-sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
-curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
-
 echo "Install ROS-Tools components"
 apt-get update
 apt-get install -y ros-$ROS_DISTRO-rqt-plot ros-$ROS_DISTRO-rqt-tf-tree ros-$ROS_DISTRO-rqt-reconfigure --no-install-recommends
diff --git a/noetic/Dockerfile b/noetic/Dockerfile
index 5babb10..c0e73c3 100644
--- a/noetic/Dockerfile
+++ b/noetic/Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build an headless vnc image based on Ubuntu
 ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
-FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.0
+FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.2
 
 LABEL description="MOV.AI Graphical Tools"
 LABEL maintainer="devops@mov.ai"
@@ -73,8 +73,8 @@ RUN $INST_SCRIPTS/foxglove.sh
 
 ### Install ROS1 tools
 ENV ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"
-RUN $INST_SCRIPTS/rqt.sh
 RUN $INST_SCRIPTS/ros-tools.sh && \
+    $INST_SCRIPTS/rqt.sh && \
     ### Clean
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \