diff --git a/unity-client/Assets/Editor/CreateCollectionScene.cs b/unity-client/Assets/Editor/CreateCollectionScene.cs
index c77e0ba..08d570a 100644
--- a/unity-client/Assets/Editor/CreateCollectionScene.cs
+++ b/unity-client/Assets/Editor/CreateCollectionScene.cs
@@ -200,8 +200,13 @@ public static class CreateCollectionScene
         SetField(ctrl, "errorText",           errorText.GetComponent<TMP_Text>());
         SetField(ctrl, "retryButton",         retryBtn.GetComponent<Button>());
 
-        EditorSceneManager.MarkSceneDirty(EditorSceneManager.GetActiveScene());
-        Debug.Log("[CreateCollectionScene] Collection scene created.");
+        // -- Save --
+        if (!AssetDatabase.IsValidFolder("Assets/Scenes"))
+            AssetDatabase.CreateFolder("Assets", "Scenes");
+        string path = "Assets/Scenes/Collection.unity";
+        EditorSceneManager.SaveScene(scene, path);
+        EditorBuildSettings.scenes = new EditorBuildSettingsScene[] { new EditorBuildSettingsScene(path, true) };
+        Debug.Log("[CreateCollectionScene] Collection scene created and saved to " + path);
     }
 
     // -- Helpers --
diff --git a/unity-client/Assets/Editor/CreateDeckBuilderScene.cs b/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
index 73c3187..1f77210 100644
--- a/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
+++ b/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
@@ -164,8 +164,13 @@ public static class CreateDeckBuilderScene
         var typeText = CreateTMPText(rightPanel.transform, "TypeBreakdownText", "", 14, FontStyles.Normal, TextAlignmentOptions.TopLeft);
         SetAnchors(typeText.GetComponent<RectTransform>(), new Vector2(0.05f, 0.01f), new Vector2(0.95f, 0.08f));
 
-        EditorSceneManager.MarkSceneDirty(EditorSceneManager.GetActiveScene());
-        Debug.Log("[CreateDeckBuilderScene] DeckBuilder scene created.");
+        // -- Save --
+        if (!AssetDatabase.IsValidFolder("Assets/Scenes"))
+            AssetDatabase.CreateFolder("Assets", "Scenes");
+        string path = "Assets/Scenes/DeckBuilder.unity";
+        EditorSceneManager.SaveScene(scene, path);
+        EditorBuildSettings.scenes = new EditorBuildSettingsScene[] { new EditorBuildSettingsScene(path, true) };
+        Debug.Log("[CreateDeckBuilderScene] DeckBuilder scene created and saved to " + path);
     }
 
     // -- Helpers --
diff --git a/unity-client/Assets/Editor/CreateScannerScene.cs b/unity-client/Assets/Editor/CreateScannerScene.cs
index 136531b..aebe64a 100644
--- a/unity-client/Assets/Editor/CreateScannerScene.cs
+++ b/unity-client/Assets/Editor/CreateScannerScene.cs
@@ -87,8 +87,13 @@ public static class CreateScannerScene
         SetAnchors(addDeckBtn.GetComponent<RectTransform>(), new Vector2(0.52f, 0.03f), new Vector2(0.97f, 0.12f));
         resultPanel.SetActive(false);
 
-        EditorSceneManager.MarkSceneDirty(EditorSceneManager.GetActiveScene());
-        Debug.Log("[CreateScannerScene] Scanner scene created.");
+        // -- Save --
+        if (!AssetDatabase.IsValidFolder("Assets/Scenes"))
+            AssetDatabase.CreateFolder("Assets", "Scenes");
+        string path = "Assets/Scenes/Scanner.unity";
+        EditorSceneManager.SaveScene(scene, path);
+        EditorBuildSettings.scenes = new EditorBuildSettingsScene[] { new EditorBuildSettingsScene(path, true) };
+        Debug.Log("[CreateScannerScene] Scanner scene created and saved to " + path);
     }
 
     // -- Helpers --
diff --git a/unity-client/Assets/Editor/CreateSimulatorScene.cs b/unity-client/Assets/Editor/CreateSimulatorScene.cs
index d3a46db..b11a2ac 100644
--- a/unity-client/Assets/Editor/CreateSimulatorScene.cs
+++ b/unity-client/Assets/Editor/CreateSimulatorScene.cs
@@ -80,8 +80,13 @@ public static class CreateSimulatorScene
         var progressText = CreateTMPText(progressBg.transform, "ProgressText", "0%", 14, FontStyles.Normal, TextAlignmentOptions.Center);
         SetAnchors(progressText.GetComponent<RectTransform>(), new Vector2(0f, 0f), new Vector2(1f, 1f));
 
-        EditorSceneManager.MarkSceneDirty(EditorSceneManager.GetActiveScene());
-        Debug.Log("[CreateSimulatorScene] Simulator scene created.");
+        // -- Save --
+        if (!AssetDatabase.IsValidFolder("Assets/Scenes"))
+            AssetDatabase.CreateFolder("Assets", "Scenes");
+        string path = "Assets/Scenes/Simulator.unity";
+        EditorSceneManager.SaveScene(scene, path);
+        EditorBuildSettings.scenes = new EditorBuildSettingsScene[] { new EditorBuildSettingsScene(path, true) };
+        Debug.Log("[CreateSimulatorScene] Simulator scene created and saved to " + path);
     }
 
     // -- Helpers --
diff --git a/unity-client/Assets/Editor/CreateTrainingScene.cs b/unity-client/Assets/Editor/CreateTrainingScene.cs
index d59eea5..7386045 100644
--- a/unity-client/Assets/Editor/CreateTrainingScene.cs
+++ b/unity-client/Assets/Editor/CreateTrainingScene.cs
@@ -165,8 +165,13 @@ public static class CreateTrainingScene
         SetPrivateField(ctrl, "errorPanel",           errorPanel);
         SetPrivateField(ctrl, "errorText",            errorTxt.GetComponent<TextMeshProUGUI>());
 
-        EditorSceneManager.SaveScene(scene, "Assets/Scenes/Training.unity");
-        UnityEngine.Debug.Log("[CreateTrainingScene] Training scene created.");
+        // -- Save --
+        if (!AssetDatabase.IsValidFolder("Assets/Scenes"))
+            AssetDatabase.CreateFolder("Assets", "Scenes");
+        string path = "Assets/Scenes/Training.unity";
+        EditorSceneManager.SaveScene(scene, path);
+        EditorBuildSettings.scenes = new EditorBuildSettingsScene[] { new EditorBuildSettingsScene(path, true) };
+        UnityEngine.Debug.Log("[CreateTrainingScene] Training scene created and saved to " + path);
     }
 
     // ── Helpers ───────────────────────────────────────────────────────────