diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1
index 5f2169d7..59968b2b 100644
--- a/images/macos/helpers/Xcode.Installer.psm1
+++ b/images/macos/helpers/Xcode.Installer.psm1
@@ -146,7 +146,7 @@ function Invoke-XcodeRunFirstLaunch {
         [string]$Version
     )
 
-    if ($Version.StartsWith("8.") -or $Version.StartsWith("9.")) {
+    if ($Version.StartsWith("8") -or $Version.StartsWith("9")) {
         return
     }
 
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index 68096c68..c7b8c1ef 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -13,7 +13,7 @@
             { "link": "10.2", "version": "10.2.0", "symlinks": ["10.2_beta"] },
             { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] },
             { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] },
-            { "link": "9.4.1", "version": "9.4.1", "symlinks": ["9.4.1_beta"] }
+            { "link": "9.4.1", "version": "9.4.1" }
         ]
     },
     "xamarin": {
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 8d4cc70d..011750b4 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -5,13 +5,13 @@
             { "link": "12.2", "version": "12.2.0" },
             { "link": "12.1.1", "version": "12.1.1" },
             { "link": "12.1", "version": "12.1.0" },
-            { "link": "12", "version": "12.0.1" },
+            { "link": "12", "version": "12.0.1", "symlinks": ["12_beta"] },
             { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] },
             { "link": "11.6", "version": "11.6.0", "symlinks": ["11.6_beta"] },
             { "link": "11.5", "version": "11.5.0", "symlinks": ["11.5_beta"] },
-            { "link": "11.4.1", "version": "11.4.1", "symlinks": ["11.4", "11.4_beta", "11.4.1_beta"] },
-            { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3", "11.3_beta", "11.3.1_beta"] },
-            { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2", "11.2_beta", "11.2.1_beta"] },
+            { "link": "11.4.1", "version": "11.4.1", "symlinks": ["11.4", "11.4.1_beta"] },
+            { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3", "11.3.1_beta"] },
+            { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2", "11.2.1_beta"] },
             { "link": "10.3", "version": "10.3", "symlinks": ["10.3_beta"] }
         ]
     },