diff --git a/Dockerfile b/Dockerfile
index e56b81e33..99fe69839 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,14 @@ FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update && apt -y upgrade && apt install -y supervisor python3-pip ffmpeg imagemagick postgresql libpq-dev
+RUN apt update
+RUN apt -y upgrade
+RUN apt install -y supervisor 
+RUN apt install -y python3-pip
+RUN apt install -y ffmpeg
+RUN apt install -y imagemagick
+RUN apt install -y postgresql
+RUN apt install -y libpq-dev
 
 COPY supervisord.conf /etc/supervisord.conf
 
@@ -10,7 +17,13 @@ COPY requirements.txt /etc/requirements.txt
 
 RUN pip3 install -r /etc/requirements.txt
 
-RUN mkdir /images && mkdir /songs && mkdir /videos && mkdir /audio && mkdir /asset_submissions
+RUN mkdir /images
+RUN mkdir /songs
+RUN mkdir /videos
+RUN mkdir /audio
+RUN mkdir /asset_submissions
+RUN mkdir /asset_submissions/marseys
+RUN mkdir /asset_submissions/hats
 
 EXPOSE 80/tcp
 
diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh
index 00edf3db1..c14b73d7e 100644
--- a/ubuntu_setup.sh
+++ b/ubuntu_setup.sh
@@ -31,11 +31,15 @@ sudo cp nginx.txt /etc/nginx/sites-enabled/1
 psql -U postgres -f schema.sql postgres
 psql -U postgres -f seed-db.sql postgres
 pip3 install -r requirements.txt
-mkdir /songs
+
 mkdir /images
+mkdir /songs
 mkdir /videos
 mkdir /audio
 mkdir /asset_submissions
+mkdir /asset_submissions/marseys
+mkdir /asset_submissions/hats
+
 git config --global --add safe.directory /songs
 git config --global --add safe.directory /images
 git config --global --add safe.directory /videos