diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 742f4e3323..47164c33ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
 
   build-mac:
 
-    runs-on: macos-12
+    runs-on: macos-11
 
     steps:
     - uses: actions/checkout@v2
diff --git a/src/Eto.Mac/Drawing/IconFrameHandler.cs b/src/Eto.Mac/Drawing/IconFrameHandler.cs
index 4736ad97c0..6bec2fda73 100644
--- a/src/Eto.Mac/Drawing/IconFrameHandler.cs
+++ b/src/Eto.Mac/Drawing/IconFrameHandler.cs
@@ -52,7 +52,7 @@ public NSBitmapImageRep Rep
 				}
 			}
 
-#if MACOS_NET
+#if MACOS_NET || ( XAMMAC && NET6_0_OR_GREATER )
 			// .NET 6 on ARM64 crashes when using the override in macos workload preview 11, remove this when fixed.
 			[Export("CGImageForProposedRect:context:hints:")]
 			public CGImage AsCGImage(IntPtr proposedDestRectPtr, NSGraphicsContext context, NSDictionary hints)