diff --git a/build-libssl.sh b/build-libssl.sh
index edca774..8b2f84d 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -28,14 +28,20 @@ set -u
 DEFAULTVERSION="1.1.1h"
 
 # Default (=full) set of targets (OpenSSL >= 1.1.1) to build
-DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-i386 watchos-sim-cross-x86_64 mac-catalyst-x86_64"
+DEFAULTTARGETS=`cat <<TARGETS
+ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e
+macos64-x86_64
+mac-catalyst-x86_64
+watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64
+tvos-sim-cross-x86_64 tvos64-cross-arm64
+TARGETS`
 
 # Minimum iOS/tvOS SDK version to build for
 IOS_MIN_SDK_VERSION="12.0"
-TVOS_MIN_SDK_VERSION="12.0"
 MACOS_MIN_SDK_VERSION="10.15"
 CATALYST_MIN_SDK_VERSION="10.15"
 WATCHOS_MIN_SDK_VERSION="4.0"
+TVOS_MIN_SDK_VERSION="12.0"
 
 # Init optional env variables (use available variable or default to empty string)
 CURL_OPTIONS="${CURL_OPTIONS:-}"
@@ -49,15 +55,15 @@ echo_help()
   echo "     --cleanup                     Clean up build directories (bin, include/openssl, lib, src) before starting build"
   echo "     --ec-nistp-64-gcc-128         Enable configure option enable-ec_nistp_64_gcc_128 for 64 bit builds"
   echo " -h, --help                        Print help (this message)"
+  echo "     --ios-sdk=SDKVERSION          Override iOS SDK version"
   echo "     --macos-sdk=SDKVERSION        Override macOS SDK version"
   echo "     --catalyst-sdk=SDKVERSION     Override macOS SDK version for Catalyst"
-  echo "     --ios-sdk=SDKVERSION          Override iOS SDK version"
-  echo "     --tvos-sdk=SDKVERSION         Override tvOS SDK version"
   echo "     --watchos-sdk=SDKVERSION      Override watchOS SDK version"
-  echo "     --min-macos-sdk=SDKVERSION    Set minimum macOS SDK version (default: $MACOS_MIN_SDK_VERSION)"
+  echo "     --tvos-sdk=SDKVERSION         Override tvOS SDK version"
   echo "     --min-ios-sdk=SDKVERSION      Set minimum iOS SDK version (default: $IOS_MIN_SDK_VERSION)"
-  echo "     --min-tvos-sdk=SDKVERSION     Set minimum tvOS SDK version (default: $TVOS_MIN_SDK_VERSION)"
+  echo "     --min-macos-sdk=SDKVERSION    Set minimum macOS SDK version (default: $MACOS_MIN_SDK_VERSION)"
   echo "     --min-watchos-sdk=SDKVERSION  Set minimum watchOS SDK version (default: $WATCHOS_MIN_SDK_VERSION)"
+  echo "     --min-tvos-sdk=SDKVERSION     Set minimum tvOS SDK version (default: $TVOS_MIN_SDK_VERSION)"
   echo "     --noparallel                  Disable running make with parallel jobs (make -j)"
   echo "     --disable-bitcode             Disable embedding Bitcode"
   echo " -v, --verbose                     Enable verbose logging"
@@ -167,18 +173,30 @@ finish_build_loop()
   rm -r "${SOURCEDIR}"
 
   # Add references to library files to relevant arrays
-  if [[ "${PLATFORM}" == AppleTV* ]]; then
-    LIBSSL_TVOS+=("${TARGETDIR}/lib/libssl.a")
-    LIBCRYPTO_TVOS+=("${TARGETDIR}/lib/libcrypto.a")
-    OPENSSLCONF_SUFFIX="tvos_${ARCH}"
+  if [[ "${PLATFORM}" == iPhone* ]]; then
+    LIBSSL_IOS+=("${TARGETDIR}/lib/libssl.a")
+    LIBCRYPTO_IOS+=("${TARGETDIR}/lib/libcrypto.a")
+    if [[ "${PLATFORM}" == iPhoneSimulator* ]]; then
+      OPENSSLCONF_SUFFIX="ios_sim_${ARCH}"
+    else
+      OPENSSLCONF_SUFFIX="ios_${ARCH}"
+    fi
   elif [[ "${PLATFORM}" == Watch* ]]; then
     LIBSSL_WATCHOS+=("${TARGETDIR}/lib/libssl.a")
     LIBCRYPTO_WATCHOS+=("${TARGETDIR}/lib/libcrypto.a")
-    OPENSSLCONF_SUFFIX="watchos_${ARCH}"
-  elif [[ "${PLATFORM}" == iPhone* ]]; then
-    LIBSSL_IOS+=("${TARGETDIR}/lib/libssl.a")
-    LIBCRYPTO_IOS+=("${TARGETDIR}/lib/libcrypto.a")
-    OPENSSLCONF_SUFFIX="ios_${ARCH}"
+    if [[ "${PLATFORM}" == WatchSimulator* ]]; then
+      OPENSSLCONF_SUFFIX="watchos_sim_${ARCH}"
+    else
+      OPENSSLCONF_SUFFIX="watchos_${ARCH}"
+    fi
+  elif [[ "${PLATFORM}" == AppleTV* ]]; then
+    LIBSSL_TVOS+=("${TARGETDIR}/lib/libssl.a")
+    LIBCRYPTO_TVOS+=("${TARGETDIR}/lib/libcrypto.a")
+    if [[ "${PLATFORM}" == AppleTVSimulator* ]]; then
+      OPENSSLCONF_SUFFIX="tvos_sim_${ARCH}"
+    else
+      OPENSSLCONF_SUFFIX="tvos_${ARCH}"
+    fi
   elif [[ "${PLATFORM}" == Catalyst* ]]; then
     LIBSSL_CATALYST+=("${TARGETDIR}/lib/libssl.a")
     LIBCRYPTO_CATALYST+=("${TARGETDIR}/lib/libcrypto.a")
@@ -207,14 +225,14 @@ CLEANUP=""
 CONFIG_ENABLE_EC_NISTP_64_GCC_128=""
 CONFIG_DISABLE_BITCODE=""
 CONFIG_NO_DEPRECATED=""
+IOS_SDKVERSION=""
 MACOS_SDKVERSION=""
 CATALYST_SDKVERSION=""
-IOS_SDKVERSION=""
 WATCHOS_SDKVERSION=""
+TVOS_SDKVERSION=""
 LOG_VERBOSE=""
 PARALLEL=""
 TARGETS=""
-TVOS_SDKVERSION=""
 VERSION=""
 
 # Process command line arguments
@@ -241,6 +259,10 @@ case $i in
     echo_help
     exit
     ;;
+  --ios-sdk=*)
+    IOS_SDKVERSION="${i#*=}"
+    shift
+    ;;
   --macos-sdk=*)
     MACOS_SDKVERSION="${i#*=}"
     shift
@@ -249,8 +271,28 @@ case $i in
     CATALYST_SDKVERSION="${i#*=}"
     shift
     ;;
-  --ios-sdk=*)
-    IOS_SDKVERSION="${i#*=}"
+  --watchos-sdk=*)
+    WATCHOS_SDKVERSION="${i#*=}"
+    shift
+    ;;
+  --tvos-sdk=*)
+    TVOS_SDKVERSION="${i#*=}"
+    shift
+    ;;
+  --min-ios-sdk=*)
+    IOS_MIN_SDK_VERSION="${i#*=}"
+    shift
+    ;;
+  --min-macos-sdk=*)
+    MACOS_MIN_SDK_VERSION="${i#*=}"
+    shift
+    ;;
+  --min-watchos-sdk=*)
+    WATCHOS_MIN_SDK_VERSION="${i#*=}"
+    shift
+    ;;
+  --min-tvos-sdk=*)
+    TVOS_MIN_SDK_VERSION="${i#*=}"
     shift
     ;;
   --noparallel)
