diff --git a/.gitignore b/.gitignore
index 07c7cdd..a709ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 /logs/
 /files/
 /ssl/
-/server-configs/
\ No newline at end of file
+/server-configs/
+/org_img/
+/custom_img/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 659aad2..e2eb4c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,8 @@ services:
       - "./logs/:/var/www/MISP/app/tmp/logs/"
       - "./files/:/var/www/MISP/app/files"
       - "./ssl/:/etc/nginx/certs"
+      - "./org_img/:/var/www/MISP/app/webroot/img/orgs"
+      - "./custom_img/:/var/www/MISP/app/webroot/img/custom"
 #      - "./examples/custom-entrypoint.sh:/custom-entrypoint.sh" # Use the example custom-entrypoint.sh
     environment:
       - "HOSTNAME=https://localhost"
diff --git a/server/Dockerfile b/server/Dockerfile
index 3c1aa07..a56f507 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -151,6 +151,8 @@ ARG PHP_VER
 # Make a copy of the file store, so we can sync from it
     RUN cp -R /var/www/MISP/app/files /var/www/MISP/app/files.dist
 
+    RUN cp -R /var/www/MISP/app/webroot/img/orgs /var/www/MISP/app/webroot/img/orgs.dist
+
 # Make a copy of the configurations, so we can sync from it
     RUN cp -R /var/www/MISP/app/Config /var/www/MISP/app/Config.dist
 
diff --git a/server/files/entrypoint_nginx.sh b/server/files/entrypoint_nginx.sh
index 6bb0495..43c7080 100755
--- a/server/files/entrypoint_nginx.sh
+++ b/server/files/entrypoint_nginx.sh
@@ -104,6 +104,7 @@ sync_files(){
     for DIR in $(ls /var/www/MISP/app/files.dist); do
         rsync -azh --delete "/var/www/MISP/app/files.dist/$DIR" "/var/www/MISP/app/files/"
     done
+    rsync -azh "/var/www/MISP/app/webroot/img/orgs.dist/" "/var/www/MISP/app/webroot/img/orgs"
 }
 
 # Ensure SSL certs are where we expect them, for backward comparibility See issue #53