diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a239c22..355699620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 ### Fixed
 
 - Null PsiDirectory input in GetModuleNameByDirectoryUtil [#2606](https://github.com/magento/magento2-phpstorm-plugin/pull/2606)
+- Migrated settings storage to workspace.xm [#2607](https://github.com/magento/magento2-phpstorm-plugin/pull/2607)
 
 ## 2025.2.1
 
diff --git a/src/main/java/com/magento/idea/magento2plugin/project/Settings.java b/src/main/java/com/magento/idea/magento2plugin/project/Settings.java
index b24b0d6e2..6290e313b 100644
--- a/src/main/java/com/magento/idea/magento2plugin/project/Settings.java
+++ b/src/main/java/com/magento/idea/magento2plugin/project/Settings.java
@@ -10,6 +10,7 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.SmartList;
@@ -27,7 +28,8 @@
 @State(
         name = "Magento2PluginSettings",
         storages = {
-            @Storage("magento2plugin.xml")
+            @Storage(StoragePathMacros.WORKSPACE_FILE),
+            @Storage(value = "magento2plugin.xml", deprecated = true)
         }
 )
 public class Settings implements PersistentStateComponent<Settings.State> {