diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 594ab8442..ec3925717 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,11 +54,11 @@ jobs:
             rust: stable
             target: i686-unknown-linux-gnu
           - build: aarch64-macos
-            os: macos-14
+            os: macos-latest
             rust: stable
             target: aarch64-apple-darwin
           - build: x86_64-macos
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-darwin
           - build: aarch64-ios
@@ -72,7 +72,7 @@ jobs:
             target: aarch64-apple-ios-sim
             no_run: --no-run
           - build: x86_64-ios-sim
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-ios # Simulator
             no_run: --no-run
@@ -82,7 +82,7 @@ jobs:
             target: aarch64-apple-ios-macabi
             no_run: --no-run # FIXME(madsmtm): Fix running tests
           - build: x86_64-ios-macabi
-            os: macos-13 # x86
+            os: macos-latest
             rust: stable
             target: x86_64-apple-ios-macabi
             no_run: --no-run # FIXME(madsmtm): Fix running tests
diff --git a/src/target/llvm.rs b/src/target/llvm.rs
index 63b0dfca1..b29fdb706 100644
--- a/src/target/llvm.rs
+++ b/src/target/llvm.rs
@@ -95,7 +95,13 @@ impl TargetInfo<'_> {
             env => env,
         };
         let abi = match self.abi {
-            "sim" => "simulator",
+            "sim" => {
+                if env != "simulator" {
+                    "simulator"
+                } else {
+                    ""
+                }
+            }
             "llvm" | "softfloat" | "uwp" | "vec-extabi" => "",
             "ilp32" => "_ilp32",
             "abi64" => "",