diff --git a/etc/kayobe/ansible/configure-aio-resources.yml b/etc/kayobe/ansible/configure-aio-resources.yml
index 78450eaeb..48263c641 100644
--- a/etc/kayobe/ansible/configure-aio-resources.yml
+++ b/etc/kayobe/ansible/configure-aio-resources.yml
@@ -8,15 +8,25 @@
   tasks:
     - name: Install python build dependencies
       package:
-        name:
-          - "{% if ansible_facts.os_family == 'RedHat' %}gcc{% else %}build-essential{% endif %}"
-          - "python3-dev{% if ansible_facts.os_family == 'RedHat' %}el{% endif %}"
+        name: "{{ packages | select | list }}"
         cache_valid_time: "{{ apt_cache_valid_time if ansible_facts.os_family == 'Debian' else omit }}"
         update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
         state: present
       become: true
+      vars:
+        packages:
+          - "{% if ansible_facts.os_family == 'RedHat' %}gcc{% else %}build-essential{% endif %}"
+          - "python3-dev{% if ansible_facts.os_family == 'RedHat' %}el{% endif %}"
+          - "{% if ansible_facts.os_family == 'Debian' %}python3-venv{% endif %}"
+
+    - name: Ensure latest version of pip is installed
+      pip:
+        name: pip
+        state: latest
+        virtualenv: '{{ venv }}'
+        virtualenv_command: "/usr/bin/python3 -m venv"
 
-    - name: Install python openstack client
+    - name: Ensure python openstack client is installed
       pip:
         name: python-openstackclient
         virtualenv: '{{ venv }}'
diff --git a/etc/kayobe/environments/ci-aio/kolla/globals.yml b/etc/kayobe/environments/ci-aio/kolla/globals.yml
index 843acf785..626ecae08 100644
--- a/etc/kayobe/environments/ci-aio/kolla/globals.yml
+++ b/etc/kayobe/environments/ci-aio/kolla/globals.yml
@@ -14,3 +14,6 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 
 # Elasticsearch memory tuning
 es_heap_size: 1g
+
+# Increase Grafana timeout
+grafana_start_first_node_retries: 20