diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index f7d6f6a408..21f2ec5156 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -928,7 +928,7 @@
     when: env == "staging"
 
   - role: httpd/reverseproxy
-    website: openscanhub.stg.fedoraproject.org
+    website: "openscanhub{{ env_suffix }}.fedoraproject.org"
     destname: openscanhub
     balancer_name: apps-ocp
     balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
@@ -936,4 +936,3 @@
     keephost: true
     ocp4: true
     tags: openscanhub
-    when: env == "staging"
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 7682eafe5b..9dbd72ee70 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -1187,10 +1187,9 @@
     - discussion
 
   - role: httpd/website
-    site_name: openscanhub.stg.fedoraproject.org
+    site_name: "openscanhub{{ env_suffix }}.fedoraproject.org"
     ssl: true
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
-    when: env == "staging"
     tags:
     - openscanhub