@@ -260,30 +302,6 @@ case $i in
     TARGETS="${i#*=}"
     shift
     ;;
-  --tvos-sdk=*)
-    TVOS_SDKVERSION="${i#*=}"
-    shift
-    ;;
-  --watchos-sdk=*)
-    WATCHOS_SDKVERSION="${i#*=}"
-    shift
-    ;;
-  --min-macos-sdk=*)
-    MACOS_MIN_SDK_VERSION="${i#*=}"
-    shift
-    ;;
-  --min-ios-sdk=*)
-    IOS_MIN_SDK_VERSION="${i#*=}"
-    shift
-    ;;
-  --min-tvos-sdk=*)
-    TVOS_MIN_SDK_VERSION="${i#*=}"
-    shift
-    ;;
-  --min-watchos-sdk=*)
-    WATCHOS_MIN_SDK_VERSION="${i#*=}"
-    shift
-    ;;
   -v|--verbose)
     LOG_VERBOSE="verbose"
     ;;
@@ -349,21 +367,21 @@ if [ "${CONFIG_NO_DEPRECATED}" != "false" ]; then
 fi
 
 # Determine SDK versions
+if [ ! -n "${IOS_SDKVERSION}" ]; then
+  IOS_SDKVERSION=$(xcrun -sdk iphoneos --show-sdk-version)
+fi
 if [ ! -n "${MACOS_SDKVERSION}" ]; then
   MACOS_SDKVERSION=$(xcrun -sdk macosx --show-sdk-version)
 fi
 if [ ! -n "${CATALYST_SDKVERSION}" ]; then
   CATALYST_SDKVERSION=$(xcrun -sdk macosx --show-sdk-version)
 fi
-if [ ! -n "${IOS_SDKVERSION}" ]; then
-  IOS_SDKVERSION=$(xcrun -sdk iphoneos --show-sdk-version)
+if [ ! -n "${WATCHOS_SDKVERSION}" ]; then
+  WATCHOS_SDKVERSION=$(xcrun -sdk watchos --show-sdk-version)
 fi
 if [ ! -n "${TVOS_SDKVERSION}" ]; then
   TVOS_SDKVERSION=$(xcrun -sdk appletvos --show-sdk-version)
 fi
