diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ce1c3aa5e..d59fe59cf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -344,21 +344,18 @@ stages:
       displayName: Unit Docker
       strategy:
         matrix:
-          mono518:
-            testName: 'Mono 5.18'
-            containerImage: servarr/testimages:mono-5.18
+          mono508:
+            testName: 'Mono 5.8'
+            containerImage: lidarr/testimages:mono-5.8
           mono520:
             testName: 'Mono 5.20'
-            containerImage: servarr/testimages:mono-5.20
-          mono600:
-            testName: 'Mono 6.0'
-            containerImage: servarr/testimages:mono-6.10
-          mono604:
-            testName: 'Mono 6.4'
-            containerImage: lidarr/testimages:mono-6.4
-          mono606:
-            testName: 'Mono 6.6'
-            containerImage: lidarr/testimages:mono-6.6
+            containerImage: lidarr/testimages:mono-5.20
+          mono608:
+            testName: 'Mono 6.8'
+            containerImage: lidarr/testimages:mono-6.8
+          mono610:
+            testName: 'Mono 6.10'
+            containerImage: lidarr/testimages:mono-6.10
 
       pool:
         vmImage: 'ubuntu-16.04'
@@ -477,21 +474,18 @@ stages:
       displayName: Integration Docker
       strategy:
         matrix:
-          mono518:
-            testName: 'Mono 5.18'
-            containerImage: servarr/testimages:mono-5.18
+          mono508:
+            testName: 'Mono 5.8'
+            containerImage: lidarr/testimages:mono-5.8
           mono520:
             testName: 'Mono 5.20'
-            containerImage: servarr/testimages:mono-5.20
-          mono600:
-            testName: 'Mono 6.0'
-            containerImage: servarr/testimages:mono-6.10
-          mono604:
-            testName: 'Mono 6.4'
-            containerImage: lidarr/testimages:mono-6.4
-          mono606:
-            testName: 'Mono 6.6'
-            containerImage: lidarr/testimages:mono-6.6
+            containerImage: lidarr/testimages:mono-5.20
+          mono608:
+            testName: 'Mono 6.8'
+            containerImage: lidarr/testimages:mono-6.8
+          mono610:
+            testName: 'Mono 6.10'
+            containerImage: lidarr/testimages:mono-6.10
 
       variables:
         pattern: 'Lidarr.**.linux.tar.gz'