diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index e3de581376..2f5afdabe0 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -614,6 +614,12 @@
     proxyurl: http://localhost:10064
     keephost: true
 
+  - role: httpd/reverseproxy
+    website: app.os.fedoraproject.org
+    destname: app.os
+    proxyurl: http://localhost:10065
+    keephost: true
+
   - 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 25713e8b64..983f220eb0 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -562,6 +562,12 @@
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
+  - role: httpd/website
+    name: app.os.fedoraproject.org
+    server_aliases: ["*.app.os.fedoraproject.org", "*.app.os.stg.fedoraproject.org"]
+    sslonly: true
+    cert_name: "{{wildcard_cert_name}}"
+
   - role: httpd/website
     name: registry.fedoraproject.org
     server_aliases: [registry.stg.fedoraproject.org]
diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg
index f751f8dcd2..c6ffbcd9cb 100644
--- a/roles/haproxy/templates/haproxy.cfg
+++ b/roles/haproxy/templates/haproxy.cfg
@@ -431,8 +431,14 @@ listen  mbs 0.0.0.0:10063
 listen  os-master 0.0.0.0:10064
     balance hdr(appserver)
     server os-master01 os-master01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
-    server os-master01 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
-    server os-master01 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
+    server os-master02 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
+    server os-master03 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
+    option  httpchk GET /
+
+listen  os-master 0.0.0.0:10065
+    balance hdr(appserver)
+    server os-node01 os-node01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
+    server os-node02 os-node02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
     option  httpchk GET /
 {% endif %}