diff --git a/src/reverseproxy.js b/src/reverseproxy.js
index c17175dc9..6fa543d1c 100644
--- a/src/reverseproxy.js
+++ b/src/reverseproxy.js
@@ -549,16 +549,9 @@ async function writeAppRedirectNginxConfig(app, fqdn, bundle) {
 async function writeAppConfig(app) {
     assert.strictEqual(typeof app, 'object');
 
-    let appDomains = [];
-    appDomains.push({ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY });
-
-    app.redirectDomains.forEach(function (redirectDomain) {
-        appDomains.push({ domain: redirectDomain.domain, fqdn: redirectDomain.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT });
-    });
-
-    app.aliasDomains.forEach(function (aliasDomain) {
-        appDomains.push({ domain: aliasDomain.domain, fqdn: aliasDomain.fqdn, type: apps.SUBDOMAIN_TYPE_ALIAS });
-    });
+    const appDomains = [{ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY }]
+        .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT }; }))
+        .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT }; }));
 
     for (const appDomain of appDomains) {
         const bundle = await getCertificatePath(appDomain.fqdn, appDomain.domain);
@@ -577,28 +570,15 @@ async function configureApp(app, auditSource) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    let appDomains = [];
-    appDomains.push({ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY });
-
-    app.redirectDomains.forEach(function (redirectDomain) {
-        appDomains.push({ domain: redirectDomain.domain, fqdn: redirectDomain.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT });
-    });
-
-    app.aliasDomains.forEach(function (aliasDomain) {
-        appDomains.push({ domain: aliasDomain.domain, fqdn: aliasDomain.fqdn, type: apps.SUBDOMAIN_TYPE_ALIAS });
-    });
+    const appDomains = [{ domain: app.domain, fqdn: app.fqdn }]
+        .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn }; }))
+        .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn }; }));
 
     for (const appDomain of appDomains) {
-        const { bundle } = await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
-
-        if (appDomain.type === apps.SUBDOMAIN_TYPE_PRIMARY) {
-            await writeAppNginxConfig(app, appDomain.fqdn, bundle);
-        } else if (appDomain.type === apps.SUBDOMAIN_TYPE_REDIRECT) {
-            await writeAppRedirectNginxConfig(app, appDomain.fqdn, bundle);
-        } else if (appDomain.type === apps.SUBDOMAIN_TYPE_ALIAS) {
-            await writeAppNginxConfig(app, appDomain.fqdn, bundle);
-        }
+        await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
     }
+
+    writeAppConfig(app);
 }
 
 async function unconfigureApp(app) {