diff --git a/toolchains/iphone/Dockerfile.m4 b/toolchains/iphone/Dockerfile.m4
index e838c44..f4b39e7 100644
--- a/toolchains/iphone/Dockerfile.m4
+++ b/toolchains/iphone/Dockerfile.m4
@@ -1,6 +1,7 @@
 FROM toolchains/common AS helpers
 FROM toolchains/apple-sdks AS sdks
 
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
 m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
 m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
diff --git a/toolchains/macosx-i386/Dockerfile.m4 b/toolchains/macosx-i386/Dockerfile.m4
index c6e1b0a..c0f4a35 100644
--- a/toolchains/macosx-i386/Dockerfile.m4
+++ b/toolchains/macosx-i386/Dockerfile.m4
@@ -1,4 +1,5 @@
-# This toolchain is used for old x86 only Mac
+# This worker is used for old i386 only Mac
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
diff --git a/toolchains/macosx/Dockerfile.m4 b/toolchains/macosx/Dockerfile.m4
index b6f8566..5078f13 100644
--- a/toolchains/macosx/Dockerfile.m4
+++ b/toolchains/macosx/Dockerfile.m4
@@ -1,3 +1,4 @@
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
diff --git a/workers/iphone/Dockerfile.m4 b/workers/iphone/Dockerfile.m4
index b16215d..c5cc0b4 100644
--- a/workers/iphone/Dockerfile.m4
+++ b/workers/iphone/Dockerfile.m4
@@ -1,7 +1,8 @@
 FROM toolchains/iphone AS toolchain
 
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
-m4_define(`IPHONE_SDK_VERSION',14.2)m4_dnl
+m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
 m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
 
 m4_include(`paths.m4')m4_dnl
diff --git a/workers/macosx-i386/Dockerfile.m4 b/workers/macosx-i386/Dockerfile.m4
index cd28131..f2d882d 100644
--- a/workers/macosx-i386/Dockerfile.m4
+++ b/workers/macosx-i386/Dockerfile.m4
@@ -1,5 +1,6 @@
 # This worker is used for old i386 only Mac
 m4_define(`TOOLCHAIN',macosx-i386)m4_dnl
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
diff --git a/workers/macosx/Dockerfile.m4 b/workers/macosx/Dockerfile.m4
index d0f7d9c..8307168 100644
--- a/workers/macosx/Dockerfile.m4
+++ b/workers/macosx/Dockerfile.m4
@@ -1,9 +1,12 @@
 m4_define(`TOOLCHAIN',macosx)m4_dnl
+m4_dnl These settings must be kept in sync between toolchain and worker
 m4_define(`PPA_CLANG',-10)m4_dnl
-m4_define(`MACOSX_SDK_VERSION',11.0)m4_dnl
+m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
-m4_define(`MACOSX_TARGET_VERSION',20)m4_dnl
+m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl
 m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
 m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
 m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl
+m4_dnl We provide specific patch to add 11.1 support
+m4_define(`PATCH_OSXCROSS',`')m4_dnl
 m4_include(`macosx.m4')m4_dnl