diff --git a/Server/Dockerfile b/Server/Dockerfile
index f1abc71e..b51c4d10 100644
--- a/Server/Dockerfile
+++ b/Server/Dockerfile
@@ -1,11 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy
-
-SHELL ["/bin/bash", "-c"]
-
-EXPOSE 5000
-
-ENV ASPNETCORE_ENVIRONMENT="Production"
-ENV ASPNETCORE_URLS="http://*:5000"
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy AS setup
 
 WORKDIR /src
 
@@ -18,6 +11,16 @@ RUN \
   unzip -o ./Server.zip -d /app && \
   rm ./Server.zip
 
+
+FROM setup AS execute
+
+SHELL ["/bin/bash", "-c"]
+
+EXPOSE 5000
+
+ENV ASPNETCORE_ENVIRONMENT="Production"
+ENV ASPNETCORE_URLS="http://*:5000"
+
 WORKDIR /app
 
 RUN \
@@ -28,4 +31,7 @@ VOLUME "/remotely-data"
 
 RUN chmod +x "/src/DockerMain.sh"
 
-ENTRYPOINT ["/src/DockerMain.sh"]
\ No newline at end of file
+ENTRYPOINT ["/src/DockerMain.sh"]
+
+HEALTHCHECK --interval=5m --timeout=3s \
+  CMD curl -f http://localhost:5000/ || exit 1
\ No newline at end of file