diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d579286ac6..58ac5ece9f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -61,6 +61,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # Use Github Cache BAckend 
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index f3cc8241ef..d7f95e1b1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,18 +4,22 @@ RUN apk update && apk add git \
 	# pillow dependencies
 	jpeg-dev zlib-dev && \
 	adduser -D -h /home/modmail -g 'Modmail' modmail
+
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-USER modmail
+
 WORKDIR /home/modmail
 
 FROM base as poetry
 
-RUN pip install -U poetry
-COPY poetry.lock pyproject.toml /home/modmail/
+RUN apk add build-base && \
+	pip install -U poetry
+COPY --chown=modmail:modmail poetry.lock pyproject.toml /home/modmail/
 RUN python -m poetry export -o requirements.txt
 
 FROM base as deps
 
+USER modmail
+
 COPY --from=poetry /home/modmail/requirements.txt /home/modmail/
 
 RUN pip install -r requirements.txt --user