diff --git a/.gitignore b/.gitignore
index e7422567..7dee2450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,5 @@ dmypy.json
 
 docker-compose.override.yml
 dump.sql
-uploads
 
 .idea/
diff --git a/Dockerfile b/Dockerfile
index 93001ad9..b77c91ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,6 @@ COPY . /code/
 ARG COLLECT_STATIC
 RUN if [ "$COLLECT_STATIC" != "" ] ; then SECRET_KEY=ci ./manage.py collectstatic --noinput; fi
 
-RUN mkdir /code/uploads
 RUN useradd -u 5000 app && chown app:app /code && chown app:app /code/uploads
 USER app:app
 
diff --git a/uploads/.gitignore b/uploads/.gitignore
new file mode 100644
index 00000000..86d0cb27
--- /dev/null
+++ b/uploads/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file