diff --git a/builder/test/tests.sh b/builder/test/tests.sh
index 70616eaa..008944de 100755
--- a/builder/test/tests.sh
+++ b/builder/test/tests.sh
@@ -60,3 +60,8 @@ rosversion image_view
 
 # validate examples are present
 [[ $(ls /home/pi/examples/*) ]]
+
+# validate web tools present
+[ -d /home/pi/.ros/www ]
+[ "$(readlink /home/pi/.ros/www/clover)" = "/home/pi/catkin_ws/src/clover/clover/www" ]
+[ "$(readlink /home/pi/.ros/www/clover_blocks)" = "/home/pi/catkin_ws/src/clover/clover_blocks/www" ]
diff --git a/clover/launch/clover.launch b/clover/launch/clover.launch
index 26ec4454..c0e4ccde 100644
--- a/clover/launch/clover.launch
+++ b/clover/launch/clover.launch
@@ -84,9 +84,4 @@
         <!-- Send fake GCS heartbeats. Set to "true" for upstream PX4 -->
         <param name="use_fake_gcs" value="false"/>
     </node>
-
-    <!-- Update static directory -->
-    <node pkg="roswww_static" name="roswww_static" type="main.py" clear_params="true">
-        <param name="default_package" value="clover"/>
-    </node>
 </launch>
diff --git a/roswww_static/CMakeLists.txt b/roswww_static/CMakeLists.txt
index bb9e1fc7..9b32cadb 100644
--- a/roswww_static/CMakeLists.txt
+++ b/roswww_static/CMakeLists.txt
@@ -10,3 +10,6 @@ install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 catkin_install_python(PROGRAMS main.py
     DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+add_custom_target(roswww_static ALL
+    COMMAND rosrun roswww_static main.py)