diff --git a/roles/openshift-apps/openscanhub/templates/osh-hub-httpd.conf b/roles/openshift-apps/openscanhub/templates/osh-hub-httpd.conf
index 023c7edd35..6b5eb0c63f 100644
--- a/roles/openshift-apps/openscanhub/templates/osh-hub-httpd.conf
+++ b/roles/openshift-apps/openscanhub/templates/osh-hub-httpd.conf
@@ -1,5 +1,4 @@
-# TODO: Set a servername for staging and production servers.
-# ServerName *
+ServerName openscanhub{{ env_suffix }}.fedoraproject.org
 WSGISocketPrefix /var/run/wsgi
 
 # LoadModule dumpio_module modules/mod_dumpio.so
@@ -14,7 +13,7 @@ LogLevel debug
 
 <VirtualHost *:8080>
     # ServerAlias *
-    ServerAlias openscanhub{{ env_suffix }}.fedoraproject.org
+    # ServerAlias openscanhub{{ env_suffix }}.fedoraproject.org
     # WSGI handler
     # WSGIDaemonProcess osh display-name=%{GROUP} locale='C.UTF-8'
     # WSGIProcessGroup osh