diff --git a/Dockerfile b/Dockerfile
index d96fd01..82576c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,13 @@ COPY configuration/configuration.py /etc/netbox/config/configuration.py
 
 WORKDIR /opt/netbox/netbox
 
+# Must set permissions for '/opt/netbox/netbox/static' directory
+# to g+w so that `./manage.py collectstatic` can be executed during
+# container startup.
+# Must set permissions for '/opt/netbox/netbox/media' directory
+# to g+w so that pictures can be uploaded to netbox.
+RUN mkdir static && chmod g+w static media
+
 ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ]
 
 CMD ["gunicorn", "-c /etc/netbox/config/gunicorn_config.py", "netbox.wsgi"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 12ee36f..e4961d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     - redis
     - netbox-worker
     env_file: env/netbox.env
+    user: '101'
     volumes:
     - ./startup_scripts:/opt/netbox/startup_scripts:z,ro
     - ./initializers:/opt/netbox/initializers:z,ro
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 0c8d2a1..8b7481e 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+umask 002
 
 # wait shortly and then run db migrations (retry on error)
 while ! ./manage.py migrate 2>&1; do