diff --git a/playbooks/roles/grafana/tasks/main.yaml b/playbooks/roles/grafana/tasks/main.yaml
index e68e3a51c4..6d70364923 100644
--- a/playbooks/roles/grafana/tasks/main.yaml
+++ b/playbooks/roles/grafana/tasks/main.yaml
@@ -111,5 +111,10 @@
   shell:
     cmd: docker image prune -f
 
+- name: Wait for grafana to be up and running
+  wait_for:
+    timeout: 60
+    port: 3000
+
 - name: Import dashboards to container
   command: '/usr/local/bin/update-grafana-dashboards'
diff --git a/playbooks/roles/install-docker/tasks/main.yaml b/playbooks/roles/install-docker/tasks/main.yaml
index 1951ab312e..c4d5539d56 100644
--- a/playbooks/roles/install-docker/tasks/main.yaml
+++ b/playbooks/roles/install-docker/tasks/main.yaml
@@ -40,7 +40,9 @@
 
 - name: Install docker-compose
   pip:
-    name: docker-compose
+    name:
+      - requests<2.30.0
+      - docker-compose
     state: present
     executable: pip3