diff --git a/.zuul.yaml b/.zuul.yaml
index ba6790f0..47af979d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -79,7 +79,7 @@
 
 - job:
     name: armada-docker-build-gate-ubuntu_bionic
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: armada-single-node
     vars:
@@ -92,7 +92,7 @@
 
 - job:
     name: armada-docker-build-gate-ubuntu_focal
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: armada-single-node-focal
     vars:
@@ -157,7 +157,7 @@
 
 - job:
     name: armada-docker-publish-ubuntu_focal
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: armada-single-node-focal
     secrets:
@@ -174,7 +174,7 @@
 
 - job:
     name: armada-docker-publish-ubuntu_bionic
-    timeout: 1800
+    timeout: 3600
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: armada-single-node
     secrets:
diff --git a/images/armada/Dockerfile.ubuntu_bionic b/images/armada/Dockerfile.ubuntu_bionic
index 6ccd8cee..4e94a46c 100644
--- a/images/armada/Dockerfile.ubuntu_bionic
+++ b/images/armada/Dockerfile.ubuntu_bionic
@@ -15,7 +15,7 @@ ENV LC_ALL=C.UTF-8
 EXPOSE 8000
 
 RUN set -ex && \
-    apt-get -qq update && \
+    apt-get update && apt-get upgrade -y && \
     apt-get -y install \
     ca-certificates \
     curl \
diff --git a/images/armada/Dockerfile.ubuntu_focal b/images/armada/Dockerfile.ubuntu_focal
index b340f403..e8a9cf32 100644
--- a/images/armada/Dockerfile.ubuntu_focal
+++ b/images/armada/Dockerfile.ubuntu_focal
@@ -15,7 +15,7 @@ ENV LC_ALL=C.UTF-8
 EXPOSE 8000
 
 RUN set -ex && \
-    apt-get -qq update && \
+    apt-get update && apt-get upgrade -y && \
     apt-get -y install \
     ca-certificates \
     curl \
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index cbbf9b0a..ce3df824 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -23,6 +23,13 @@
 
   tasks:
 
+    - name: Install Packaging python module for airship
+      block:
+        - pip:
+            name: packaging
+            executable: pip3
+      become: True
+
     - name: Clone Required Repositories
       shell: |
         export CLONE_ARMADA={{ CLONE_ARMADA }}
@@ -39,6 +46,17 @@
 
     - name: Deploy Kubernetes with Minikube
       shell: |
+        set -ex
+        sudo fdisk --list
+        df -h
+        sudo mkdir -p /opt/ext_vol
+        BIG_VOLUME=$(sudo fdisk -l 2>&1 | grep  -E 80G | grep Linux | awk '{print $1}')
+        if ! mount | grep "${BIG_VOLUME}"
+        then
+          sudo mkfs.ext4 "${BIG_VOLUME}"
+          sudo mount "${BIG_VOLUME}" /opt/ext_vol
+          df -h
+        fi
         ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@@ -111,9 +129,6 @@
         set -x
         mkdir -p ~/.kube
         cp -rp /home/zuul/.kube/config ~/.kube/config
-
-        pip3 install packaging
-
         ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index 1f4f8128..0ea0e044 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -18,7 +18,7 @@
     - ensure-docker
     - ensure-python
     - ensure-pip
-    - ensure-tox
+
 
   tasks:
     - include_vars: vars.yaml
@@ -57,6 +57,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