diff --git a/backend/app.ts b/backend/app.ts
index ab13ede7a..69b2089b8 100644
--- a/backend/app.ts
+++ b/backend/app.ts
@@ -28,8 +28,7 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils";
 require("dotenv").config();
 
 const corsOption = {
-  origin: process.env.SHIPYARD_DOMAIN_FRONTEND ? `https://${process.env.SHIPYARD_DOMAIN_FRONTEND}` : `http://localhost:${frontendPort}`,
-  credentials: true,
+  origin: false,
 };
 
 const schema = loadSchemaSync(join(__dirname, "./graphql/schema.graphql"), {
diff --git a/docker-compose.yml b/docker-compose.yml
index a64431b73..56b750cf9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,13 @@ services:
     labels:
       shipyard.route: '/'
       shipyard.primary-route: 'true'
+      shipyard.liveness.http.path: '/health'
+      shipyard.liveness.initial_delay: '15'
+      shipyard.liveness.period: '15'
+      shipyard.readiness.http.path: '/health'
+      shipyard.readiness.initial_delay: '10'
+      shipyard.liveness.timeout_seconds: 15
+      shipyard.readiness.period: '15'
     environment:
         SHIPYARD_DOMAIN_BACKEND: ${SHIPYARD_DOMAIN_BACKEND-}
     ports:
@@ -18,7 +25,7 @@ services:
     build:
       context: '.'
     labels:
-      shipyard.route: '/api'
+      shipyard.route: '/'
     environment:
         SHIPYARD_DOMAIN_FRONTEND: ${SHIPYARD_DOMAIN_FRONTEND-}
     ports:
diff --git a/package.json b/package.json
index 08d4b1b95..8668703ec 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "dev:coverage": "cross-env NODE_ENV=development CYPRESS_COVERAGE=true concurrently yarn:start:react yarn:start:api:watch",
     "dev:google": "cross-env VITE_GOOGLE=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
     "dev:okta": "cross-env VITE_OKTA=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
-    "dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
+    "dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api",
     "postdb:seed": "yarn db:seed:dev",
     "postinstall": "husky install && patch-package",
     "prebuild:ci": "yarn predev:cognito:ci",
diff --git a/vite.config.ts b/vite.config.ts
index 8670cee08..ea2efdccc 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -42,9 +42,6 @@ export default defineConfig(({ command, mode }) => {
     server: {
       port: 3000,
       host: "0.0.0.0",
-      cors: {
-        origin: false,
-      },
     },
     build: {
       outDir: "build",