diff --git a/.github/workflows/ui-test/nightly.json b/.github/workflows/ui-test/nightly.json
index be13569c7..9d450943e 100644
--- a/.github/workflows/ui-test/nightly.json
+++ b/.github/workflows/ui-test/nightly.json
@@ -31,13 +31,13 @@
       "PS_VERSION_START": "1.7.8.1",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.4"
+      "PHP_VERSION": "7.3"
     },
     {
       "PS_VERSION_START": "1.7.8.1",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.3"
+      "PHP_VERSION": "7.4"
     },
     {
       "PS_VERSION_START": "1.7.8.2",
@@ -49,12 +49,24 @@
       "PS_VERSION_START": "1.7.8.2",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.4"
+      "PHP_VERSION": "7.3"
     },
     {
       "PS_VERSION_START": "1.7.8.2",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.3",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.3",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.3"
     },
     {
@@ -192,6 +204,234 @@
     {
       "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4"
     },
+    {
+      "PS_VERSION_START": "1.7.8.0",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.0",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.0",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.1",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.1",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.1",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.2",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.2",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.2",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.3",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.3",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.3",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.4",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.5",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.5",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.5",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.6",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.6",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.6",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.7",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.7",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.7",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.8",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.8",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.8",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.9",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.9",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.9",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.10",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.10",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.10",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.11",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.8.11",
+      "PS_VERSION_END": "8.1.7",
+      "UPGRADE_CHANNEL": "major",
+      "PHP_VERSION": "7.3"
+    },
     {
       "PS_VERSION_START": "1.7.8.11",
       "PS_VERSION_END": "8.1.7",
diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json
index 8bf62103d..bd2f6d8e9 100644
--- a/.github/workflows/ui-test/sanity.json
+++ b/.github/workflows/ui-test/sanity.json
@@ -1,7 +1,7 @@
 {
   "include": [
     {
-      "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4"
+      "comment": "1.7.8 ~ minor PHP 7.4"
     },
     {
       "PS_VERSION_START": "1.7.8.10",
@@ -10,7 +10,7 @@
       "PHP_VERSION": "7.4"
     },
     {
-      "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4"
+      "comment": "1.7.8 ~ major PHP 7.4"
     },
     {
       "PS_VERSION_START": "1.7.8.11",
@@ -19,7 +19,7 @@
       "PHP_VERSION": "7.4"
     },
     {
-      "comment": "8.0.5 ~ minor PHP 7.2 ~ 8.1"
+      "comment": "8.0.5 ~ minor PHP 8.1"
     },
     {
       "PS_VERSION_START": "8.0.5",
@@ -28,7 +28,7 @@
       "PHP_VERSION": "8.1"
     },
     {
-      "comment": "8.1.6 ~ minor PHP 7.2 ~ 8.1"
+      "comment": "8.1.6 ~ minor PHP 8.1"
     },
     {
       "PS_VERSION_START": "8.1.6",