diff --git a/industrial_ci/src/env.sh b/industrial_ci/src/env.sh
index ef397e42b..a546388ff 100644
--- a/industrial_ci/src/env.sh
+++ b/industrial_ci/src/env.sh
@@ -123,6 +123,10 @@ function set_ros_variables {
     "eloquent")
         ros2_defaults "bionic"
         ;;
+    "foxy")
+        ros2_defaults "bionic"
+        DOCKER_IMAGE=${DOCKER_IMAGE:-osrf/ros2:nightly}
+        ;;
     esac
 
     local prefix=ros
diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh
index 8e3386713..22d5bb478 100644
--- a/industrial_ci/src/workspace.sh
+++ b/industrial_ci/src/workspace.sh
@@ -234,15 +234,12 @@ function ici_exec_in_workspace {
 function ici_install_dependencies {
     local extend=$1; shift
     local skip_keys=$1; shift
-    local cmake_prefix_path
-    cmake_prefix_path="$(ici_exec_in_workspace "$extend" . env | grep -oP '^CMAKE_PREFIX_PATH=\K.*')" || true
-
     rosdep_opts=(-q --from-paths "$@" --ignore-src -y)
     if [ -n "$skip_keys" ]; then
       rosdep_opts+=(--skip-keys "$skip_keys")
     fi
     set -o pipefail # fail if rosdep install fails
-    ROS_PACKAGE_PATH=$cmake_prefix_path ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" | { grep "executing command" || true; }
+    ici_exec_in_workspace "$extend" "." rosdep install "${rosdep_opts[@]}" | { grep "executing command" || true; }
     set +o pipefail
 }