diff --git a/src/bin/shipyard_airflow/requirements.txt b/src/bin/shipyard_airflow/requirements.txt
index 7be5bee1..8b433417 100644
--- a/src/bin/shipyard_airflow/requirements.txt
+++ b/src/bin/shipyard_airflow/requirements.txt
@@ -29,6 +29,7 @@ oslo.config==6.4.0
 oslo.policy==1.38.1
 PasteDeploy==1.5.2
 psycopg2-binary==2.8.4
+pylibyaml~=0.1
 python-dateutil==2.7.3
 python-memcached==1.59
 requests==2.20.0
diff --git a/src/bin/shipyard_airflow/shipyard_airflow/__init__.py b/src/bin/shipyard_airflow/shipyard_airflow/__init__.py
index e69de29b..7faf876b 100644
--- a/src/bin/shipyard_airflow/shipyard_airflow/__init__.py
+++ b/src/bin/shipyard_airflow/shipyard_airflow/__init__.py
@@ -0,0 +1 @@
+import pylibyaml  # noqa: F401  # patch pyyaml to use libyaml bindings
diff --git a/src/bin/shipyard_airflow/tests/__init__.py b/src/bin/shipyard_airflow/tests/__init__.py
index e69de29b..7faf876b 100644
--- a/src/bin/shipyard_airflow/tests/__init__.py
+++ b/src/bin/shipyard_airflow/tests/__init__.py
@@ -0,0 +1 @@
+import pylibyaml  # noqa: F401  # patch pyyaml to use libyaml bindings
diff --git a/src/bin/shipyard_client/requirements.txt b/src/bin/shipyard_client/requirements.txt
index 9860012d..6e1b6e21 100644
--- a/src/bin/shipyard_client/requirements.txt
+++ b/src/bin/shipyard_client/requirements.txt
@@ -20,4 +20,5 @@ click-default-group==1.2
 keystoneauth1==3.11.1
 requests==2.20.0
 PTable==0.9.2
+pylibyaml==0.1.0
 pyyaml==5.1
diff --git a/src/bin/shipyard_client/shipyard_client/__init__.py b/src/bin/shipyard_client/shipyard_client/__init__.py
index e69de29b..7faf876b 100644
--- a/src/bin/shipyard_client/shipyard_client/__init__.py
+++ b/src/bin/shipyard_client/shipyard_client/__init__.py
@@ -0,0 +1 @@
+import pylibyaml  # noqa: F401  # patch pyyaml to use libyaml bindings
diff --git a/src/bin/shipyard_client/tests/__init__.py b/src/bin/shipyard_client/tests/__init__.py
index e69de29b..7faf876b 100644
--- a/src/bin/shipyard_client/tests/__init__.py
+++ b/src/bin/shipyard_client/tests/__init__.py
@@ -0,0 +1 @@
+import pylibyaml  # noqa: F401  # patch pyyaml to use libyaml bindings