diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile
index c55c358..eede4be 100644
--- a/tutor/templates/build/openedx/Dockerfile
+++ b/tutor/templates/build/openedx/Dockerfile
@@ -80,6 +80,9 @@ COPY ./themes/ /openedx/themes/
 RUN openedx-assets themes \
     && openedx-assets collect --settings=tutor.assets
 
+# Create a data directory, which might be used (or not)
+RUN mkdir /openedx/data
+
 # service variant is "lms" or "cms"
 ENV SERVICE_VARIANT lms
 ENV SETTINGS tutor.production
diff --git a/tutor/templates/build/xqueue/Dockerfile b/tutor/templates/build/xqueue/Dockerfile
index 845ab04..1c492ed 100644
--- a/tutor/templates/build/xqueue/Dockerfile
+++ b/tutor/templates/build/xqueue/Dockerfile
@@ -5,7 +5,7 @@ RUN apt update && \
   apt upgrade -y && \
   apt install -y language-pack-en git python-pip libmysqlclient-dev
 
-RUN mkdir /openedx
+RUN mkdir /openedx /openedx/data
 RUN git clone https://github.com/edx/xqueue --branch open-release/ironwood.2 --depth 1 /openedx/xqueue
 WORKDIR /openedx/xqueue