diff --git a/Docker/build/Dockerfile-MareSynchronosAuthService-git b/Docker/build/Dockerfile-MareSynchronosAuthService-git
index de9b7c1..021fd62 100644
--- a/Docker/build/Dockerfile-MareSynchronosAuthService-git
+++ b/Docker/build/Dockerfile-MareSynchronosAuthService-git
@@ -1,6 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
+FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
 
-RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server
+RUN git clone --recurse-submodules https://github.com/caraxi/mare.server
+
+COPY MareAPI /server/MareAPI
+COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
+COPY MareSynchronosServer/MareSynchronosAuthService /server/MareSynchronosServer/MareSynchronosAuthService
 
 WORKDIR /server/MareSynchronosServer/MareSynchronosAuthService/
 
@@ -10,7 +14,7 @@ RUN dotnet publish \
         --output=/MareSynchronosAuthService \
         MareSynchronosAuthService.csproj
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 
 RUN adduser \
         --disabled-password \
diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git
index fec5c0b..1191b4e 100644
--- a/Docker/build/Dockerfile-MareSynchronosServer-git
+++ b/Docker/build/Dockerfile-MareSynchronosServer-git
@@ -1,6 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
+FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
 
-RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server
+RUN git clone --recurse-submodules https://github.com/caraxi/mare.server
+
+COPY MareAPI /server/MareAPI
+COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
+COPY MareSynchronosServer/MareSynchronosServer /server/MareSynchronosServer/MareSynchronosServer
 
 WORKDIR /server/MareSynchronosServer/MareSynchronosServer/
 
@@ -10,7 +14,7 @@ RUN dotnet publish \
         --output=/MareSynchronosServer \
         MareSynchronosServer.csproj
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 
 RUN adduser \
         --disabled-password \
diff --git a/Docker/build/Dockerfile-MareSynchronosServices-git b/Docker/build/Dockerfile-MareSynchronosServices-git
index 964d0ac..c0fb0e1 100644
--- a/Docker/build/Dockerfile-MareSynchronosServices-git
+++ b/Docker/build/Dockerfile-MareSynchronosServices-git
@@ -1,6 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
+FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
 
-RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server
+RUN git clone --recurse-submodules https://github.com/caraxi/mare.server
+
+COPY MareAPI /server/MareAPI
+COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
+COPY MareSynchronosServer/MareSynchronosServices /server/MareSynchronosServer/MareSynchronosServices
 
 WORKDIR /server/MareSynchronosServer/MareSynchronosServices/
 
@@ -10,7 +14,7 @@ RUN dotnet publish \
         --output=/MareSynchronosServices \
         MareSynchronosServices.csproj
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 
 RUN adduser \
         --disabled-password \
diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git
index 579c38b..3d646e8 100644
--- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git
+++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git
@@ -1,6 +1,10 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
 
-RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server
+RUN git clone --recurse-submodules https://github.com/caraxi/mare.server
+
+COPY MareAPI /server/MareAPI
+COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
+COPY MareSynchronosServer/MareSynchronosStaticFilesServer /server/MareSynchronosServer/MareSynchronosStaticFilesServer
 
 WORKDIR /server/MareSynchronosServer/MareSynchronosStaticFilesServer/
 
diff --git a/Docker/build/linux-git/docker-build-authservice.sh b/Docker/build/linux-git/docker-build-authservice.sh
index fd7d396..c758e15 100644
--- a/Docker/build/linux-git/docker-build-authservice.sh
+++ b/Docker/build/linux-git/docker-build-authservice.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm
\ No newline at end of file
+cd ../../../
+docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm
+cd Docker/build/linux-git
diff --git a/Docker/build/linux-git/docker-build-server.sh b/Docker/build/linux-git/docker-build-server.sh
index 1815f92..e03b532 100644
--- a/Docker/build/linux-git/docker-build-server.sh
+++ b/Docker/build/linux-git/docker-build-server.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm
\ No newline at end of file
+cd ../../../
+docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm
+cd Docker/build/linux-git
diff --git a/Docker/build/linux-git/docker-build-services.sh b/Docker/build/linux-git/docker-build-services.sh
index 93f9be7..7fcaffd 100644
--- a/Docker/build/linux-git/docker-build-services.sh
+++ b/Docker/build/linux-git/docker-build-services.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm
\ No newline at end of file
+cd ../../../
+docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm
+cd Docker/build/linux-git
diff --git a/Docker/build/linux-git/docker-build-staticfilesserver.sh b/Docker/build/linux-git/docker-build-staticfilesserver.sh
index 3ec753c..f6db6d3 100644
--- a/Docker/build/linux-git/docker-build-staticfilesserver.sh
+++ b/Docker/build/linux-git/docker-build-staticfilesserver.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm
\ No newline at end of file
+cd ../../../
+docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm
+cd Docker/build/linux-git
diff --git a/Docker/build/linux-local/docker-build-authservice.sh b/Docker/build/linux-local/docker-build-authservice.sh
index 87859cd..387e88b 100644
--- a/Docker/build/linux-local/docker-build-authservice.sh
+++ b/Docker/build/linux-local/docker-build-authservice.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm
\ No newline at end of file
+cd ../../../
+docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm
+cd Docker/build/linux-local
diff --git a/Docker/build/linux-local/docker-build-server.sh b/Docker/build/linux-local/docker-build-server.sh
index 4c511aa..4914496 100644
--- a/Docker/build/linux-local/docker-build-server.sh
+++ b/Docker/build/linux-local/docker-build-server.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 cd ../../../
-docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer --no-cache --pull --force-rm
-cd Docker/build/linux-local
\ No newline at end of file
+docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer --no-cache --pull --force-rm
+cd Docker/build/linux-local
diff --git a/Docker/build/linux-local/docker-build-services.sh b/Docker/build/linux-local/docker-build-services.sh
index f5a7f5f..7e71f11 100644
--- a/Docker/build/linux-local/docker-build-services.sh
+++ b/Docker/build/linux-local/docker-build-services.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 cd ../../../
-docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices --no-cache --pull --force-rm
-cd Docker/build/linux-local
\ No newline at end of file
+docker build -t darkarchon/mare-synchronos-services:latest . -f Docker/build/Dockerfile-MareSynchronosServices --no-cache --pull --force-rm
+cd Docker/build/linux-local
diff --git a/Docker/build/linux-local/docker-build-staticfilesserver.sh b/Docker/build/linux-local/docker-build-staticfilesserver.sh
index 3881a83..16547ed 100644
--- a/Docker/build/linux-local/docker-build-staticfilesserver.sh
+++ b/Docker/build/linux-local/docker-build-staticfilesserver.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 cd ../../../
-docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm
-cd Docker/build/linux-local
\ No newline at end of file
+docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker/build/Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm
+cd Docker/build/linux-local