diff --git a/manifests/init.pp b/manifests/init.pp
index 325d49a..b5f702c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,7 +35,18 @@ class apps_site (
   }
 
   httpd_mod { 'headers':
-    ensure => present
+    ensure => present,
+    notify => Service['httpd']
+  }
+
+  httpd_mod { 'rewrite':
+    ensure => present,
+    notify => Service['httpd']
+  }
+
+  httpd_mod { 'deflate':
+    ensure => present,
+    notify => Service['httpd']
   }
 
   if ! defined(Package['python-yaml']) {
@@ -44,6 +55,12 @@ class apps_site (
     }
   }
 
+  if ! defined(Package['zopfli']) {
+    package { 'zopfli':
+      ensure => present,
+    }
+  }
+
   file { "${root_dir}/openstack_catalog/web/api":
     ensure => directory,
   }
@@ -53,7 +70,7 @@ class apps_site (
   }
 
   exec { 'make_assets_json' :
-    command     => "python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout)' < ${root_dir}/openstack_catalog/web/static/assets.yaml > ${root_dir}/openstack_catalog/web/api/v1/assets",
+    command     => "${root_dir}/tools/update_assets.sh",
     path        => '/usr/local/bin:/usr/bin:/bin',
     refreshonly => true,
     subscribe   => Vcsrepo[$root_dir],
diff --git a/templates/vhost.erb b/templates/vhost.erb
index 3aad69c..e4e2a20 100644
--- a/templates/vhost.erb
+++ b/templates/vhost.erb
@@ -11,9 +11,26 @@
         Allow from all
         Satisfy Any
     </Directory>
-    <Directory <%= @docroot %>/static/>
+    <Location "/api/v1/assets">
         Header set Access-Control-Allow-Origin "*"
-    </Directory>
+        Header set Content-type "application/json"
+        Header set Access-Control-Allow-Headers "Origin, Accept-Encoding, Content-Type, X-App-Catalog-Versions"
+        Header set Access-Control-Max-Age 3600
+        Header set Cache-Control max-age=3600
+        Header set Access-Control-Allow-Methods "GET, OPTIONS"
+        SetOutputFilter DEFLATE
+    </Location>
+
+    RewriteEngine On
+
+    RewriteRule "^/api/v1/assets\.gz$" "-" [T=application/json,E=no-gzip:1]
+
+    RewriteCond %{REQUEST_METHOD} OPTIONS
+    RewriteRule ^(/api/v1/assets)$ /static/blank.json [QSA,L]
+
+    RewriteCond "%{HTTP:Accept-Encoding}" "gzip"
+    RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+    RewriteRule "^(/api/v1/assets)" "$1\.gz" [QSA]
 
     ErrorLog /var/log/apache2/app_site-error.log