diff --git a/Dockerfile b/Dockerfile
index ecb3f7103f..3bfe23b6cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,8 +81,7 @@ COPY --chown=www-data:www-data docker/database.docker.sqlite3.yml config/databas
 RUN mkdir -p /var/www
 
 # Fix permissions
-RUN chown www-data:www-data config/initializers public sqlite3-db /var/www
-RUN chown -R www-data:www-data config public/api
+RUN chown -R www-data:www-data /var/www config docker db/schema.rb public solr sqlite3-db
 RUN chmod -R 755 docker/upgrade.sh docker/start_workers.sh
 
 # Python dependencies from requirements.txt
diff --git a/docker/shared_functions.sh b/docker/shared_functions.sh
index f28b39c1b3..5a91e3c591 100644
--- a/docker/shared_functions.sh
+++ b/docker/shared_functions.sh
@@ -8,7 +8,7 @@ function wait_for_mysql {
 }
 
 function wait_for_database {
-    while ! mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST -e "desc $MYSQL_DATABASE.users" > /dev/null
+    while ! mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST -e "desc $MYSQL_DATABASE.users" > /dev/null 2>&1
     do
             echo "WAITING FOR DATABASE"
             sleep 2