diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 28796f9644..9ef464ebb5 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -605,12 +605,16 @@
     destname: os
     proxyurl: http://localhost:10064
     keephost: true
+    tags:
+    - os.fedoraproject.org
 
   - role: httpd/reverseproxy
     website: app.os.fedoraproject.org
     destname: app.os
     proxyurl: http://localhost:10065
     keephost: true
+    tags:
+    - app.os.fedoraproject.org
 
   - role: httpd/reverseproxy
     website: data-analysis.fedoraproject.org
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 76846c4325..ddaa4a0432 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -560,7 +560,7 @@
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
     tags:
-    - openshift
+    - os.fedoraproject.org
 
   - role: httpd/website
     name: app.os.fedoraproject.org
@@ -569,7 +569,7 @@
     cert_name: "{{os_wildcard_cert_name}}"
     SSLCertificateChainFile: "{{os_wildcard_int_file}}"
     tags:
-    - openshift
+    - app.os.fedoraproject.org
 
   - role: httpd/website
     name: registry.fedoraproject.org