diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16d15bfcc56..5cb86e25b68 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,7 +17,7 @@ jobs:
 
 - job: 'Wheels'
   condition: eq(variables['Build.SourceBranchName'], 'dev')
-  timeoutInMinutes: 180
+  timeoutInMinutes: 240
   pool:
     vmImage: 'ubuntu-16.04'
   strategy:
@@ -25,6 +25,14 @@ jobs:
     matrix:
       amd64:
         buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
   steps:
   - script: |
       mkdir -p ~/.ssh
@@ -59,12 +67,11 @@ jobs:
       sed -i "s|# pySwitchmate|pySwitchmate|g" requirements_hassio.txt
     displayName: 'Prepare requirements files for Hass.io'
   - script: |
-      echo "aiohttp==3.5.4" > test_requirements.txt
       sudo docker run --rm -v $(pwd):/data:ro -v ~/.ssh:/root/.ssh:rw \
         homeassistant/$(buildArch)-wheels:$(versionWheels) \
         --apk "build-base;cmake;git;linux-headers;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;autoconf;automake;cups-dev;linux-headers;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev" \
         --index https://wheels.hass.io \
-        --requirement test_requirements.txt \
+        --requirement requirements_hassio.txt \
         --upload rsync \
         --remote wheels@wheels.hass.io:/opt/wheels
     displayName: 'Run wheels build'