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 312086db3..ff2a6403d 100644
--- a/app/src/main/java/io/xpipe/app/core/AppAotTrain.java
+++ b/app/src/main/java/io/xpipe/app/core/AppAotTrain.java
@@ -24,7 +24,7 @@ public class AppAotTrain {
                 true);
         AppLayoutModel.get().selectSettings();
         ThreadHelper.sleep(1000);
-        // AppLayoutModel.get().selectLicense();
+        AppLayoutModel.get().selectLicense();
         ThreadHelper.sleep(1000);
         AppLayoutModel.get().selectBrowser();
         ThreadHelper.sleep(5000);
diff --git a/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java b/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java
index 7f6a14d0d..ce5f3de46 100644
--- a/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java
+++ b/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java
@@ -61,6 +61,10 @@ public class WorkspaceManager {
     }
 
     private void save() {
+        if (AppProperties.get().isAotTrainMode() ||AppProperties.get().isTest() || workspaces.isEmpty()) {
+            return;
+        }
+
         try {
             var file = AppProperties.get().getDefaultReleaseDataDir().resolve("workspaces.json");
             JacksonMapper.getDefault().writeValue(file.toFile(), workspaces);
diff --git a/app/src/main/java/io/xpipe/app/prefs/WorkspacesCategory.java b/app/src/main/java/io/xpipe/app/prefs/WorkspacesCategory.java
index fb58de19b..9d283ba62 100644
--- a/app/src/main/java/io/xpipe/app/prefs/WorkspacesCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/WorkspacesCategory.java
@@ -1,8 +1,10 @@
 package io.xpipe.app.prefs;
 
 import io.xpipe.app.comp.BaseRegionBuilder;
+import io.xpipe.app.comp.RegionBuilder;
 import io.xpipe.app.comp.base.ButtonComp;
 import io.xpipe.app.core.AppI18n;
+import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.platform.LabelGraphic;
 import io.xpipe.app.platform.OptionsBuilder;
 import io.xpipe.app.util.DocumentationLink;
@@ -28,7 +30,7 @@ public class WorkspacesCategory extends AppPrefsCategory {
                         .nameAndDescription("workspaceManagement")
                         .documentationLink(DocumentationLink.WORKSPACES)
                         .licenseRequirement("workspaces")
-                        .addComp(new WorkspaceOverviewComp().maxWidth(getCompWidth())))
+                        .addComp(AppProperties.get().isAotTrainMode() ? RegionBuilder.empty() : new WorkspaceOverviewComp().maxWidth(getCompWidth())))
                 .buildComp();
     }
 }
diff --git a/version b/version
index c5377ca46..e2ab50518 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-22.2-6
+22.2-7