diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml
index d9b021be00..a9e4586214 100644
--- a/playbooks/groups/freshmaker.yml
+++ b/playbooks/groups/freshmaker.yml
@@ -61,7 +61,7 @@
   - role: freshmaker/frontend
     # TLS is terminated for us at the proxy layer (like for every other app).
     freshmaker_force_ssl: False
-    freshmaker_servername: freshmaker{{env_suffix}}.fedoraproject.org
+    freshmaker_servername: {{inventory_hostname}}
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2 b/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
index 3885635a9c..5ac8340005 100644
--- a/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
+++ b/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
@@ -8,13 +8,13 @@ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
 WSGIDaemonProcess freshmaker user=fedmsg group=fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}} home=/usr/share/freshmaker
 WSGIScriptAlias /{{ freshmaker_endpoint }} /usr/share/freshmaker/freshmaker.wsgi
 
-##{% if freshmaker_servername != inventory_hostname %}
-### Redirect from the hostname of this machine to user-visible hostname.
-##RewriteEngine On
-##<If "%{HTTP_HOST} == '{{ inventory_hostname }}'">
-##RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L]
-##</If>
-##{% endif %}
+{% if freshmaker_servername != inventory_hostname %}
+# Redirect from the hostname of this machine to user-visible hostname.
+RewriteEngine On
+<If "%{HTTP_HOST} == '{{ inventory_hostname }}'">
+RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L]
+</If>
+{% endif %}
 
 {% if env == 'staging' %}
 OIDCOAuthClientID {{ freshmaker_stg_oidc_client_id }}