diff --git a/.github/workflows/cypressgeneraltests.yml b/.github/workflows/cypress-general-tests.yml
similarity index 75%
rename from .github/workflows/cypressgeneraltests.yml
rename to .github/workflows/cypress-general-tests.yml
index 1a9427d9f6..a14119c6e7 100644
--- a/.github/workflows/cypressgeneraltests.yml
+++ b/.github/workflows/cypress-general-tests.yml
@@ -1,7 +1,7 @@
 # This workflow will run the cypress tests that are unrelated to the downloading and
 # testing of the starter zip files
 
-name: Test Feature Versions RedirectURls and Runtime Release Versions
+name: General Starter and Redirect Tests
 on:
   workflow_dispatch:
 
@@ -63,3 +63,23 @@ jobs:
                 name: cypress-videos
                 path: /__w/start.openliberty.io/start.openliberty.io/cypress/videos/testRedirectURLs.cy.js.mp4
 
+      use-cypress-test-StarterDefaults:
+        runs-on: ubuntu-latest
+        container: cypress/included:12.5.1
+        steps: 
+          - uses: actions/checkout@v3.3.0
+          - run: cypress run --browser chrome --env JDK_VERSION="${{ inputs.java_version }}"  --config-file /__w/start.openliberty.io/start.openliberty.io/src/test/cypressjs/cypress.config.js --spec /__w/openliberty.io/openliberty.io/src/test/cypressjs/cypress/e2e/testOLStarterDefaults.cy.js
+          
+          - uses: actions/upload-artifact@v3
+            if: failure()
+            with:
+               name: cypress-screenshots
+               path: /__w/start.openliberty.io/start.openliberty.io/cypress/screenshots/testOLStarterDefaults.cy.js
+
+          - uses: actions/upload-artifact@v3
+            if: failure()
+            with:
+                name: cypress-videos
+                path: /__w/start.openliberty.io/start.openliberty.io/cypress/videos/testOLStarterDefaults.cy.js.mp4
+
+
diff --git a/src/test/cypressjs/cypress/e2e/testOLStarterMavenDefaults.cy.js b/src/test/cypressjs/cypress/e2e/testOLStarterDefaults.cy.js
similarity index 54%
rename from src/test/cypressjs/cypress/e2e/testOLStarterMavenDefaults.cy.js
rename to src/test/cypressjs/cypress/e2e/testOLStarterDefaults.cy.js
index 7f5aa2100c..249b159497 100644
--- a/src/test/cypressjs/cypress/e2e/testOLStarterMavenDefaults.cy.js
+++ b/src/test/cypressjs/cypress/e2e/testOLStarterDefaults.cy.js
@@ -1,9 +1,7 @@
 
 describe('Test Open Liberty Starter - Maven Default EE and MP', () => {
-    // Allow users to specify URL via variables found in cypress.env.json    
-    // java home path for jdk17, jdk11, jdk8 can be change via cypress.env.json base on user env var
-    // this test will only download the starter for the default_jdk in that file
-
+    // Test the default values for the starter   
+  
     const default_javahome = Cypress.env('jdk_11_home');
     const appname = "app-name-m-default";
     const downloadsFolder = Cypress.config('downloadsFolder');
@@ -22,15 +20,4 @@ describe('Test Open Liberty Starter - Maven Default EE and MP', () => {
         cy.get("#Starter_MicroProfile_Version").should("have.value", mpDefault);
     });
 
-    it('Test zip file is downloaded with default values', () => {
-        cy.exec(`rm -rf ${downloadsFolder}`, { failOnNonZeroExit: false });
-        // download zip for the defaults      
-        cy.log('appname ' + appname);
-        cy.log('javaLevel ' + javaDefault);
-        cy.goToOpenLibertyStarter();
-        cy.downloadAndUnzipFile(appname, eeDefault, mpDefault,'m');
-        cy.runMVNWLibertyDev(appname, default_javahome);
-        cy.checkLocalSplashPage();
-        cy.runMVNWLibertyStop(appname, default_javahome);
-    });
 });
\ No newline at end of file
diff --git a/src/test/cypressjs/cypress/e2e/testOLStarterGradleDefaults.cy.js b/src/test/cypressjs/cypress/e2e/testOLStarterGradleDefaults.cy.js
deleted file mode 100644
index fdd5caa0c5..0000000000
--- a/src/test/cypressjs/cypress/e2e/testOLStarterGradleDefaults.cy.js
+++ /dev/null
@@ -1,39 +0,0 @@
-
-describe('Test Open Liberty Starter - Gradle Default EE and MP', () => {
-   
-    // Allow users to specify URL via variables found in cypress.env.json    
-    // java home path for jdk17, jdk11, jdk8 can be change via cypress.env.json base on user env var
-    // this test will only download the starter for the default_jdk in that file
-
-    const default_javahome = Cypress.env('jdk_11_home');
-    const appname = "app-name-g-default";
-    const downloadsFolder = Cypress.config('downloadsFolder');
-    const eeDefault = "10.0";
-    const mpDefault = "6.0"
-    const javaDefault = Cypress.env('default_jdk');
-
-    // tests
-    it('Default values for Open Liberty Starter', () => {
-        cy.goToOpenLibertyStarter();
-        cy.get("#Starter_Base_Package").should("have.value", "com.demo");
-        cy.get("#Starter_App_Name").should("have.value", "app-name");
-        cy.get('#build_system_gradle').click();
-        cy.get("#starter_section input[type=radio]:checked").should("have.value", "gradle");
-        cy.get("#Starter_Java_Version").should("have.value", javaDefault);
-        cy.get("#Starter_Jakarta_Version").should("have.value", eeDefault);
-        cy.get("#Starter_MicroProfile_Version").should("have.value", mpDefault);
-    });
-
-    it('Test zip file is downloaded with default values', () => {
-        cy.exec(`rm -rf ${downloadsFolder}`, { failOnNonZeroExit: false });
-        // download zip for the defaults      
-        cy.log('appname ' + appname);
-        cy.log('javaLevel ' + javaDefault);
-        cy.goToOpenLibertyStarter();
-        cy.downloadAndUnzipFile(appname, eeDefault, mpDefault,'g');
-        cy.runGradlewLibertyDev(appname, default_javahome);
-        cy.checkLocalSplashPage();
-        cy.runGradlewLibertyStop(appname, default_javahome);
-    });
-
-});
\ No newline at end of file