diff --git a/.env.sample b/.env.sample
index 9aece53..c025666 100644
--- a/.env.sample
+++ b/.env.sample
@@ -26,4 +26,6 @@ UCHU_CHAT_PORT=2004
 UCHU_API_PORT_RANGE=10000-10100
 UCHU_WORLD_PORT_RANGE=20000-20100
 UCHU_SERVER_PORT=21836
-UCHU_AUTH_PORT=40000
\ No newline at end of file
+UCHU_AUTH_PORT=40000
+HEART_BEAT_INTERVAL=5
+REQUIRED_HEART_BEATS=10
diff --git a/Uchu b/Uchu
index 92aad54..8d89e3c 160000
--- a/Uchu
+++ b/Uchu
@@ -1 +1 @@
-Subproject commit 92aad5462a1ece68aee3e5ca24caaa7acdf8cbb4
+Subproject commit 8d89e3cae170d1e226eeaf180b6fedd5b1cbb6bb
diff --git a/Uchu.Dockerfile b/Uchu.Dockerfile
index 21985cf..04b080a 100644
--- a/Uchu.Dockerfile
+++ b/Uchu.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine
+FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine
 
 RUN apk update && apk add --no-cache gettext curl python3 py3-pip
 
@@ -14,4 +14,4 @@ RUN dotnet build --configuration Release
 COPY config.default.xml .env cert.pfx* ./
 RUN set -o allexport && source .env && set +o allexport && envsubst < config.default.xml > config.xml
 
-ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/netcoreapp3.1/Uchu.Master.dll"]
+ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/net5.0/Uchu.Master.dll"]
diff --git a/config.default.xml b/config.default.xml
index 92b73d2..e0750ab 100644
--- a/config.default.xml
+++ b/config.default.xml
@@ -19,8 +19,8 @@
   </FileLogging>
   <DllSource>
     <DotNetPath>dotnet</DotNetPath>
-    <Instance>../../../../Uchu.Instance/bin/Release/netcoreapp3.1/Uchu.Instance.dll</Instance>
-    <ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/netcoreapp3.1/Uchu.StandardScripts.dll</ScriptDllSource>
+    <Instance>../../../../Uchu.Instance/bin/Release/net5.0/Uchu.Instance.dll</Instance>
+    <ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/net5.0/Uchu.StandardScripts.dll</ScriptDllSource>
   </DllSource>
   <ManagedScriptSources />
   <ResourcesConfiguration>
@@ -33,6 +33,8 @@
     <HostAuthentication>true</HostAuthentication>
     <HostCharacter>true</HostCharacter>
     <MaxWorldServers>100</MaxWorldServers>
+    <WorldServerHeartBeatIntervalInMinutes>$HEART_BEAT_INTERVAL</WorldServerHeartBeatIntervalInMinutes>
+    <WorldServerHeartBeatsPerInterval>$REQUIRED_HEART_BEATS</WorldServerHeartBeatsPerInterval>
   </Networking>
   <GamePlay>
     <PathFinding>false</PathFinding>