diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json
index e4834c8b..c828c198 100644
--- a/images/macos/toolsets/toolset-10.13.json
+++ b/images/macos/toolsets/toolset-10.13.json
@@ -2,7 +2,19 @@
     "xcode": {
         "default": "10.1",
         "versions": [
-            "10.1", "10", "9.4.1", "9.4", "9.3.1", "9.3", "9.2", "9.1", "9", "8.3.3", "8.2.1", "8.1", "8"
+            { "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", "version": "9.4.0", "symlinks": [ "9.4_beta"] },
+            { "link": "9.3.1", "version": "9.3.1", "symlinks": [ "9.3.1_beta"] },
+            { "link": "9.3", "version": "9.3.0", "symlinks": [ "9.3_beta"] },
+            { "link": "9.2", "version": "9.2.0", "symlinks": [ "9.2_beta"] },
+            { "link": "9.1", "version": "9.1.0", "symlinks": [ "9.1_beta"] },
+            { "link": "9", "version": "9.0.0", "symlinks": [ "9_beta"] },
+            { "link": "8.3.3", "version": "8.3.3", "symlinks": [ "8.3.3_beta"] },
+            { "link": "8.2.1", "version": "8.2.1", "symlinks": [ "8.2.1_beta"] },
+            { "link": "8.1", "version": "8.1.0", "symlinks": [ "8.1_beta"] },
+            { "link": "8", "version": "8.0.0", "symlinks": [ "8_beta"] }
         ]
     },
     "xamarin": {
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index 2d0972ca..75041b5c 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -2,7 +2,19 @@
     "xcode": {
         "default": "11.3.1",
         "versions": [
-            "11.3.1", "11.3", "11.2.1", "11.2", "11.1", "11", "10.3", "10.2.1", "10.2", "10.1", "10", "9.4.1"
+            { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3.1_beta"] },
+            { "link": "11.3", "version": "11.3.0", "symlinks": ["11.3_beta"] },
+            { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2.1_beta"] },
+            { "link": "11.2", "version": "11.2.0", "symlinks": ["11.2_beta"] },
+            { "link": "11.1", "version": "11.1.0", "symlinks": ["11.1_beta"] },
+            { "link": "11", "version": "11.0.0", "symlinks": ["11_beta"] },
+            { "link": "10.3", "version": "10.3.0", "symlinks": ["10.3_beta"] },
+            { "link": "10.2.1", "version": "10.2.1", "symlinks": ["10.2.1_beta"] },
+            { "link": "10.2", "version": "10.2.0", "symlinks": ["10.2_beta"] },
+            { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_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"] }
         ]
     },
     "xamarin": {
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 7f48b47a..39e6d5af 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,11 +2,15 @@
     "xcode": {
         "default": "12",
         "versions": [
-            { "link": "12.2", "version": "12.2 beta 3" },
-            { "link": "12.1", "version": "12.1.1 Release Candidate" },
+            { "link": "12.2", "version": "12.2.0" },
+            { "link": "12.1", "version": "12.1.1" },
             { "link": "12", "version": "12.0.1" },
-            { "link": "11.7", "version": "11.7", "symlinks": ["11.7_beta"] },
-            { "link": "11.4.1", "version": "11.4.1", "symlinks": ["11.4", "11.4_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": "10.3", "version": "10.3", "symlinks": ["10.3_beta"] }
         ]
     },
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index 874dec12..0409e270 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -2,7 +2,8 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "11.7"
+            { "link": "12.2", "version": "12.2.0" },
+            { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] }
         ]
     },
     "xamarin": {