diff --git a/.github/actions/cmx-versions/dist/index.js b/.github/actions/cmx-versions/dist/index.js
index 8e305f7281..ed27e25da9 100644
--- a/.github/actions/cmx-versions/dist/index.js
+++ b/.github/actions/cmx-versions/dist/index.js
@@ -7653,7 +7653,7 @@ async function getClusterVersions() {
 
     // versions to test looks like this:
     // [
-    //   {distribution: k3s, version: v1.24},
+    //   {distribution: k3s, version: v1.24, stage: 'stable'},
     //   ...
     // ]
     const versionsToTest = [];
@@ -7666,11 +7666,6 @@ async function getClusterVersions() {
             return;
         }
 
-        if (distroName === 'openshift') {
-            // it was recommended to exclude 4.10.0-okd from testing for now
-            distribution.versions = distribution.versions.filter((v) => v !== '4.10.0-okd');
-        }
-
         const latestMinorVersions = {};
         distribution.versions.forEach((version) => {
             const parsed = semverCoerce(version);
@@ -7690,7 +7685,12 @@ async function getClusterVersions() {
         });
 
         Object.keys(latestMinorVersions[distroName]).forEach((minorVersion) => {
-            versionsToTest.push({ distribution: distroName, version: latestMinorVersions[distroName][minorVersion] });
+            let stage = 'stable';
+            if (distroName === 'openshift' && minorVersion === '4.10') {
+                stage = 'beta';
+            }
+
+            versionsToTest.push({ distribution: distroName, version: latestMinorVersions[distroName][minorVersion], stage });
         });
     });
 
diff --git a/.github/actions/cmx-versions/index.js b/.github/actions/cmx-versions/index.js
index cdc146833e..f87ae3ea90 100644
--- a/.github/actions/cmx-versions/index.js
+++ b/.github/actions/cmx-versions/index.js
@@ -33,7 +33,7 @@ async function getClusterVersions() {
 
     // versions to test looks like this:
     // [
-    //   {distribution: k3s, version: v1.24},
+    //   {distribution: k3s, version: v1.24, stage: 'stable'},
     //   ...
     // ]
     const versionsToTest = [];
@@ -46,12 +46,6 @@ async function getClusterVersions() {
             return;
         }
 
-        // TODO: add a `stage` field or something to versionsToTest so we can conditionally continue-on-error
-        if (distroName === 'openshift') {
-            // it was recommended to exclude 4.10.0-okd from testing for now
-            distribution.versions = distribution.versions.filter((v) => v !== '4.10.0-okd');
-        }
-
         const latestMinorVersions = {};
         distribution.versions.forEach((version) => {
             const parsed = semverCoerce(version);
@@ -71,7 +65,12 @@ async function getClusterVersions() {
         });
 
         Object.keys(latestMinorVersions[distroName]).forEach((minorVersion) => {
-            versionsToTest.push({ distribution: distroName, version: latestMinorVersions[distroName][minorVersion] });
+            let stage = 'stable';
+            if (distroName === 'openshift' && minorVersion === '4.10') {
+                stage = 'beta';
+            }
+
+            versionsToTest.push({ distribution: distroName, version: latestMinorVersions[distroName][minorVersion], stage });
         });
     });
 
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 9c36c8b3cc..8e750e8790 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -659,6 +659,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -697,6 +698,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -735,6 +737,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -972,6 +975,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_SLUG: minimal-rbac
       APP_VERSION_LABEL: "0.0.1"
@@ -1080,6 +1084,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_SLUG: multi-namespace-yeti
     steps:
@@ -1191,6 +1196,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_NAME: multi-namespace-yeti
       APP_SLUG: multi-namespace
@@ -1458,6 +1464,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_SLUG: helm-install-order
     steps:
@@ -1555,6 +1562,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_SLUG: yamlescape
     steps:
@@ -2371,6 +2379,7 @@ jobs:
       fail-fast: false
       matrix:
         cluster: ${{ fromJson(needs.cmx-versions.outputs.versions-to-test) }}
+    continue-on-error: ${{ matrix.cluster.stage != 'stable' }}
     env:
       APP_SLUG: postgres-to-rqlite
       BASE_KOTS_VERSION: v1.57.0