diff --git a/app/src/main/java/io/xpipe/app/core/AppAotTrain.java b/app/src/main/java/io/xpipe/app/core/AppAotTrain.java
index f7605cbbc..62b7a9045 100644
--- a/app/src/main/java/io/xpipe/app/core/AppAotTrain.java
+++ b/app/src/main/java/io/xpipe/app/core/AppAotTrain.java
@@ -8,15 +8,6 @@ import io.xpipe.app.util.ThreadHelper;
 
 public class AppAotTrain {
 
-    public static boolean isSupported() {
-        // The x86_64 runners seem to have weird issues
-        if (OsType.ofLocal() == OsType.MACOS && AppProperties.get().getArch().equals("amd64")) {
-            return false;
-        }
-
-        return true;
-    }
-
     public static void runTrainingMode() throws Throwable {
         // Linux runners don't support graphics
         if (OsType.ofLocal() == OsType.LINUX) {
diff --git a/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
index 56fa6f957..4f963d710 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
@@ -199,15 +199,11 @@ public abstract class AppOperationMode {
 
         try {
             if (AppProperties.get().isAotTrainMode()) {
-                if (AppAotTrain.isSupported()) {
-                    AppOperationMode.switchToSyncOrThrow(BACKGROUND);
-                    inStartup = false;
-                    AppAotTrain.runTrainingMode();
-                    AppOperationMode.shutdown(false);
-                    return;
-                } else {
-                    AppOperationMode.halt(0);
-                }
+                AppOperationMode.switchToSyncOrThrow(BACKGROUND);
+                inStartup = false;
+                AppAotTrain.runTrainingMode();
+                AppOperationMode.shutdown(false);
+                return;
             }
 
             var startupMode = getStartupMode();
diff --git a/build.gradle b/build.gradle
index d37d14d30..52e0de1ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -322,8 +322,9 @@ project.ext {
     isStage = System.getenv('STAGE') != null && Boolean.parseBoolean(System.getenv('STAGE'))
     ci = System.getenv('CI') != null
     obfuscate = true
-    fullVersion = file("$rootDir/private_files.txt").exists()
-    bundleCds = ci && fullVersion
+    fullVersion = file("$rootDir/private_files.txt").exists(){
+    // The x86_64 runners seem to have weird issues
+    bundleCds = ci && fullVersion && !(org.gradle.internal.os.OperatingSystem.current().isMacOsX() && getArchName() == "x86_64")
     debugCli = false
 
     // Names