diff --git a/roles/openshift-apps/maubot/files/deploymentconfig.yml b/roles/openshift-apps/maubot/files/deploymentconfig.yml
index 4038f91ea1..9f81e805c2 100644
--- a/roles/openshift-apps/maubot/files/deploymentconfig.yml
+++ b/roles/openshift-apps/maubot/files/deploymentconfig.yml
@@ -26,6 +26,13 @@ spec:
         app: maubot
         deploymentconfig: maubot
     spec:
+      initContainers:
+        - image: maubot:latest
+          volumeMounts:
+            - name: maubot-storage
+              mountPath: /maubot
+          command:
+            - mkdir -p /maubot/plugins /maubot/trash /maubot/logs /maubot/crypto
       containers:
         - name: maubot
           image: maubot:latest
diff --git a/roles/openshift-apps/maubot/templates/buildconfig.yml b/roles/openshift-apps/maubot/templates/buildconfig.yml
index a5dfb937bf..76b44ae04a 100644
--- a/roles/openshift-apps/maubot/templates/buildconfig.yml
+++ b/roles/openshift-apps/maubot/templates/buildconfig.yml
@@ -12,7 +12,6 @@ spec:
   source:
     dockerfile: |-
       FROM fedora:38
-      RUN mkdir -p /maubot/plugins /maubot/trash /maubot/logs /maubot/crypto
       RUN dnf -y install python3-pip && dnf -y clean all
       RUN pip install maubot[encryption]
       WORKDIR /maubot