-if [ ! -n "${WATCHOS_SDKVERSION}" ]; then
-  WATCHOS_SDKVERSION=$(xcrun -sdk watchos --show-sdk-version)
-fi
 
 # Truncate to minor version
 MINOR_VERSION=(${MACOS_SDKVERSION//./ })
@@ -413,11 +431,11 @@ echo
 echo "Build options"
 echo "  OpenSSL version: ${VERSION}"
 echo "  Targets: ${TARGETS}"
+echo "  iOS SDK: ${IOS_SDKVERSION} (min ${IOS_MIN_SDK_VERSION})"
 echo "  macOS SDK: ${MACOS_SDKVERSION} (min ${MACOS_MIN_SDK_VERSION})"
 echo "  macOS SDK (Catalyst): ${CATALYST_SDKVERSION} (min ${CATALYST_MIN_SDK_VERSION})"
-echo "  iOS SDK: ${IOS_SDKVERSION} (min ${IOS_MIN_SDK_VERSION})"
-echo "  tvOS SDK: ${TVOS_SDKVERSION} (min ${TVOS_MIN_SDK_VERSION})"
 echo "  watchOS SDK: ${WATCHOS_SDKVERSION} (min ${WATCHOS_MIN_SDK_VERSION})"
+echo "  tvOS SDK: ${TVOS_SDKVERSION} (min ${TVOS_MIN_SDK_VERSION})"
 if [ "${CONFIG_DISABLE_BITCODE}" == "true" ]; then
   echo "  Bitcode embedding disabled"
 fi
@@ -494,19 +512,26 @@ mkdir -p "${CURRENTPATH}/src"
 # Init vars for library references
 INCLUDE_DIR=""
 OPENSSLCONF_ALL=()
+LIBSSL_IOS=()
+LIBCRYPTO_IOS=()
 LIBSSL_MACOS=()
 LIBCRYPTO_MACOS=()
 LIBSSL_CATALYST=()
 LIBCRYPTO_CATALYST=()
-LIBSSL_IOS=()
-LIBCRYPTO_IOS=()
-LIBSSL_TVOS=()
-LIBCRYPTO_TVOS=()
 LIBSSL_WATCHOS=()
 LIBCRYPTO_WATCHOS=()
+LIBSSL_TVOS=()
+LIBCRYPTO_TVOS=()
 
 source "${SCRIPTDIR}/scripts/build-loop-targets.sh"
 
+# Build iOS library if selected for build
+if [ ${#LIBSSL_IOS[@]} -gt 0 ]; then
+  echo "Build library for iOS..."
+  lipo -create ${LIBSSL_IOS[@]} -output "${CURRENTPATH}/lib/libssl-iPhone.a"
+  lipo -create ${LIBCRYPTO_IOS[@]} -output "${CURRENTPATH}/lib/libcrypto-iPhone.a"
+fi
+
 #Build macOS library if selected for build
 if [ ${#LIBSSL_MACOS[@]} -gt 0 ]; then
   echo "Build library for macOS..."
@@ -521,11 +546,11 @@ if [ ${#LIBSSL_CATALYST[@]} -gt 0 ]; then
   lipo -create ${LIBCRYPTO_CATALYST[@]} -output "${CURRENTPATH}/lib/libcrypto-Catalyst.a"
 fi
 
-# Build iOS library if selected for build
-if [ ${#LIBSSL_IOS[@]} -gt 0 ]; then
-  echo "Build library for iOS..."
-  lipo -create ${LIBSSL_IOS[@]} -output "${CURRENTPATH}/lib/libssl-iPhone.a"
-  lipo -create ${LIBCRYPTO_IOS[@]} -output "${CURRENTPATH}/lib/libcrypto-iPhone.a"
+# Build tvOS library if selected for build
+if [ ${#LIBSSL_WATCHOS[@]} -gt 0 ]; then
+  echo "Build library for watchOS..."
+  lipo -create ${LIBSSL_WATCHOS[@]} -output "${CURRENTPATH}/lib/libssl-WatchOS.a"
+  lipo -create ${LIBCRYPTO_WATCHOS[@]} -output "${CURRENTPATH}/lib/libcrypto-WatchOS.a"
 fi
 
 # Build tvOS library if selected for build
@@ -535,13 +560,6 @@ if [ ${#LIBSSL_TVOS[@]} -gt 0 ]; then
   lipo -create ${LIBCRYPTO_TVOS[@]} -output "${CURRENTPATH}/lib/libcrypto-AppleTV.a"
 fi
 
-# Build tvOS library if selected for build
-if [ ${#LIBSSL_WATCHOS[@]} -gt 0 ]; then
-  echo "Build library for watchOS..."
-  lipo -create ${LIBSSL_WATCHOS[@]} -output "${CURRENTPATH}/lib/libssl-WatchOS.a"
-  lipo -create ${LIBCRYPTO_WATCHOS[@]} -output "${CURRENTPATH}/lib/libcrypto-WatchOS.a"
-fi
-
 # Copy include directory
 cp -R "${INCLUDE_DIR}" "${CURRENTPATH}/include/"
 
@@ -563,38 +581,20 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
 
     # Determine define condition
     case "${OPENSSLCONF_CURRENT}" in
-      *_macos_x86_64.h)
-        DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86_64"
-      ;;
-      *_macos_i386.h)
-        DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86"
-      ;;
-      *_catalyst_x86_64.h)
-        DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_X86_64"
-      ;;
-      *_ios_x86_64.h)
-        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
-      ;;
-      *_ios_i386.h)
-        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86"
-      ;;
       *_ios_arm64.h)
         DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
       ;;
       *_ios_arm64e.h)
         DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64E"
       ;;
-      *_ios_armv7s.h)
-        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)"
+      *_ios_sim_x86_64.h)
+        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
       ;;
-      *_ios_armv7.h)
-        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && !defined(__ARM_ARCH_7S__)"
+      *_macos_x86_64.h)
+        DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86_64"
       ;;
-      *_tvos_x86_64.h)
-        DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
-      ;;
-      *_tvos_arm64.h)
-        DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
+      *_catalyst_x86_64.h)
+        DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_X86_64"
       ;;
       *_watchos_armv7k.h)
         DEFINE_CONDITION="TARGET_OS_WATCHOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARMV7K"
