diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.blockerbugs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.blockerbugs.conf
new file mode 100644
index 0000000000..ee26261dfd
--- /dev/null
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.blockerbugs.conf
@@ -0,0 +1,5 @@
+{% if 'iad2' in inventory_hostname %}
+{% include "reversepassproxy.conf" %}
+{% else %}
+Redirect 421 /
+{% endif %}
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf
deleted file mode 100644
index 2b1e505a06..0000000000
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-ProxyPass {{localpath}} {{proxyurl}}{{remotepath}}
-ProxyPassReverse {{localpath}} {{proxyurl}}{{remotepath}}
-ProxyPreserveHost on
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.sticky-notes.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.sticky-notes.conf
deleted file mode 100644
index ada5bd3518..0000000000
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.sticky-notes.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<Location /394536/>
-    require all denied
-</Location>
-
-{% if header_scheme %}
-RequestHeader set X-Forwarded-Scheme https early
-RequestHeader set X-Scheme https early
-RequestHeader set X-Forwarded-Proto https early
-
-{% endif %}
-{% if header_expect %}
-RequestHeader unset Expect early
-
-{% endif %}
-{% if keephost %}
-ProxyPreserveHost On
-{% endif %}
-
-ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
-ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}