diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 448babcc31..9d08869db3 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -7,7 +7,7 @@ on: ["push", "pull_request"]
 jobs:
   
   docker:
-    runs-on: ubtun-latest
+    runs-on: ubtunu-latest
 
     steps:
       - uses: actions/checkout@v2
diff --git a/docker/Dockerfile b/docker/Dockerfile
index da0ddebf39..d2301e66fb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,6 +40,9 @@ RUN python -m venv $INVENTREE_VENV && pip install --no-cache-dir -U -r $INVENTRE
 # Install supervisor
 RUN apt add --no-cache supervisor
 
+# Create required directories
+RUN mkdir /home/inventree/media /home/inventree/static /home/inventree/log /home/inventree/backup
+
 # Copy supervisor file
 COPY deploy/inventree.conf /etc/supervisor/conf.d/inventree.conf