diff --git a/e2e-tests/playwright.config.ts b/e2e-tests/playwright.config.ts
index d84b17080a..ef12615f56 100644
--- a/e2e-tests/playwright.config.ts
+++ b/e2e-tests/playwright.config.ts
@@ -11,7 +11,10 @@ const isPrOcpHelmJob =
 
 const isOsdGcpJob = process.env.JOB_NAME.includes("osd-gcp");
 
-const shouldSkipOrchestratorTests = isPrOcpHelmJob || isOsdGcpJob;
+const isNonOpenShiftJob = process.env.IS_OPENSHIFT === "false";
+
+const shouldSkipOrchestratorTests =
+  isPrOcpHelmJob || isOsdGcpJob || isNonOpenShiftJob;
 
 // Set LOCALE based on which project is being run
 const args = process.argv;
diff --git a/e2e-tests/playwright/e2e/plugins/orchestrator/failswitch-workflow.spec.ts b/e2e-tests/playwright/e2e/plugins/orchestrator/failswitch-workflow.spec.ts
index 4a91c19799..456a878df0 100644
--- a/e2e-tests/playwright/e2e/plugins/orchestrator/failswitch-workflow.spec.ts
+++ b/e2e-tests/playwright/e2e/plugins/orchestrator/failswitch-workflow.spec.ts
@@ -2,14 +2,9 @@ import { test, expect } from "@playwright/test";
 import { UIhelper } from "../../../utils/ui-helper";
 import { Common } from "../../../utils/common";
 import { Orchestrator } from "../../../support/pages/orchestrator";
-import { skipIfJobName } from "../../../utils/helper";
-import { JOB_NAME_PATTERNS } from "../../../utils/constants";
 import { LogUtils } from "../../audit-log/log-utils";
 
 test.describe("Orchestrator failswitch workflow tests", () => {
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.OSD_GCP)); // skipping orchestrator tests on OSD-GCP due to infra not being installed
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled to save disk space
-
   let uiHelper: UIhelper;
   let common: Common;
   let orchestrator: Orchestrator;
diff --git a/e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts b/e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts
index b2f968c1f9..77c2bebc8c 100644
--- a/e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts
+++ b/e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts
@@ -6,10 +6,6 @@ import { skipIfJobName } from "../../../utils/helper";
 import { JOB_NAME_PATTERNS } from "../../../utils/constants";
 
 test.describe("Orchestrator greeting workflow tests", () => {
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.OSD_GCP)); // skipping orchestrator tests on OSD-GCP due to infra not being installed
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.AKS)); // skipping orchestrator tests on AKS - plugins disabled
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.EKS)); // skipping orchestrator tests on EKS - plugins disabled
   // TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator tests on Operator deployment
   test.fixme(() => skipIfJobName(JOB_NAME_PATTERNS.OPERATOR));
 
diff --git a/e2e-tests/playwright/e2e/plugins/orchestrator/workflow-all-runs-validations.spec.ts b/e2e-tests/playwright/e2e/plugins/orchestrator/workflow-all-runs-validations.spec.ts
index ba386693af..4c936d4d86 100644
--- a/e2e-tests/playwright/e2e/plugins/orchestrator/workflow-all-runs-validations.spec.ts
+++ b/e2e-tests/playwright/e2e/plugins/orchestrator/workflow-all-runs-validations.spec.ts
@@ -6,10 +6,6 @@ import { skipIfJobName } from "../../../utils/helper";
 import { JOB_NAME_PATTERNS } from "../../../utils/constants";
 
 test.describe("Orchestrator Workflow Runs tests", () => {
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.OSD_GCP)); // skipping orchestrator tests on OSD-GCP due to infra not being installed
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.GKE)); // skipping orchestrator tests on GKE - plugins disabled
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.AKS)); // skipping orchestrator tests on AKS - plugins disabled
-  test.skip(() => skipIfJobName(JOB_NAME_PATTERNS.EKS)); // skipping orchestrator tests on EKS - plugins disabled
   // TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator tests on Operator deployment
   test.fixme(() => skipIfJobName(JOB_NAME_PATTERNS.OPERATOR));