diff --git a/.dockerignore b/.dockerignore
index 74003e7e30..a3de147db4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -138,11 +138,15 @@ temp/
 test.py
 
 # Other stuff
+.dockerignore
 .env.example
+.git/
 .gitignore
 .github/
 app.json
 CHANGELOG.md
+Dockerfile
+docker-compose.yml
 Procfile
 pyproject.toml
 README.md
diff --git a/Dockerfile b/Dockerfile
index 3c88a0e7ca..96a398fad4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,18 @@ FROM python:3.10 as py
 FROM py as build
 
 RUN apt update && apt install -y g++ git
+
 COPY requirements.txt /
 RUN pip install --prefix=/inst -U -r /requirements.txt
 
 FROM py
 
-ENV USING_DOCKER yes
 COPY --from=build /inst /usr/local
 
+ENV USING_DOCKER yes
+RUN useradd --system --no-create-home modmail
+USER modmail
+
 WORKDIR /modmailbot
 CMD ["python", "bot.py"]
-COPY . /modmailbot
+COPY --chown=modmail:modmail . /modmailbot