diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index a4ab8de08..820e079cb 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -47,10 +47,10 @@ namespace Flow.Launcher.Core.Plugin
         /// <summary>
         /// Directories that will hold Flow Launcher plugin directory
         /// </summary>
-        public static readonly string[] Directories =
-        {
+        public static string[] Directories =>
+        [
             Constant.PreinstalledDirectory, DataLocation.PluginsDirectory
-        };
+        ];
 
         private static void DeletePythonBinding()
         {
diff --git a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
index 5b948e450..7ed541508 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 
+#pragma warning disable CA2211 // Non-constant fields should not be visible
+
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public static class DataLocation
@@ -28,17 +30,17 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public static string VersionLogDirectory => Path.Combine(LogDirectory, Constant.Version);
         public static string LogDirectory => Path.Combine(DataDirectory(), Constant.Logs);
 
-        public static readonly string CacheDirectory = Path.Combine(DataDirectory(), Constant.Cache);
-        public static readonly string SettingsDirectory = Path.Combine(DataDirectory(), Constant.Settings);
-        public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
-        public static readonly string ThemesDirectory = Path.Combine(DataDirectory(), Constant.Themes);
+        public static string CacheDirectory => Path.Combine(DataDirectory(), Constant.Cache);
+        public static string SettingsDirectory = Path.Combine(DataDirectory(), Constant.Settings);
+        public static string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
+        public static string ThemesDirectory = Path.Combine(DataDirectory(), Constant.Themes);
 
-        public static readonly string PluginSettingsDirectory = Path.Combine(SettingsDirectory, Constant.Plugins);
-        public static readonly string PluginCacheDirectory = Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
+        public static string PluginSettingsDirectory => Path.Combine(SettingsDirectory, Constant.Plugins);
+        public static string PluginCacheDirectory => Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
 
         public const string PythonEnvironmentName = "Python";
         public const string NodeEnvironmentName = "Node.js";
         public const string PluginEnvironments = "Environments";
-        public static readonly string PluginEnvironmentsPath = Path.Combine(DataDirectory(), PluginEnvironments);
+        public static string PluginEnvironmentsPath => Path.Combine(DataDirectory(), PluginEnvironments);
     }
 }