diff --git a/.env b/.env
index 7ebca755..32c82d76 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
+APP_BASE_URL=/
 API_BASE_URL=/api
diff --git a/.github/workflows/run-e2e-testing.yaml b/.github/workflows/run-e2e-testing.yaml
index ab8d0dac..b7c57f76 100644
--- a/.github/workflows/run-e2e-testing.yaml
+++ b/.github/workflows/run-e2e-testing.yaml
@@ -23,3 +23,5 @@ jobs:
 
       - name: Run Tests
         run: npm run e2e:ci
+        env:
+          APP_BASE_URL: /comet-starter/
diff --git a/cypress/e2e/dashboard-and-details.cy.ts b/cypress/e2e/dashboard-and-details.cy.ts
index 24b1fbd5..00497f0e 100644
--- a/cypress/e2e/dashboard-and-details.cy.ts
+++ b/cypress/e2e/dashboard-and-details.cy.ts
@@ -8,7 +8,7 @@ describe('dashboard spec', () => {
 
   it('verifies access to dashboard after signing in', () => {
     // Navigate to Homepage
-    cy.visit('/');
+    cy.visit(Cypress.config('baseUrl'));
 
     // Setup Accessibility Testing
     cy.injectAxe();
diff --git a/cypress/e2e/home.cy.ts b/cypress/e2e/home.cy.ts
index 0b94bca9..405f2e6e 100644
--- a/cypress/e2e/home.cy.ts
+++ b/cypress/e2e/home.cy.ts
@@ -6,7 +6,7 @@ describe('home spec', () => {
 
   it('navigates to home', () => {
     // Navigate to Homepage
-    cy.visit('/');
+    cy.visit(Cypress.config('baseUrl'));
 
     // Setup Accessibility Testing
     cy.injectAxe();
diff --git a/cypress/e2e/sign-in.cy.ts b/cypress/e2e/sign-in.cy.ts
index c6704bbc..518e2f0a 100644
--- a/cypress/e2e/sign-in.cy.ts
+++ b/cypress/e2e/sign-in.cy.ts
@@ -6,7 +6,7 @@ describe('signin spec', () => {
 
   it('navigates to home and signs in', () => {
     // Navigate to Homepage
-    cy.visit('/');
+    cy.visit(Cypress.config('baseUrl'));
 
     // Setup Accessibility Testing
     cy.injectAxe();
diff --git a/package.json b/package.json
index 48a23b0c..3198221d 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "e2e": "npx cypress open",
-    "e2e:ci": "npm run e2e:ci:run || true && npm run e2e:ci:report",
+    "e2e:ci": "npm run e2e:ci:run",
     "e2e:ci:run": "rm cypress/reports/* || true && npx cypress run --reporter mochawesome",
     "e2e:ci:report": "mochawesome-merge cypress/reports/*.json > cypress/reports/report.json && marge --reportDir cypress/reports cypress/reports/report.json",
     "e2e:format": "npx prettier cypress --write",
diff --git a/src/main.tsx b/src/main.tsx
index d23eb050..c6d8f2a0 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -9,7 +9,7 @@ import keycloak from './utils/keycloak.ts';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <BrowserRouter>
+    <BrowserRouter basename={process.env.APP_BASE_URL}>
       <AuthProvider {...keycloak}>
         <RecoilRoot>
           <App />