diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9b8813131..f727f96587 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -351,10 +351,10 @@ workflows:
                   name: << matrix.system >>-<< matrix.color >>-<< matrix.scale >>-<< matrix.dir >>
                   matrix:
                       parameters:
-                          system: [spectrum, express]
-                          color: [light, dark]
-                          scale: [medium, large]
-                          dir: [ltr, rtl]
+                          system: [spectrum, express, spectrum-two]
+                          color: [light]
+                          scale: [medium]
+                          dir: [ltr]
                   filters:
                       branches:
                           # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
@@ -363,10 +363,10 @@ workflows:
                   name: << matrix.system >>-<< matrix.color >>-<< matrix.scale >>-<< matrix.dir >>
                   matrix:
                       parameters:
-                          system: [spectrum-two]
-                          color: [light, dark]
-                          scale: [medium, large]
-                          dir: [ltr, rtl]
+                          system: [spectrum, express, spectrum-two]
+                          color: [dark]
+                          scale: [large]
+                          dir: [rtl]
                   filters:
                       branches:
                           # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
diff --git a/tasks/build-preview-urls-comment.js b/tasks/build-preview-urls-comment.js
index 4e295823d0..b792f2c2a6 100644
--- a/tasks/build-preview-urls-comment.js
+++ b/tasks/build-preview-urls-comment.js
@@ -54,28 +54,51 @@ export const buildPreviewURLComment = (ref) => {
     const branch = ref.replace('refs/heads/', '');
     const branchSlug = slugify(branch);
     const previewLinks = [];
-    const themes = ['Spectrum', 'Express', 'Spectrum-two'];
-    const scales = ['Medium', 'Large'];
-    const colors = ['Light', 'Dark'];
-    const directions = ['LTR', 'RTL'];
+
+    const combinations = [
+        {
+            system: 'Spectrum',
+            color: 'Light',
+            scale: 'Medium',
+            direction: 'LTR',
+        },
+        { system: 'Spectrum', color: 'Dark', scale: 'Large', direction: 'RTL' },
+        {
+            system: 'Express',
+            color: 'Light',
+            scale: 'Medium',
+            direction: 'LTR',
+        },
+        { system: 'Express', color: 'Dark', scale: 'Large', direction: 'RTL' },
+        {
+            system: 'Spectrum-two',
+            color: 'Light',
+            scale: 'Medium',
+            direction: 'LTR',
+        },
+        {
+            system: 'Spectrum-two',
+            color: 'Dark',
+            scale: 'Large',
+            direction: 'RTL',
+        },
+    ];
+
+    combinations.forEach(({ system, color, scale, direction }) => {
+        const context = `${branch}-${system.toLowerCase()}-${color.toLowerCase()}-${scale.toLowerCase()}-${direction.toLowerCase()}`;
+        previewLinks.push(`
+- [${system} | ${color} | ${scale} | ${direction}](https://${getHash(
+            context
+        )}--spectrum-web-components.netlify.app/review/)`);
+    });
+
     previewLinks.push(
-        `- [High Contrast Mode | Medium | LTR](https://${getHash(
+        `
+        - [High Contrast Mode | Medium | LTR](https://${getHash(
             `${branch}-hcm`
         )}--spectrum-web-components.netlify.app/review/)`
     );
-    themes.map((theme) =>
-        colors.map((color) => {
-            scales.map((scale) =>
-                directions.map((direction) => {
-                    const context = `${branch}-${theme.toLocaleLowerCase()}-${color.toLocaleLowerCase()}-${scale.toLocaleLowerCase()}-${direction.toLocaleLowerCase()}`;
-                    previewLinks.push(`
-- [${theme} | ${color} | ${scale} | ${direction}](https://${getHash(
-                        context
-                    )}--spectrum-web-components.netlify.app/review/)`);
-                })
-            );
-        })
-    );
+
     let comment = `## Branch preview
 
 - [Documentation Site](https://${branchSlug}--spectrum-web-components.netlify.app/)