diff --git a/docker/Dockerfile b/docker/Dockerfile
index ea70d9f994..5c5d1dc32a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,9 +41,10 @@ LABEL org.label-schema.schema-version="1.0" \
 
 # Create user account
 RUN addgroup -S inventreegroup && adduser -S inventree -G inventreegroup
+
 WORKDIR ${INVENTREE_HOME}
 
-RUN mkdir ${INVENTREE_STATIC_ROOT}
+RUN mkdir -p ${INVENTREE_STATIC_ROOT}
 
 # Install required system packages
 RUN apk add --no-cache git make bash \
diff --git a/docker/start_dev_server.sh b/docker/start_dev_server.sh
index 0c1564076a..d4e33a79a5 100644
--- a/docker/start_dev_server.sh
+++ b/docker/start_dev_server.sh
@@ -3,12 +3,12 @@
 # Create required directory structure (if it does not already exist)
 if [[ ! -d "$INVENTREE_STATIC_ROOT" ]]; then
     echo "Creating directory $INVENTREE_STATIC_ROOT"
-    mkdir $INVENTREE_STATIC_ROOT
+    mkdir -p $INVENTREE_STATIC_ROOT
 fi
 
 if [[ ! -d "$INVENTREE_MEDIA_ROOT" ]]; then
     echo "Creating directory $INVENTREE_MEDIA_ROOT"
-    mkdir $INVENTREE_MEDIA_ROOT
+    mkdir -p $INVENTREE_MEDIA_ROOT
 fi
 
 # Check if "config.yaml" has been copied into the correct location
diff --git a/docker/start_prod_server.sh b/docker/start_prod_server.sh
index 2767e844d6..2e5acb5c9d 100644
--- a/docker/start_prod_server.sh
+++ b/docker/start_prod_server.sh
@@ -3,12 +3,12 @@
 # Create required directory structure (if it does not already exist)
 if [[ ! -d "$INVENTREE_STATIC_ROOT" ]]; then
     echo "Creating directory $INVENTREE_STATIC_ROOT"
-    mkdir $INVENTREE_STATIC_ROOT
+    mkdir -p $INVENTREE_STATIC_ROOT
 fi
 
 if [[ ! -d "$INVENTREE_MEDIA_ROOT" ]]; then
     echo "Creating directory $INVENTREE_MEDIA_ROOT"
-    mkdir $INVENTREE_MEDIA_ROOT
+    mkdir -p $INVENTREE_MEDIA_ROOT
 fi
 
 # Check if "config.yaml" has been copied into the correct location