diff --git a/docker-compose.yml.tmpl b/docker-compose.yml.tmpl
index 431255bda..0c9f7cc64 100644
--- a/docker-compose.yml.tmpl
+++ b/docker-compose.yml.tmpl
@@ -71,6 +71,7 @@ services:
       - /home/${USER}/screenly_assets:/data/screenly_assets
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+      - /usr/share/fonts:/usr/share/fonts:ro
     labels:
       io.balena.features.supervisor-api: '1'
 
diff --git a/docker/Dockerfile.viewer.j2 b/docker/Dockerfile.viewer.j2
index 38a0b400d..fab511b8e 100644
--- a/docker/Dockerfile.viewer.j2
+++ b/docker/Dockerfile.viewer.j2
@@ -87,4 +87,8 @@ WORKDIR /usr/src/app
 RUN mkdir -p /usr/src/app
 COPY . /usr/src/app/
 
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
 CMD ["bash", "./bin/start_viewer.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 000000000..5ea475a89
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Rebuild the font cache with fonts from host OS 
+fc-cache -f -v
+exec "$@"