@@ -602,12 +602,15 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
       *_watchos_arm64_32.h)
         DEFINE_CONDITION="TARGET_OS_WATCHOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64_32"
       ;;
-      *_watchos_i386.h)
-        DEFINE_CONDITION="TARGET_OS_SIMULATOR && TARGET_CPU_X86 || TARGET_OS_EMBEDDED"
-      ;;
-      *_watchos_x86_64.h)
+      *_watchos_sim_x86_64.h)
         DEFINE_CONDITION="TARGET_OS_SIMULATOR && TARGET_CPU_X86_64 || TARGET_OS_EMBEDDED"
       ;;
+      *_tvos_arm64.h)
+        DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
+      ;;
+      *_tvos_sim_x86_64.h)
+        DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
+      ;;
       *)
         # Don't run into unexpected cases by setting the default condition to false
         DEFINE_CONDITION="0"
diff --git a/config/20-all-platforms.conf b/config/20-all-platforms.conf
index d3e77e0..af06543 100644
--- a/config/20-all-platforms.conf
+++ b/config/20-all-platforms.conf
@@ -10,50 +10,86 @@ my %targets = ();
     "all-base" => {
         template         => 1,
         cflags           => combine('-isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common',
-                				sub { ((!defined($ENV{'CONFIG_DISABLE_BITCODE'}) || $ENV{'CONFIG_DISABLE_BITCODE'} ne 'true') && defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared})
-                						? '-fembed-bitcode' : (); },
-        					),
+                                sub { ((!defined($ENV{'CONFIG_DISABLE_BITCODE'}) || $ENV{'CONFIG_DISABLE_BITCODE'} ne 'true') && defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared})
+                                        ? '-fembed-bitcode' : (); },
+                            ),
     },
 
-    ## Base settings for iOS
+    ## Base settings
     "ios-cross-base" => {
         inherit_from    => [ "all-base" ],
         template         => 1,
-        cflags           => add(sub { defined($ENV{'IOS_MIN_SDK_VERSION'}) ? '-mios-version-min=$(IOS_MIN_SDK_VERSION)' : '-mios-version-min=7.0'; }),
+        cflags           => add(sub { defined($ENV{'IOS_MIN_SDK_VERSION'}) ? '-mios-version-min=$(IOS_MIN_SDK_VERSION)' : '-mios-version-min=12.0'; }),
     },
