diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index f1a2ab04e8..a3994237fb 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -271,6 +271,7 @@
   - role: httpd/reverseproxy
     website: bodhi.fedoraproject.org
     destname: bodhi
+    # haproxy entry for os-nodes-frontend
     proxyurl: http://localhost:10065
     keephost: true
     tags: bodhi
@@ -693,6 +694,22 @@
     tags:
     - freshmaker
 
+  - role: httpd/reverseproxy
+    website: greenwave.fedoraproject.org
+    destname: greenwave
+    # haproxy entry for os-nodes-frontend
+    proxyurl: http://localhost:10065
+    keephost: true
+    tags: greenwave
+
+  - role: httpd/reverseproxy
+    website: waiverdb.fedoraproject.org
+    destname: waiverdb
+    # haproxy entry for os-nodes-frontend
+    proxyurl: http://localhost:10065
+    keephost: true
+    tags: waiverdb
+
   - role: httpd/reverseproxy
     website: data-analysis.fedoraproject.org
     destname: awstats
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index e91edcb69e..8fbbef1e40 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -835,6 +835,18 @@
     cert_name: "{{wildcard_cert_name}}"
     tags: freshmaker
 
+  - role: httpd/website
+    site_name: greenwave.fedoraproject.org
+    sslonly: true
+    server_aliases: [greenwave.stg.fedoraproject.org]
+    cert_name: "{{wildcard_cert_name}}"
+
+  - role: httpd/website
+    site_name: waiverdb.fedoraproject.org
+    sslonly: true
+    server_aliases: [waiverdb.stg.fedoraproject.org]
+    cert_name: "{{wildcard_cert_name}}"
+
 # fedorahosted is retired. We have the site here so we can redirect it.
 
   - role: httpd/website
diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index a3729e7cd6..1ea279ec1d 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -62,6 +62,13 @@
     app: greenwave
     file: service.yml
     objectname: service.yml
+  - role: openshift/route
+    app: greenwave
+    routename: web-pretty
+    host: "greenwave{{ env_suffix }}.fedoraproject.org"
+    serviceport: web
+    servicename: greenwave-web
+  # TODO -- someday retire this old route in favor of the pretty one above.
   - role: openshift/object
     app: greenwave
     file: route.yml
diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml
index 65aa484880..89298697e9 100644
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@@ -72,6 +72,13 @@
     app: waiverdb
     file: service.yml
     objectname: service.yml
+  - role: openshift/route
+    app: waiverdb
+    routename: web-pretty
+    host: "waiverdb{{ env_suffix }}.fedoraproject.org"
+    serviceport: web
+    servicename: waiverdb-web
+  # TODO -- someday retire this old route in favor of the pretty one above.
   - role: openshift/object
     app: waiverdb
     file: route.yml