diff --git a/Makefile b/Makefile
index d28d97d0..0972893a 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ endif
 .PHONY: build
 build:
 ifeq ($(USE_PROXY), true)
-	docker build --network host -t $(IMAGE) --label $(LABEL) \
+	docker build --force-rm --network host -t $(IMAGE) --label $(LABEL) \
 		--label "org.opencontainers.image.revision=$(COMMIT)" \
 		--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
 		--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
@@ -109,7 +109,7 @@ ifeq ($(USE_PROXY), true)
 		--build-arg NO_PROXY=$(NO_PROXY) \
 		--build-arg ctx_base=$(BUILD_CTX) .
 else
-	docker build --network host -t $(IMAGE) --label $(LABEL) \
+	docker build --force-rm --network host -t $(IMAGE) --label $(LABEL) \
 		--label "org.opencontainers.image.revision=$(COMMIT)" \
 		--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
 		--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
diff --git a/images/airflow/Dockerfile.opensuse_15 b/images/airflow/Dockerfile.opensuse_15
index 0e8772eb..74db4b11 100644
--- a/images/airflow/Dockerfile.opensuse_15
+++ b/images/airflow/Dockerfile.opensuse_15
@@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
 
 # Set ARG for usage during build
 ARG AIRFLOW_HOME=/usr/local/airflow
-ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
+ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
 ARG ctx_base=src/bin
 
 # Kubectl version
diff --git a/images/airflow/Dockerfile.ubuntu_bionic b/images/airflow/Dockerfile.ubuntu_bionic
index 47aa05b6..2801987a 100644
--- a/images/airflow/Dockerfile.ubuntu_bionic
+++ b/images/airflow/Dockerfile.ubuntu_bionic
@@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
 
 # Set ARG for usage during build
 ARG AIRFLOW_HOME=/usr/local/airflow
-ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
+ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ctx_base=src/bin
 
diff --git a/images/airflow/Dockerfile.ubuntu_xenial b/images/airflow/Dockerfile.ubuntu_xenial
index e3d965dd..8fd88398 100644
--- a/images/airflow/Dockerfile.ubuntu_xenial
+++ b/images/airflow/Dockerfile.ubuntu_xenial
@@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
 
 # Set ARG for usage during build
 ARG AIRFLOW_HOME=/usr/local/airflow
-ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
+ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ctx_base=src/bin
 
diff --git a/src/bin/shipyard_airflow/requirements.txt b/src/bin/shipyard_airflow/requirements.txt
index cb4156a7..f0f54714 100644
--- a/src/bin/shipyard_airflow/requirements.txt
+++ b/src/bin/shipyard_airflow/requirements.txt
@@ -31,7 +31,7 @@ python-dateutil==2.7.3
 python-memcached==1.59
 requests==2.20.0
 setuptools==40.4.1
-SQLAlchemy==1.2.12
+SQLAlchemy==1.3.15
 ulid==1.1
 uwsgi==2.0.17
 
diff --git a/tools/airflow_image_run.sh b/tools/airflow_image_run.sh
index d6a14916..dd5d2fcb 100755
--- a/tools/airflow_image_run.sh
+++ b/tools/airflow_image_run.sh
@@ -19,6 +19,16 @@ IMAGE=$1
 USE_PROXY=${USE_PROXY:-false}
 NO_PROXY=${NO_PROXY:-}
 
+# clearn up airflow_test leftover from a privous run
+if [ -n "$(docker ps -aq -f name=airflow_test -f status=running)" ]; then
+    docker stop airflow_test
+    sleep 5
+fi
+if [ -n "$(docker ps -aq -f name=airflow_test)" ]; then
+    docker rm -f airflow_test
+    sleep 5
+fi
+
 if [ "${USE_PROXY}" == "true" ]; then
     TEST_RESP="$(docker run \
         -p 8080:8080 \