diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c79cc3db..2fa38997 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,11 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ inputs.ci_target_ref }}
 
+<<<<<<< HEAD
       - uses: ros-tooling/setup-ros@0.7.0
+=======
+      - uses: ros-tooling/setup-ros@0.7.9
+>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -65,7 +69,11 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ inputs.ci_target_ref }}
 
+<<<<<<< HEAD
       - uses: ros-tooling/setup-ros@0.7.0
+=======
+      - uses: ros-tooling/setup-ros@0.7.9
+>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -213,7 +221,11 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ inputs.ci_target_ref }}
 
+<<<<<<< HEAD
       - uses: ros-tooling/setup-ros@0.7.0
+=======
+      - uses: ros-tooling/setup-ros@0.7.9
+>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
diff --git a/config/freertos/esp32/build.sh b/config/freertos/esp32/build.sh
index bf6e0b1f..3325c457 100755
--- a/config/freertos/esp32/build.sh
+++ b/config/freertos/esp32/build.sh
@@ -1,5 +1,8 @@
 EXTENSIONS_DIR=$FW_TARGETDIR/freertos_apps/microros_esp32_extensions
 
+# Source virtualenv
+source $FW_TARGETDIR/venv/bin/activate
+
 . $PREFIX/config/utils.sh
 
 export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh
index a2e11e45..f92f04e5 100755
--- a/config/freertos/esp32/create.sh
+++ b/config/freertos/esp32/create.sh
@@ -1,4 +1,13 @@
 pushd $FW_TARGETDIR >/dev/null
+    # Create a virtual environment
+    python3 -m venv $FW_TARGETDIR/venv
+    source $FW_TARGETDIR/venv/bin/activate
+
+    # Install deps
+    pip3 install catkin_pkg empy lark-parser colcon-common-extensions
+
+    pip3 install virtualenv
+
     # Install toolchain
     mkdir toolchain
 
@@ -19,7 +28,10 @@ pushd $FW_TARGETDIR >/dev/null
             echo "Error: python3-pip package must be installed before continuing..."
             exit 1
         fi
+<<<<<<< HEAD
         pip3 install virtualenv
+=======
+>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         python3 esp-idf/tools/idf_tools.py install-python-env
 
         eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
diff --git a/config/freertos/esp32/flash.sh b/config/freertos/esp32/flash.sh
index 3322c221..64c05585 100755
--- a/config/freertos/esp32/flash.sh
+++ b/config/freertos/esp32/flash.sh
@@ -3,6 +3,9 @@ EXTENSIONS_DIR=$FW_TARGETDIR/freertos_apps/microros_esp32_extensions
 export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
 export IDF_PATH=$FW_TARGETDIR/toolchain/esp-idf
 
+# Source virtualenv
+source $FW_TARGETDIR/venv/bin/activate
+
 eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
 
 . $IDF_PATH/export.sh
diff --git a/config/zephyr/generic/build.sh b/config/zephyr/generic/build.sh
index dcda6ab9..41bc9d12 100755
--- a/config/zephyr/generic/build.sh
+++ b/config/zephyr/generic/build.sh
@@ -1,6 +1,8 @@
 . $PREFIX/config/utils.sh
 
 pushd $FW_TARGETDIR >/dev/null
+    source $FW_TARGETDIR/venv/bin/activate
+
     source $FW_TARGETDIR/zephyrproject/zephyr/zephyr-env.sh
 
     export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
index 13fa6ee7..cc0d1f71 100755
--- a/config/zephyr/generic/create.sh
+++ b/config/zephyr/generic/create.sh
@@ -18,6 +18,19 @@ export PATH=~/.local/bin:"$PATH"
 export ZEPHYR_VERSION="v0.12.4"
 export ARCH=$(uname -m)
 
+<<<<<<< HEAD
+=======
+# Create a virtual environment
+python3 -m venv $FW_TARGETDIR/venv
+source $FW_TARGETDIR/venv/bin/activate
+
+# Install west
+pip3 install west
+
+# Install requirements
+pip3 install catkin_pkg empy
+
+>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
 pushd $FW_TARGETDIR >/dev/null
 
     west init zephyrproject
diff --git a/config/zephyr/generic/flash.sh b/config/zephyr/generic/flash.sh
index 13fb4bef..136ce1fa 100755
--- a/config/zephyr/generic/flash.sh
+++ b/config/zephyr/generic/flash.sh
@@ -1,5 +1,7 @@
 pushd $FW_TARGETDIR > /dev/null
 
+source $FW_TARGETDIR/venv/bin/activate
+
 ZEPHYR_BUILD_DIR="$FW_TARGETDIR/build/zephyr"
 
 # Host platform (=native_posix) is special, as flashing is actually just executing the binary
diff --git a/config/zephyr/generic/package.xml b/config/zephyr/generic/package.xml
index 94694da6..d6a85938 100644
--- a/config/zephyr/generic/package.xml
+++ b/config/zephyr/generic/package.xml
@@ -15,6 +15,7 @@
   <build_depend>gcc-multilib</build_depend>
   <build_depend>g++-multilib</build_depend>
   <build_depend>openocd</build_depend>
+  <build_depend>python3-venv</build_depend>
 
   <build_depend>python3-west-pip</build_depend>