diff --git a/images/airflow/Dockerfile.opensuse_15 b/images/airflow/Dockerfile.opensuse_15
index 74db4b11..e87b67d1 100644
--- a/images/airflow/Dockerfile.opensuse_15
+++ b/images/airflow/Dockerfile.opensuse_15
@@ -93,7 +93,9 @@ RUN curl -L -o /usr/local/bin/kubectl \
 #    https://github.com/puckel/docker-airflow/issues/77
 COPY images/airflow/requirements.txt /tmp/
 RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \
-    && pip3 uninstall -y snakebite || true
+    && pip3 uninstall -y snakebite || true \
+    && pip3 uninstall -y psycopg2 || true \
+    && pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true
 
 # Copy scripts used in the container:
 COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
diff --git a/images/airflow/Dockerfile.ubuntu_bionic b/images/airflow/Dockerfile.ubuntu_bionic
index 2801987a..530c1e13 100644
--- a/images/airflow/Dockerfile.ubuntu_bionic
+++ b/images/airflow/Dockerfile.ubuntu_bionic
@@ -93,7 +93,9 @@ RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
 COPY images/airflow/requirements.txt /tmp/
 RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \
     && pip3 install $AIRFLOW_SRC --no-cache-dir \
-    && pip3 uninstall -y snakebite || true
+    && pip3 uninstall -y snakebite || true \
+    && pip3 uninstall -y psycopg2 || true \
+    && pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true
 
 # Copy scripts used in the container:
 COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
diff --git a/images/airflow/Dockerfile.ubuntu_xenial b/images/airflow/Dockerfile.ubuntu_xenial
index 8fd88398..65fe9b68 100644
--- a/images/airflow/Dockerfile.ubuntu_xenial
+++ b/images/airflow/Dockerfile.ubuntu_xenial
@@ -93,7 +93,9 @@ RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
 COPY images/airflow/requirements.txt /tmp/
 RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \
     && pip3 install $AIRFLOW_SRC --no-cache-dir \
-    && pip3 uninstall -y snakebite || true
+    && pip3 uninstall -y snakebite || true \
+    && pip3 uninstall -y psycopg2 || true \
+    && pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true
 
 # Copy scripts used in the container:
 COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
diff --git a/images/airflow/requirements.txt b/images/airflow/requirements.txt
index 3516aa82..d0cf1449 100644
--- a/images/airflow/requirements.txt
+++ b/images/airflow/requirements.txt
@@ -24,6 +24,7 @@ python-openstackclient==3.16.1
 kubernetes>=6.0.0
 # Need to lock marshmellow-sqlalchemy and tabulate for compatibility issues
 marshmallow-sqlalchemy==0.18.0
+WTForms~=2.2.1
 tabulate==0.8.03
 
 # Dependencies for other UCP components
diff --git a/src/bin/shipyard_airflow/requirements.txt b/src/bin/shipyard_airflow/requirements.txt
index f0f54714..7a3ae8d6 100644
--- a/src/bin/shipyard_airflow/requirements.txt
+++ b/src/bin/shipyard_airflow/requirements.txt
@@ -37,6 +37,7 @@ uwsgi==2.0.17
 
 # To support profiling in non-prod
 Werkzeug==0.16.1
+WTForms~=2.2.1
 # Need to lock marshmellow-sqlalchemy and tabulate for compatibility issues
 marshmallow-sqlalchemy==0.18.0
 tabulate==0.8.03