diff --git a/Dockerfile b/Dockerfile
index c07adc28..e327c092 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -78,4 +78,13 @@ COPY docker/docker-entrypoint.sh docker-entrypoint.sh
 COPY docker/config/shlink_in_docker.local.php config/autoload/shlink_in_docker.local.php
 COPY docker/config/php.ini ${PHP_INI_DIR}/conf.d/
 
+# Change the ownership of /etc/shlink/data to be writable, then change the user to non-root
+RUN chown 1001 /etc/shlink/data
+RUN chown 1001 /etc/shlink/data/locks
+RUN chown 1001 /etc/shlink/data/proxies
+RUN chown 1001 /etc/shlink/data/cache
+RUN chown 1001 /etc/shlink/data/log
+
+USER 1001
+
 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]