diff --git a/images/pegleg/Dockerfile.opensuse_15 b/images/pegleg/Dockerfile.opensuse_15
index 0a4a82f9..cc4dbe6a 100644
--- a/images/pegleg/Dockerfile.opensuse_15
+++ b/images/pegleg/Dockerfile.opensuse_15
@@ -18,9 +18,12 @@ ARG PROMENADE_VERSION=branch/master
 RUN set -x \
     && zypper up -y \
     && zypper --non-interactive install \
+         automake \
          curl \
          gcc \
          git-core \
+         libtool \
+         make \
          openssh \
          python3 \
          python3-dbm \
@@ -41,6 +44,20 @@ RUN pip3 install -U pip \
          /var/log/* \
          /var/tmp/*
 
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 VOLUME /var/pegleg
 WORKDIR /var/pegleg
 
diff --git a/images/pegleg/Dockerfile.ubuntu_bionic b/images/pegleg/Dockerfile.ubuntu_bionic
index 73d0ff50..5423e0f1 100644
--- a/images/pegleg/Dockerfile.ubuntu_bionic
+++ b/images/pegleg/Dockerfile.ubuntu_bionic
@@ -18,6 +18,7 @@ ARG PROMENADE_VERSION=branch/master
 RUN set -ex \
     && apt-get update -qq \
     && apt-get install -y --no-install-recommends \
+         automake \
          ca-certificates \
          curl \
          gcc \
@@ -25,6 +26,8 @@ RUN set -ex \
          gpg \
          gpg-agent \
          libssl-dev \
+         libtool \
+         make \
          netbase \
          openssh-client \
          python3-dev \
@@ -42,6 +45,20 @@ RUN set -ex \
          /var/log/* \
          /var/tmp/*
 
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 VOLUME /var/pegleg
 WORKDIR /var/pegleg
 
diff --git a/images/pegleg/Dockerfile.ubuntu_xenial b/images/pegleg/Dockerfile.ubuntu_xenial
index fa7b9b0b..8d4b2584 100644
--- a/images/pegleg/Dockerfile.ubuntu_xenial
+++ b/images/pegleg/Dockerfile.ubuntu_xenial
@@ -18,11 +18,14 @@ ARG PROMENADE_VERSION=branch/master
 RUN set -ex \
     && apt-get update -qq \
     && apt-get install -y --no-install-recommends \
+         automake \
          ca-certificates \
          curl \
          gcc \
          git \
          libssl-dev \
+         libtool \
+         make \
          netbase \
          openssh-client \
          python3-dev \
@@ -40,6 +43,20 @@ RUN set -ex \
          /var/log/* \
          /var/tmp/*
 
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 VOLUME /var/pegleg
 WORKDIR /var/pegleg