diff --git a/EstateAdministrationUI/Program.cs b/EstateAdministrationUI/Program.cs
index 1dd7a63..e0e9047 100644
--- a/EstateAdministrationUI/Program.cs
+++ b/EstateAdministrationUI/Program.cs
@@ -60,7 +60,7 @@ public static IHostBuilder CreateHostBuilder(String[] args)
                                                                                                   // Enable support for HTTP1 and HTTP2 (required if you want to host gRPC endpoints)
                                                                                                   listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
                                                                                                   // Configure Kestrel to use a certificate from a local .PFX file for hosting HTTPS
-                                                                                                  listenOptions.UseHttps(Program.LoadCertificate());
+                                                                                                  listenOptions.UseHttps(Program.LoadCertificate(fi.Directory.FullName));
                                                                                               });
                                                                            });
                                                  });
@@ -72,10 +72,10 @@ public static void Main(String[] args)
             Program.CreateHostBuilder(args).Build().Run();
         }
 
-        private static X509Certificate2 LoadCertificate()
+        private static X509Certificate2 LoadCertificate(String path)
         {
             //just to ensure that we are picking the right file! little bit of ugly code:
-            var files = Directory.GetFiles(Directory.GetCurrentDirectory());
+            var files = Directory.GetFiles(path);
             var certificateFile = files.First(name => name.Contains("pfx"));
             Console.WriteLine(certificateFile);