diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org
index bfe9b94b91..a5d351468d 100644
--- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org
+++ b/inventory/host_vars/branched-composer.phx2.fedoraproject.org
@@ -7,12 +7,3 @@ volgroup: /dev/vg_bvirthost08
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
 kojihub_scheme: https
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: root
-- service: bodhi
-  owner: root
-  group: masher
diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
index a0d17a6526..9cb3409b4d 100644
--- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
+++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
@@ -6,12 +6,3 @@ volgroup: /dev/vg_bvirthost06
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
 kojihub_scheme: https
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: root
-- service: bodhi
-  owner: root
-  group: masher
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index 237bbbc965..125179e154 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -108,7 +108,7 @@ DATABASES = {
 USE_X_FORWARDED_HOST = True
 # In the Fedora infra, requests are systematically redirected to HTTPS, so put
 # something always true here:
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', '{{ mailman_url }}')
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', 'lists.fedoraproject.org') # It's always that, even on staging
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
@@ -253,17 +253,17 @@ SOCIAL_AUTH_PIPELINE = (
 # https://github.com/twaddington/django-gravatar
 #
 # Gravatar base url.
-#GRAVATAR_URL = 'http://cdn.libravatar.org/'
+GRAVATAR_URL = 'http://cdn.libravatar.org/'
 # Gravatar base secure https url.
-#GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/'
+GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/'
 # Gravatar size in pixels.
 #GRAVATAR_DEFAULT_SIZE = '80'
 # An image url or one of the following: 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'.
-#GRAVATAR_DEFAULT_IMAGE = 'mm'
+GRAVATAR_DEFAULT_IMAGE = 'retro'
 # One of the following: 'g', 'pg', 'r', 'x'.
 #GRAVATAR_DEFAULT_RATING = 'g'
 # True to use https by default, False for plain http.
-#GRAVATAR_DEFAULT_SECURE = True
+GRAVATAR_DEFAULT_SECURE = True
 
 #
 # django-compressor