-
-    ## Base settings for tvOS
-    # Defines to skip functionality that uses unsupported functions
-    "tvos-cross-base" => {
-        inherit_from    => [ "all-base" ],
-        template         => 1,
-        cflags           => add(sub { defined($ENV{'TVOS_MIN_SDK_VERSION'}) ? '-mtvos-version-min=$(TVOS_MIN_SDK_VERSION)' : '-mtvos-version-min=9.0'; }),
-        defines          => [ "HAVE_FORK=0" ],
-    },
-
-    ## Base settings for macOS
     "macos-base" => {
         inherit_from    => [ "all-base" ],
         template         => 1,
-        cflags           => add(sub { defined($ENV{'MACOS_MIN_SDK_VERSION'}) ? '-mmacosx-version-min=$(MACOS_MIN_SDK_VERSION)' : '-mmacosx-version-min=10.11'; }),
+        cflags           => add(sub { defined($ENV{'MACOS_MIN_SDK_VERSION'}) ? '-mmacosx-version-min=$(MACOS_MIN_SDK_VERSION)' : '-mmacosx-version-min=10.15'; }),
+    },
+    "mac-catalyst-base" => {
+        inherit_from    => [ "all-base" ],
+        template        => 1,
+#        cflags          => add(sub { defined($ENV{'CATALYST_MIN_SDK_VERSION'}) ? '-mmacosx-version-min=$(CATALYST_MIN_SDK_VERSION)' : '-mmacosx-version-min=10.15'; }),
     },
-
-    ## Apple WatchOS
-
-    ## Base settings for iOS
     "watchos-cross-base" => {
         inherit_from    => [ "all-base" ],
         template         => 1,
         cflags           => add(sub { defined($ENV{'WATCH_MIN_SDK_VERSION'}) ? '-mwatchos-version-min=$(WATCH_MIN_SDK_VERSION)' : '-mwatchos-version-min=4.0'; }),
     },
+    "tvos-cross-base" => {
+        inherit_from    => [ "all-base" ],
+        template         => 1,
+        cflags           => add(sub { defined($ENV{'TVOS_MIN_SDK_VERSION'}) ? '-mtvos-version-min=$(TVOS_MIN_SDK_VERSION)' : '-mtvos-version-min=12.0'; }),
+        defines          => [ "HAVE_FORK=0" ],
+    },
 
+    ## Apple iOS
+
+    # Device (arm64)
+    "ios64-cross-arm64" => {
+        inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
+        cflags           => add("-arch arm64"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        perlasm_scheme   => "ios64",
+        sys_id           => "iOS",
+    },
+    # Device (arm64e)
+    "ios64-cross-arm64e" => {
+        inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
+        cflags           => add("-arch arm64e"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        perlasm_scheme   => "ios64",
+        sys_id           => "iOS",
+    },
+    # Simulator (x86_64)
+    "ios-sim-cross-x86_64" => {
+        inherit_from     => [ "darwin64-x86_64-cc", "ios-cross-base" ],
+        sys_id           => "iOS",
+    },
+
+    ## Apple macOS
+
+    # Device (x86_64)
+    "macos64-x86_64" => {
+        inherit_from     => [ "darwin64-x86_64-cc", "macos-base" ],
+        sys_id           => "macOS",
+    },
+    # Catalyst (x86_64)
+    "mac-catalyst-x86_64" => {
+        inherit_from      => [ "darwin64-x86_64-cc", "mac-catalyst-base" ],
+        cflags            => add("-target x86_64-apple-ios13.0-macabi"),
+        sys_id            => "MacOSX",
+    },
+
+    ## Apple WatchOS
+
+    # Device
     "watchos-cross-armv7k" => {
         inherit_from     => [ "darwin-common",  "watchos-cross-base", asm("armv7_asm") ],
         cflags           => add("-arch armv7k -fembed-bitcode"),
         defines          => [ "HAVE_FORK=0" ],
         sys_id           => "WatchOS",
     },
-
     "watchos-cross-arm64_32" => {
         inherit_from     => [ "darwin-common", "watchos-cross-base"],
         cflags           => add("-arch arm64_32 -fembed-bitcode"),
@@ -68,15 +104,7 @@ my %targets = ();
         defines          => [ "HAVE_FORK=0" ],
         sys_id           => "WatchOS",
     },
-    
-
-    "watchos-sim-cross-i386" => {
-        inherit_from     => [ "darwin-common", "watchos-cross-base"],
-        cflags           => add("-arch i386 -fembed-bitcode"),
-        defines          => [ "HAVE_FORK=0" ],
-        sys_id           => "WatchOS",
-    },
-
+    # Simulator
     "watchos-sim-cross-x86_64" => {
         inherit_from     => [ "darwin64-x86_64-cc", "watchos-cross-base"],
         cflags           => add("-fembed-bitcode"),
@@ -84,67 +112,9 @@ my %targets = ();
         sys_id           => "WatchOS",
     },
 
-    ## Apple iOS simulator (x86_64)
-    # Based on 10-main.conf: iphoneos-cross / darwin64-x86_64-cc
-    "ios-sim-cross-x86_64" => {
-        inherit_from     => [ "darwin64-x86_64-cc", "ios-cross-base" ],
-        sys_id           => "iOS",
-    },
+    ## Apple TV
 
-    ## Apple iOS simulator (i386)
-    # Based on 10-main.conf: iphoneos-cross / darwin-i386-cc
-    "ios-sim-cross-i386" => {
-        inherit_from     => [ "darwin-i386-cc", "ios-cross-base" ],
-        sys_id           => "iOS",
-    },
-
-    ## Apple iOS (arm64)
-    # Based on 10-main.conf: ios64-cross
-    "ios64-cross-arm64" => {
-        inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
-        cflags           => add("-arch arm64"),
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
-        perlasm_scheme   => "ios64",
-        sys_id           => "iOS",
-    },
-
-    ## Apple iOS (arm64e)
-    # Based on 10-main.conf: ios64-cross
-    "ios64-cross-arm64e" => {
-        inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
-        cflags           => add("-arch arm64e"),
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
-        perlasm_scheme   => "ios64",
-        sys_id           => "iOS",
-    },
-
-    ## Apple iOS (armv7s)
-    # Based on 10-main.conf: ios-cross
-    "ios-cross-armv7s" => {
-        inherit_from     => [ "darwin-common", "ios-cross-base", asm("armv4_asm") ],
-        cflags           => add("-arch armv7s"),
-        perlasm_scheme   => "ios32",
-        sys_id           => "iOS",
-    },
-
-    ## Apple iOS (armv7)
-    # Based on 10-main.conf: ios-cross
-    "ios-cross-armv7" => {
-        inherit_from     => [ "darwin-common", "ios-cross-base", asm("armv4_asm") ],
-        cflags           => add("-arch armv7"),
-        perlasm_scheme   => "ios32",
-        sys_id           => "iOS",
-    },
-
-    ## Apple tvOS simulator (x86_64)
-    # Based on 10-main.conf: iphoneos-cross / darwin64-x86_64-cc
-    "tvos-sim-cross-x86_64" => {
-        inherit_from     => [ "darwin64-x86_64-cc", "tvos-cross-base" ],
-        sys_id           => "tvOS",
-    },
-
-    ## Apple tvOS (arm64)
-    # Based on 10-main.conf: ios64-cross
+    # Device (arm64)
     "tvos64-cross-arm64" => {
         inherit_from     => [ "darwin-common", "tvos-cross-base", asm("aarch64_asm") ],
         cflags           => add("-arch arm64"),
@@ -152,31 +122,9 @@ my %targets = ();
         perlasm_scheme   => "ios64",
         sys_id           => "tvOS",
     },
-
-    ## Apple macOS (x86_64)
-    "macos64-x86_64" => {
-        inherit_from     => [ "darwin64-x86_64-cc", "macos-base" ],
-        sys_id           => "macOS",
-    },
-
-    ## Apple macOS (i386)
-    "macos-i386" => {
-        inherit_from     => [ "darwin-i386-cc", "macos-base" ],
-        sys_id           => "macOS",
-    },
-
-    ## Catalyst
-    # Based on
-    "mac-catalyst-base" => {
-        inherit_from    => [ "all-base" ],
-        template        => 1,
-#        cflags          => add(sub { defined($ENV{'CATALYST_MIN_SDK_VERSION'}) ? '-mmacosx-version-min=$(CATALYST_MIN_SDK_VERSION)' : '-mmacosx-version-min=10.15'; }),
-    },
-
-    ## Catalyst (armv7s)
-    "mac-catalyst-x86_64" => {
-        inherit_from      => [ "darwin64-x86_64-cc", "mac-catalyst-base" ],
-        cflags            => add("-target x86_64-apple-ios13.0-macabi"),
-        sys_id            => "MacOSX",
+    # Simulator (x86_64)
+    "tvos-sim-cross-x86_64" => {
+        inherit_from     => [ "darwin64-x86_64-cc", "tvos-cross-base" ],
+        sys_id           => "tvOS",
     },
 );
diff --git a/scripts/build-loop-targets.sh b/scripts/build-loop-targets.sh
index 5dc6472..36db9d3 100755
--- a/scripts/build-loop-targets.sh
+++ b/scripts/build-loop-targets.sh
@@ -22,35 +22,29 @@
 for TARGET in ${TARGETS}
 do
   # Determine relevant SDK version
-  if [[ "${TARGET}" == tvos* ]]; then
-    SDKVERSION="${TVOS_SDKVERSION}"
-  elif [[ "${TARGET}" == macos* ]]; then
+  if [[ "${TARGET}" == macos* ]]; then
     SDKVERSION="${MACOS_SDKVERSION}"
   elif [[ "${TARGET}" == mac-catalyst-* ]]; then
     SDKVERSION="${CATALYST_SDKVERSION}"
   elif [[ "${TARGET}" == watchos* ]]; then
     SDKVERSION="${WATCHOS_SDKVERSION}"
+  elif [[ "${TARGET}" == tvos* ]]; then
+    SDKVERSION="${TVOS_SDKVERSION}"
   else
     SDKVERSION="${IOS_SDKVERSION}"
   fi
 
   # These variables are used in the configuration file
   export SDKVERSION
+  export IOS_MIN_SDK_VERSION
   export MACOS_MIN_SDK_VERSION
   export CATALYST_MIN_SDK_VERSION
-  export IOS_MIN_SDK_VERSION
-  export TVOS_MIN_SDK_VERSION
   export WATCHOS_MIN_SDK_VERSION
+  export TVOS_MIN_SDK_VERSION
   export CONFIG_DISABLE_BITCODE
 
   # Determine platform
-  if [[ "${TARGET}" == "ios-sim-cross-"* ]]; then
-    PLATFORM="iPhoneSimulator"
-  elif [[ "${TARGET}" == "tvos-sim-cross-"* ]]; then
-    PLATFORM="AppleTVSimulator"
-  elif [[ "${TARGET}" == "tvos64-cross-"* ]]; then
-    PLATFORM="AppleTVOS"
-  elif [[ "${TARGET}" == "macos"* ]]; then
+  if [[ "${TARGET}" == "macos"* ]]; then
     PLATFORM="MacOSX"
   elif [[ "${TARGET}" == "mac-catalyst-"* ]]; then
     PLATFORM="MacOSX"
@@ -58,6 +52,12 @@ do
     PLATFORM="WatchSimulator"
   elif [[ "${TARGET}" == "watchos"* ]]; then
     PLATFORM="WatchOS"
+  elif [[ "${TARGET}" == "tvos-sim-cross-"* ]]; then
+    PLATFORM="AppleTVSimulator"
+  elif [[ "${TARGET}" == "tvos64-cross-"* ]]; then
+    PLATFORM="AppleTVOS"
+  elif [[ "${TARGET}" == "ios-sim-cross-"* ]]; then
+    PLATFORM="iPhoneSimulator"
   else
     PLATFORM="iPhoneOS"
   fi