diff --git a/.zuul.yaml b/.zuul.yaml
index c94d83a1..f88f18bc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -99,7 +99,7 @@
 
 - job:
     name: airship-drydock-docker-build-gate-ubuntu_focal
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: airship-drydock-single-node-focal
     irrelevant-files:
@@ -115,7 +115,7 @@
 
 - job:
     name: airship-drydock-docker-build-gate-ubuntu_bionic
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: airship-drydock-single-node
     irrelevant-files:
@@ -131,7 +131,7 @@
 
 - job:
     name: airship-drydock-docker-publish-ubuntu_focal
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: airship-drydock-single-node-focal
     secrets:
@@ -151,7 +151,7 @@
 
 - job:
     name: airship-drydock-docker-publish-ubuntu_bionic
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: airship-drydock-single-node-focal
     secrets:
diff --git a/images/drydock/Dockerfile.ubuntu_bionic b/images/drydock/Dockerfile.ubuntu_bionic
index 8943ecd6..10f4216c 100644
--- a/images/drydock/Dockerfile.ubuntu_bionic
+++ b/images/drydock/Dockerfile.ubuntu_bionic
@@ -44,6 +44,7 @@ RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
 # Build LibYAML
 ARG LIBYAML_VERSION=0.2.5
 RUN set -ex \
+    && apt-get update && apt-get upgrade -y \
     && apt install -y git automake make libtool \
     && git clone https://github.com/yaml/libyaml.git \
     && cd libyaml \
diff --git a/images/drydock/Dockerfile.ubuntu_focal b/images/drydock/Dockerfile.ubuntu_focal
index 5ed834dc..e407fcb8 100644
--- a/images/drydock/Dockerfile.ubuntu_focal
+++ b/images/drydock/Dockerfile.ubuntu_focal
@@ -46,6 +46,7 @@ RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
 # Build LibYAML
 ARG LIBYAML_VERSION=0.2.5
 RUN set -ex \
+    && apt-get update && apt-get upgrade -y \
     && apt install -y git automake make libtool \
     && git clone https://github.com/yaml/libyaml.git \
     && cd libyaml \
diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index 49573316..f9752920 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -20,7 +20,6 @@
     - ensure-python
     - ensure-pip
 
-
   tasks:
     - name: Debug tag generation inputs
       block:
@@ -56,6 +55,13 @@
             executable: pip3
       become: True
 
+    - name: Install tox python module for ansible docker login
+      block:
+        - pip:
+            name: tox
+            version: 3.28.0
+            executable: pip3
+      become: True
 
     - name: Run images
       shell: |