diff --git a/roles/badges-frontend/files/tahrir.wsgi b/roles/badges-frontend/files/tahrir.wsgi
index 86033541c6..3bddd79e35 100644
--- a/roles/badges-frontend/files/tahrir.wsgi
+++ b/roles/badges-frontend/files/tahrir.wsgi
@@ -13,11 +13,4 @@ from pyramid.paster import get_app, setup_logging
 ini_path = '/etc/tahrir/tahrir.ini'
 setup_logging(ini_path)
 
-pyramid_app = get_app(ini_path, 'main')
-
-def reverse_proxy_handler(environ, start_response):
-    environ['HTTP_HOST'] = environ['HTTP_X_FORWARDED_HOST']
-    environ['wsgi.url_scheme'] = 'https'
-    return pyramid_app(environ, start_response)
-
-application = reverse_proxy_handler
+application = get_app(ini_path, 'main')
diff --git a/roles/badges-frontend/templates/tahrir.ini b/roles/badges-frontend/templates/tahrir.ini
index 17086243e9..ff3b774827 100644
--- a/roles/badges-frontend/templates/tahrir.ini
+++ b/roles/badges-frontend/templates/tahrir.ini
@@ -2,10 +2,17 @@
 pipeline =
     tahrir
 
+[filter:proxy-prefix]
+use = egg:PasteDeploy#prefix
+prefix = /badges
+scheme = https
+
 [app:tahrir]
 
 use = egg:tahrir
 
+filter-with = proxy-prefix
+
 #pyramid.reload_templates = true
 pyramid.default_locale_name = en
 pyramid.includes =