diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index cf79f09..3d2bd7a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -19,10 +19,11 @@ jobs:
           script: |
             export PATH=$PATH:/usr/local/bin:/opt/homebrew/bin:$HOME/.docker/bin
             cd /tmp
-            rm -rf a301-server
-            git clone https://tolelom:${{ secrets.GIT_TOKEN }}@git.tolelom.xyz/A301/a301_server.git a301-server
-            cd a301-server
-            docker build --no-cache -t a301-server:latest .
+            rm -rf a301-build
+            mkdir a301-build && cd a301-build
+            git clone https://tolelom:${{ secrets.GIT_TOKEN }}@git.tolelom.xyz/A301/a301_server.git a301_server
+            git clone https://tolelom:${{ secrets.GIT_TOKEN }}@git.tolelom.xyz/A301/tolchain.git tolchain
+            docker build --no-cache -t a301-server:latest -f a301_server/Dockerfile .
             cd ~/server
             docker compose up -d --force-recreate a301-server
-            rm -rf /tmp/a301-server
+            rm -rf /tmp/a301-build
diff --git a/Dockerfile b/Dockerfile
index edad079..360494c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 # Stage 1: Build
 FROM golang:alpine AS builder
-WORKDIR /app
-COPY go.mod go.sum ./
+WORKDIR /build
+COPY tolchain/ ./tolchain/
+COPY a301_server/ ./a301_server/
+WORKDIR /build/a301_server
 RUN go mod download
-COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -o server .
 
 # Stage 2: Run
@@ -11,6 +12,6 @@ FROM alpine:latest
 RUN apk --no-cache add tzdata ca-certificates
 RUN mkdir -p /data/game
 WORKDIR /app
-COPY --from=builder /app/server .
+COPY --from=builder /build/a301_server/server .
 EXPOSE 8080
 CMD ["./server"]