diff --git a/.taskcluster.yml b/.taskcluster.yml
index 74a1a78ce..4c37614c2 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -60,7 +60,7 @@ tasks:
       deadline: {$fromNow: '1 hour'}
       payload:
         maxRunTime: 3600
-        image: python:3.7
+        image: python:3.8
         command:
           - sh
           - -lxce
@@ -81,7 +81,7 @@ tasks:
       deadline: {$fromNow: '1 hour'}
       payload:
         maxRunTime: 3600
-        image: python:3.7
+        image: python:3.8
         command:
           - sh
           - -lxce
@@ -103,7 +103,7 @@ tasks:
       deadline: {$fromNow: '1 hour'}
       payload:
         maxRunTime: 3600
-        image: python:3.7
+        image: python:3.8
         command:
           - sh
           - -lxce
@@ -124,7 +124,7 @@ tasks:
       deadline: {$fromNow: '1 hour'}
       payload:
         maxRunTime: 3600
-        image: python:3.7
+        image: python:3.8
         command:
           - sh
           - -lxce
@@ -144,7 +144,7 @@ tasks:
       deadline: {$fromNow: '1 hour'}
       payload:
         maxRunTime: 3600
-        image: python:3.7
+        image: python:3.8
         command:
           - sh
           - -lxce
diff --git a/events/requirements.txt b/events/requirements.txt
index e4d8fe3a6..2102c2b9a 100644
--- a/events/requirements.txt
+++ b/events/requirements.txt
@@ -1,3 +1,2 @@
-aiohttp==3.6.2
 -e ../tools #egg=code-coverage-tools
 libmozevent==1.1.0
diff --git a/tools/requirements.txt b/tools/requirements.txt
index c890222bd..f18ea8ad2 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,4 +1,5 @@
-# limit async-timeout version to avoid using the alpha 4.0.0a0
+# limit aiohttp and async-timeout versions to avoid using the alpha 4.0.0a0
+aiohttp==3.6.2
 async-timeout<4.0,>=3.0
 logbook
 raven