diff --git a/Dockerfile b/Dockerfile
index c905115..6028c36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,10 +51,17 @@ USER pleroma
 WORKDIR /home/pleroma
 
 # Get pleroma sources
+#
+# Also make sure that instance/static/emoji exists.
+# Pleroma does not ship with an `instance` folder by default, causing docker to create `instance/static` for us at launch.
+# In itself that wouldn't be much of an issue, but said folder(s) are created as root:pleroma with 2755.
+# This breaks the custom.d step in entrypoint.sh which relies on writing there (See #10).
+#
 ARG PLEROMA_GIT_REPO
 RUN \
     echo "#> Getting pleroma sources from $PLEROMA_GIT_REPO..." 1>&2 && \
-    git clone --progress $PLEROMA_GIT_REPO ./pleroma
+    git clone --progress $PLEROMA_GIT_REPO ./pleroma && \
+    mkdir -p ./pleroma/instance/static/emoji
 
 WORKDIR /home/pleroma/pleroma