diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile
index 2c97f99c..67c69624 100644
--- a/linux_docker_resources/Dockerfile
+++ b/linux_docker_resources/Dockerfile
@@ -123,6 +123,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   python3-pytest-rerunfailures \
   python3-pytest-runner \
   python3-pytest-timeout \
+  python3-typeshed \
   python3-yaml \
   uncrustify \
   yamllint
diff --git a/linux_docker_resources/Dockerfile-RHEL b/linux_docker_resources/Dockerfile-RHEL
index 35d53cfe..1ec450d5 100644
--- a/linux_docker_resources/Dockerfile-RHEL
+++ b/linux_docker_resources/Dockerfile-RHEL
@@ -158,6 +158,7 @@ RUN dnf install \
     python3-rosdistro \
     python3-setuptools \
     python3-sip-devel \
+    $(if test ${EL_RELEASE/.*/} != 8; then echo python3-types-pyyaml; fi) \
     qt5-qtbase \
     qt5-qtbase-devel \
     qt5-qtbase-gui \
diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py
index a26bc59e..f526c516 100644
--- a/ros2_batch_job/__main__.py
+++ b/ros2_batch_job/__main__.py
@@ -82,6 +82,7 @@
     PipPackage('pytest-timeout', 'pytest_timeout', '==2.1.0'),
     PipPackage('pyyaml', 'yaml', ''),
     PipPackage('setuptools', 'setuptools', '==59.6.0'),
+    PipPackage('types-pyyaml', 'types_pyyaml', ''),
     PipPackage('vcstool', 'vcstool', ''),
     PipPackage('yamllint', 'yamllint', ''),
 ]