diff --git a/.run/Run AWS Toolkit - Community [2024.1].run.xml b/.run/Run AWS Toolkit - Community [2024.1].run.xml
index 13b3332cbbd..3d66c9885ff 100644
--- a/.run/Run AWS Toolkit - Community [2024.1].run.xml	
+++ b/.run/Run AWS Toolkit - Community [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Community [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Community [2024.2].run.xml b/.run/Run AWS Toolkit - Community [2024.2].run.xml
index 6c7716eca05..903ba959561 100644
--- a/.run/Run AWS Toolkit - Community [2024.2].run.xml	
+++ b/.run/Run AWS Toolkit - Community [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Community [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Community [2024.3].run.xml b/.run/Run AWS Toolkit - Community [2024.3].run.xml
index 58af573acfd..ffe9b21a4b3 100644
--- a/.run/Run AWS Toolkit - Community [2024.3].run.xml	
+++ b/.run/Run AWS Toolkit - Community [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Community [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Community [2025.1].run.xml b/.run/Run AWS Toolkit - Community [2025.1].run.xml
index 200a1e02e8e..7d35db3be89 100644
--- a/.run/Run AWS Toolkit - Community [2025.1].run.xml	
+++ b/.run/Run AWS Toolkit - Community [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Gateway [2024.3].run.xml b/.run/Run AWS Toolkit - Gateway [2024.3].run.xml
index 9e497817c24..f59c70407d5 100644
--- a/.run/Run AWS Toolkit - Gateway [2024.3].run.xml	
+++ b/.run/Run AWS Toolkit - Gateway [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Gateway [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Gateway [2025.1].run.xml b/.run/Run AWS Toolkit - Gateway [2025.1].run.xml
index 2cdd8988056..144e9186cdf 100644
--- a/.run/Run AWS Toolkit - Gateway [2025.1].run.xml	
+++ b/.run/Run AWS Toolkit - Gateway [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Gateway [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Rider [2024.1].run.xml b/.run/Run AWS Toolkit - Rider [2024.1].run.xml
index 3c04ac16232..6748da64f44 100644
--- a/.run/Run AWS Toolkit - Rider [2024.1].run.xml	
+++ b/.run/Run AWS Toolkit - Rider [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Rider [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Rider [2024.2].run.xml b/.run/Run AWS Toolkit - Rider [2024.2].run.xml
index 514688316b9..8e8401917eb 100644
--- a/.run/Run AWS Toolkit - Rider [2024.2].run.xml	
+++ b/.run/Run AWS Toolkit - Rider [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Rider [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Rider [2024.3].run.xml b/.run/Run AWS Toolkit - Rider [2024.3].run.xml
index dfb04280b4e..36f24db1b98 100644
--- a/.run/Run AWS Toolkit - Rider [2024.3].run.xml	
+++ b/.run/Run AWS Toolkit - Rider [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Rider [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Rider [2025.1].run.xml b/.run/Run AWS Toolkit - Rider [2025.1].run.xml
index 0f30c49b474..f697a3a38b5 100644
--- a/.run/Run AWS Toolkit - Rider [2025.1].run.xml	
+++ b/.run/Run AWS Toolkit - Rider [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml b/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml
index dbc5fea21c4..b1f9246c803 100644
--- a/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml	
+++ b/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Ultimate [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml b/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml
index f5102c0d8ad..a817e351620 100644
--- a/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml	
+++ b/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Ultimate [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Ultimate [2024.3].run.xml b/.run/Run AWS Toolkit - Ultimate [2024.3].run.xml
index 24a1c12fcbb..bbb485b5902 100644
--- a/.run/Run AWS Toolkit - Ultimate [2024.3].run.xml	
+++ b/.run/Run AWS Toolkit - Ultimate [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Ultimate [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run AWS Toolkit - Ultimate [2025.1].run.xml b/.run/Run AWS Toolkit - Ultimate [2025.1].run.xml
index b82db349132..c985a8319d0 100644
--- a/.run/Run AWS Toolkit - Ultimate [2025.1].run.xml	
+++ b/.run/Run AWS Toolkit - Ultimate [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run AWS Toolkit - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Community [2024.1].run.xml b/.run/Run All - Community [2024.1].run.xml
index 23ee2c7c058..e1760d16510 100644
--- a/.run/Run All - Community [2024.1].run.xml	
+++ b/.run/Run All - Community [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Community [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IC-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Community [2024.2].run.xml b/.run/Run All - Community [2024.2].run.xml
index 1536b7d8539..4f0ad7b5cb7 100644
--- a/.run/Run All - Community [2024.2].run.xml	
+++ b/.run/Run All - Community [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Community [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IC-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Community [2024.3].run.xml b/.run/Run All - Community [2024.3].run.xml
index 16d4674dd85..988ece48c18 100644
--- a/.run/Run All - Community [2024.3].run.xml	
+++ b/.run/Run All - Community [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Community [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IC-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Community [2025.1].run.xml b/.run/Run All - Community [2025.1].run.xml
index 159dda9b496..3d992a0a127 100644
--- a/.run/Run All - Community [2025.1].run.xml	
+++ b/.run/Run All - Community [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IC-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Rider [2024.1].run.xml b/.run/Run All - Rider [2024.1].run.xml
index e1e418804f3..2fe2c1b538f 100644
--- a/.run/Run All - Rider [2024.1].run.xml	
+++ b/.run/Run All - Rider [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Rider [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/RD-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Rider [2024.2].run.xml b/.run/Run All - Rider [2024.2].run.xml
index 20a71d6c805..da3ca2d6242 100644
--- a/.run/Run All - Rider [2024.2].run.xml	
+++ b/.run/Run All - Rider [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Rider [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/RD-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Rider [2024.3].run.xml b/.run/Run All - Rider [2024.3].run.xml
index bd6e33e8cef..ba5df9f5ab5 100644
--- a/.run/Run All - Rider [2024.3].run.xml	
+++ b/.run/Run All - Rider [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Rider [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/RD-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Rider [2025.1].run.xml b/.run/Run All - Rider [2025.1].run.xml
index 2ccae6c6212..c6e195c57a3 100644
--- a/.run/Run All - Rider [2025.1].run.xml	
+++ b/.run/Run All - Rider [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/RD-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Ultimate [2024.1].run.xml b/.run/Run All - Ultimate [2024.1].run.xml
index 1d53fc3e274..606517ed2ed 100644
--- a/.run/Run All - Ultimate [2024.1].run.xml	
+++ b/.run/Run All - Ultimate [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Ultimate [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IU-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Ultimate [2024.2].run.xml b/.run/Run All - Ultimate [2024.2].run.xml
index 4a41039342b..be0eca8b099 100644
--- a/.run/Run All - Ultimate [2024.2].run.xml	
+++ b/.run/Run All - Ultimate [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Ultimate [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IU-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Ultimate [2024.3].run.xml b/.run/Run All - Ultimate [2024.3].run.xml
index 4b342ef6cc8..49f02c1a438 100644
--- a/.run/Run All - Ultimate [2024.3].run.xml	
+++ b/.run/Run All - Ultimate [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Ultimate [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IU-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run All - Ultimate [2025.1].run.xml b/.run/Run All - Ultimate [2025.1].run.xml
index 710bbee5124..4285e179a54 100644
--- a/.run/Run All - Ultimate [2025.1].run.xml	
+++ b/.run/Run All - Ultimate [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IU-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Community [2024.1].run.xml b/.run/Run Amazon Q - Community [2024.1].run.xml
index 64d3a3ae8e2..48037481044 100644
--- a/.run/Run Amazon Q - Community [2024.1].run.xml	
+++ b/.run/Run Amazon Q - Community [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Community [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Community [2024.2].run.xml b/.run/Run Amazon Q - Community [2024.2].run.xml
index a9ecf8ecdf4..a6938fa06f2 100644
--- a/.run/Run Amazon Q - Community [2024.2].run.xml	
+++ b/.run/Run Amazon Q - Community [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Community [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Community [2024.3].run.xml b/.run/Run Amazon Q - Community [2024.3].run.xml
index 1fabbca0705..4f6b86d32f1 100644
--- a/.run/Run Amazon Q - Community [2024.3].run.xml	
+++ b/.run/Run Amazon Q - Community [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Community [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Community [2025.1].run.xml b/.run/Run Amazon Q - Community [2025.1].run.xml
index e9db2d9ab8b..ed23a45a50e 100644
--- a/.run/Run Amazon Q - Community [2025.1].run.xml	
+++ b/.run/Run Amazon Q - Community [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Rider [2024.1].run.xml b/.run/Run Amazon Q - Rider [2024.1].run.xml
index b6f9087dee1..a66d2fb3045 100644
--- a/.run/Run Amazon Q - Rider [2024.1].run.xml	
+++ b/.run/Run Amazon Q - Rider [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Rider [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Rider [2024.2].run.xml b/.run/Run Amazon Q - Rider [2024.2].run.xml
index 616cc13acec..6bdbf3e79e3 100644
--- a/.run/Run Amazon Q - Rider [2024.2].run.xml	
+++ b/.run/Run Amazon Q - Rider [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Rider [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Rider [2024.3].run.xml b/.run/Run Amazon Q - Rider [2024.3].run.xml
index 59c877e9d51..9e64b94c3e3 100644
--- a/.run/Run Amazon Q - Rider [2024.3].run.xml	
+++ b/.run/Run Amazon Q - Rider [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Rider [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Rider [2025.1].run.xml b/.run/Run Amazon Q - Rider [2025.1].run.xml
index 78007f25241..e94c11fe07f 100644
--- a/.run/Run Amazon Q - Rider [2025.1].run.xml	
+++ b/.run/Run Amazon Q - Rider [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Ultimate [2024.1].run.xml b/.run/Run Amazon Q - Ultimate [2024.1].run.xml
index 42969080190..c16f5123324 100644
--- a/.run/Run Amazon Q - Ultimate [2024.1].run.xml	
+++ b/.run/Run Amazon Q - Ultimate [2024.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Ultimate [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2024.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Ultimate [2024.2].run.xml b/.run/Run Amazon Q - Ultimate [2024.2].run.xml
index c27583bee1a..f0d00383c8a 100644
--- a/.run/Run Amazon Q - Ultimate [2024.2].run.xml	
+++ b/.run/Run Amazon Q - Ultimate [2024.2].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Ultimate [2024.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2024.2/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Ultimate [2024.3].run.xml b/.run/Run Amazon Q - Ultimate [2024.3].run.xml
index 26ca55e73c5..6891367056b 100644
--- a/.run/Run Amazon Q - Ultimate [2024.3].run.xml	
+++ b/.run/Run Amazon Q - Ultimate [2024.3].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Ultimate [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2024.3/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/Run Amazon Q - Ultimate [2025.1].run.xml b/.run/Run Amazon Q - Ultimate [2025.1].run.xml
index bf7ba33b0de..8d363e8ad4a 100644
--- a/.run/Run Amazon Q - Ultimate [2025.1].run.xml	
+++ b/.run/Run Amazon Q - Ultimate [2025.1].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Amazon Q - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2025.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.run/generateConfigs.py b/.run/generateConfigs.py
index 8d595fd3a4b..7a939d627c8 100644
--- a/.run/generateConfigs.py
+++ b/.run/generateConfigs.py
@@ -23,7 +23,7 @@ def __post_init__(self):
 
 TEMPLATE = '''<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run {plugin.name} - {variant.pretty} [{major_version}]" type="GradleRunConfiguration" factoryName="Gradle" folderName="{major_version}">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/{plugin.path}/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/{plugin.path}/build/idea-sandbox/{variant.short}-{major_version}/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />