diff --git a/files/copr/fe/copr.conf b/files/copr/fe/copr.conf
index 22899acf9a..20e1b9165f 100644
--- a/files/copr/fe/copr.conf
+++ b/files/copr/fe/copr.conf
@@ -31,3 +31,5 @@ WTF_CSRF_ENABLED = True
 
 # send emails when user's perms change in project?
 SEND_EMAILS = True
+
+PUBLIC_COPR_HOSTNAME = '{{ copr_frontend_public_hostname }}'
diff --git a/inventory/group_vars/copr-front b/inventory/group_vars/copr-front
index bc4f985c5b..7dcfcd7661 100644
--- a/inventory/group_vars/copr-front
+++ b/inventory/group_vars/copr-front
@@ -1,2 +1,3 @@
 ---
 copr_hostname: "copr-fe.cloud.fedoraproject.org"
+copr_frontend_public_hostname: "copr.fedoraproject.org"
diff --git a/inventory/group_vars/copr-front-stg b/inventory/group_vars/copr-front-stg
index ed97d539c0..835a21a409 100644
--- a/inventory/group_vars/copr-front-stg
+++ b/inventory/group_vars/copr-front-stg
@@ -1 +1,2 @@
 ---
+copr_frontend_public_hostname: "copr-fe-dev.cloud.fedoraproject.org"
diff --git a/roles/copr/backend/templates/copr-be.conf b/roles/copr/backend/templates/copr-be.conf
index 30aa2368de..1e2785b790 100644
--- a/roles/copr/backend/templates/copr-be.conf
+++ b/roles/copr/backend/templates/copr-be.conf
@@ -6,8 +6,9 @@ results_baseurl=https://copr-be.cloud.fedoraproject.org/results
 
 # ??? What is this
 # default is http://coprs/rest/api
-#frontend_url=http://copr-fe.cloud.fedoraproject.org/backend
-frontend_url=https://172.16.5.31/backend
+frontend_url=http://copr-fe.cloud.fedoraproject.org/backend
+#frontend_url=https://172.16.5.31/backend
+frontend_base_url=http://copr-fe.cloud.fedoraproject.org
 
 # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf
 # default is PASSWORDHERE but you really should change it. really.
diff --git a/roles/copr/backend/templates/copr-be.conf-dev b/roles/copr/backend/templates/copr-be.conf-dev
index 705dcad18a..5bf5766c17 100644
--- a/roles/copr/backend/templates/copr-be.conf-dev
+++ b/roles/copr/backend/templates/copr-be.conf-dev
@@ -7,6 +7,7 @@ results_baseurl=http://copr-be-dev.cloud.fedoraproject.org/results
 # ??? What is this
 # default is http://coprs/rest/api
 frontend_url=http://copr-fe-dev.cloud.fedoraproject.org/backend
+frontend_base_url=http://copr-fe-dev.cloud.fedoraproject.org
 
 # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf
 # default is PASSWORDHERE but you really should change it. really.
diff --git a/roles/copr/frontend/templates/copr.conf b/roles/copr/frontend/templates/copr.conf
index 22899acf9a..c96f1a2224 100644
--- a/roles/copr/frontend/templates/copr.conf
+++ b/roles/copr/frontend/templates/copr.conf
@@ -31,3 +31,5 @@ WTF_CSRF_ENABLED = True
 
 # send emails when user's perms change in project?
 SEND_EMAILS = True
+
+PUBLIC_COPR_HOSTNAME = "copr.fedoraproject.org"