diff --git a/MapManager.Apis/Config/Default.cs b/MapManager.Apis/Config/Default.cs
index 073f14d..2ace277 100644
--- a/MapManager.Apis/Config/Default.cs
+++ b/MapManager.Apis/Config/Default.cs
@@ -13,8 +13,7 @@ public class Default
 
         private static DirectoryInfo GetDirectory()
         {
-            var assemblyDirectory
-                = new DirectoryInfo(Path.Combine(Path.GetDirectoryName(typeof(Version).Assembly.Location) ?? @"./", "Default"));
+            var assemblyDirectory = new DirectoryInfo(Path.Combine(AppContext.BaseDirectory, "Default"));
             return assemblyDirectory;
         }
 
diff --git a/MapManager.Apis/Config/Shared.cs b/MapManager.Apis/Config/Shared.cs
index 11493f5..e1a2303 100644
--- a/MapManager.Apis/Config/Shared.cs
+++ b/MapManager.Apis/Config/Shared.cs
@@ -13,8 +13,8 @@ public class Shared
 
         private static DirectoryInfo GetDirectory()
         {
-            var sharedDirectory
-                = new DirectoryInfo(Path.Combine(new DirectoryInfo(Path.GetDirectoryName(typeof(Version).Assembly.Location)).Parent.Parent.FullName, "Shared"));
+            var outputDirectory = new DirectoryInfo(AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
+            var sharedDirectory = new DirectoryInfo(Path.Combine(outputDirectory.Parent.Parent.FullName, "Shared"));
             return sharedDirectory;
         }