diff --git a/Dockerfile b/Dockerfile
index 58ec6e1..de56e01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,21 +23,22 @@ RUN chmod +x /var/www/html/docker-utils/install-composer && \
     ./composer.phar update && \
     chmod +x /var/www/html/docker-utils/init-server
 
+# Create a default copy of content and theme in case of empty directories binding
+RUN mkdir -p /var/www/html/content.default/ && \
+    cp -R /var/www/html/content/* /var/www/html/content.default/ && \
+    mkdir -p /var/www/html/themes.default/ && \
+    cp -R /var/www/html/themes/* /var/www/html/themes.default/ && \
+    mkdir -p /var/www/html/media.default/ && \
+    cp -R /var/www/html/media/* /var/www/html/media.default/
+
 # Expose useful volumes (see documentation)
 VOLUME /var/www/html/settings
 VOLUME /var/www/html/media
 VOLUME /var/www/html/cache
 VOLUME /var/www/html/plugins
 VOLUME /var/www/html/data
-
-# Create a default copy of content and theme in case of empty directories binding
-RUN mkdir -p /var/www/html/content.default/ && \
-    cp -R /var/www/html/content/* /var/www/html/content.default/ && \
-    mkdir -p /var/www/html/themes.default/ && \
-    cp -R /var/www/html/themes/* /var/www/html/themes.default/
-
 VOLUME /var/www/html/content
 VOLUME /var/www/html/themes
 
-# Inject default values if content and themes are mounted with empty directories, adjust rights and start the server
+# Inject default values for persistant data and start the server
 CMD ["/var/www/html/docker-utils/init-server"]
\ No newline at end of file
diff --git a/docker-utils/init-server b/docker-utils/init-server
index f3bacd9..2320690 100644
--- a/docker-utils/init-server
+++ b/docker-utils/init-server
@@ -1,5 +1,12 @@
 #!/bin/sh
+
+# mount data from persistant storage if not empty
 find /var/www/html/content -type d -empty -exec cp -R /var/www/html/content.default/* /var/www/html/content \;
 find /var/www/html/themes -type d -empty -exec cp -R /var/www/html/themes.default/* /var/www/html/themes \;
+find /var/www/html/media -type d -empty -exec cp -R /var/www/html/media.default/* /var/www/html/media \;
+
+# Fix ownership (in case of new folders)
 chown -R www-data:www-data /var/www/html/
-apache2-foreground
\ No newline at end of file
+
+# Start Apache in foreground
+exec apache2-foreground
\ No newline at end of file