diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 40c2546b..c3c76b56 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -153,8 +153,10 @@
         ]
     },
     "java": {
-        "default": "8",
-        "versions": [ "8", "11", "17" ]
+        "x64": {
+            "default": "8",
+            "versions": [ "8", "11", "17" ]
+        }
     },
     "android": {
         "platform_min_version": "27",
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index aa36b1b3..df6d2d18 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -140,8 +140,10 @@
         ]
     },
     "java": {
-        "default": "8",
-        "versions": [ "8", "11", "17" ]
+        "x64": {
+            "default": "8",
+            "versions": [ "8", "11", "17" ]
+        }
     },
     "android": {
         "platform_min_version": "27",