diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..5a1f162
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+  </PropertyGroup>
+  
+</Project>
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..4f20e38
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+        "Peachpie.NET.Sdk": "0.9.800"
+    }
+}
\ No newline at end of file
diff --git a/mediawiki b/mediawiki
index 9eb914a..19a0b16 160000
--- a/mediawiki
+++ b/mediawiki
@@ -1 +1 @@
-Subproject commit 9eb914adac5cccd35ec4bba120d820be20df0c62
+Subproject commit 19a0b1694228f19632616a12e8350f5d21bb9781
diff --git a/server/Program.cs b/server/Program.cs
index 039f034..169d393 100644
--- a/server/Program.cs
+++ b/server/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.DependencyInjection;
-using Peachpie.Web;
 
 namespace Website.Server
 {
@@ -14,10 +13,9 @@ static void Main(string[] args)
         {
             var root = System.IO.Directory.GetCurrentDirectory() + "/mediawiki";
 
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://*:5004/")
+            var host = WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
+                .UseUrls("http://*:5004/")
                 .UseWebRoot(root)
                 .UseContentRoot(root)
                 .Build();
diff --git a/server/server.csproj b/server/server.csproj
index 6fb0e17..3250b8b 100644
--- a/server/server.csproj
+++ b/server/server.csproj
@@ -1,17 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!-- $(PeachpieVersion) property from the current Peachpie.NET.Sdk -->
+  <Import Project="Version.props" Sdk="Peachpie.NET.Sdk" Condition=" '$(PeachpieVersion)'=='' " />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
-    <PackageReference Include="Peachpie.NETCore.Web" Version="0.9.0-CI00853" />
+    <PackageReference Include="Peachpie.AspNetCore.Web" Version="$(PeachpieVersion)" />
   </ItemGroup>
 
   <ItemGroup>