diff --git a/puppet/files/apache/treeherder-service.conf b/puppet/files/apache/treeherder-service.conf
index 7e364e2f7..29303a92a 100644
--- a/puppet/files/apache/treeherder-service.conf
+++ b/puppet/files/apache/treeherder-service.conf
@@ -48,7 +48,14 @@
 
   Alias /icons /home/<%= @APP_USER %>/treeherder-ui/<%= @APP_UI %>/icons
   ProxyPass        /icons !
-  ############
+
+  ###############
+  # Serve static and media files
+  ###############
+  Alias /static /home/<%= @APP_USER %>/treeherder-service/treeherder/webapp/static
+  ProxyPass        /static !
+  Alias /media /home/<%= @APP_USER %>/treeherder-service/treeherder/webapp/media
+  ProxyPass        /media !
 
   Alias / /home/<%= @APP_USER %>/treeherder-ui/<%= @APP_UI %>/index.html