diff --git a/etc/kayobe/ansible/configure-aio-resources.yml b/etc/kayobe/ansible/configure-aio-resources.yml
index 78450eaeb..243472d60 100644
--- a/etc/kayobe/ansible/configure-aio-resources.yml
+++ b/etc/kayobe/ansible/configure-aio-resources.yml
@@ -16,7 +16,14 @@
         state: present
       become: true
 
-    - name: Install python openstack client
+    - name: Ensure latest version of pip is installed
+      pip:
+        name: pip
+        state: latest
+        virtualenv: '{{ venv }}'
+        virtualenv_command: "/usr/bin/python3 -m venv"
+
+    - 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