diff --git a/roles/bodhi2/base/templates/bodhi-app.conf b/roles/bodhi2/base/templates/bodhi-app.conf
index 5f18a6d210..c21caa29ec 100644
--- a/roles/bodhi2/base/templates/bodhi-app.conf
+++ b/roles/bodhi2/base/templates/bodhi-app.conf
@@ -5,6 +5,15 @@ Alias /static /usr/lib/python2.7/site-packages/bodhi/static/
     Header set Access-Control-Allow-Origin "*"
 </FilesMatch>
 
+<filesmatch ".(gif|jpe?g|png|css|js|eot|ttf|otf|woff)$">
+   Header unset Cache-Control
+   # For now, we have the cache expiry set to 1 hour while we do rapid development.
+   Header add Cache-Control "max-age=3600"
+   # Eventually, we want to scale this back to a much longer time frame when things stabilize...
+   #Header add Cache-Control "max-age=2592000"
+</filesmatch>
+
+
 WSGIDaemonProcess bodhi user=bodhi group=bodhi display-name=bodhi processes={{wsgi_procs}} threads={{wsgi_threads}}
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout On