diff --git a/.github/workflows/backend.yaml b/.github/workflows/backend.yaml
index 05c47a7..ac508a0 100644
--- a/.github/workflows/backend.yaml
+++ b/.github/workflows/backend.yaml
@@ -103,7 +103,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     needs: [test, security]
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     
     permissions:
       contents: read
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 9968135..f40aa15 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -99,7 +99,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     needs: [security]
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     
     permissions:
       contents: read
diff --git a/backend/backend-deployment.yaml b/backend/backend-deployment.yaml
index 9bcfdb3..d70c1d2 100644
--- a/backend/backend-deployment.yaml
+++ b/backend/backend-deployment.yaml
@@ -192,6 +192,8 @@ spec:
   hostnames:
   - "test.denhertog.ca"
   - "loadbalancer.frontierrnd.com"
+  - "web.codexeditor.app"
+  - "preview.codexeditor.app"
   rules:
   - matches:
     - path:
diff --git a/backend/src/routes/workspaces.ts b/backend/src/routes/workspaces.ts
index 6ca7653..4d93a9a 100644
--- a/backend/src/routes/workspaces.ts
+++ b/backend/src/routes/workspaces.ts
@@ -177,7 +177,7 @@ router.post('/',
         groupName: group.displayName,
         userId: user.id,
         status: WorkspaceStatus.STOPPED,
-        url: `https://loadbalancer.frontierrnd.com/${namespace}/${k8sName}`,
+        url: `https://preview.codexeditor.app/${namespace}/${k8sName}`,
         password,
         resources,
         image: workspaceImage,
diff --git a/backend/src/services/kubernetesService.ts b/backend/src/services/kubernetesService.ts
index 0ed0c2d..7405532 100644
--- a/backend/src/services/kubernetesService.ts
+++ b/backend/src/services/kubernetesService.ts
@@ -1347,7 +1347,7 @@ cert: false`;
   async createOrUpdateHTTPRoute(
     namespace: string,
     pathPrefix: string,
-    hostnames: string[] = ['test.denhertog.ca', 'loadbalancer.frontierrnd.com']
+    hostnames: string[] = ['test.denhertog.ca', 'loadbalancer.frontierrnd.com', 'web.codexeditor.app', 'preview.codexeditor.app']
   ): Promise<void> {
     try {
       const httpRouteName = `${namespace}-httproute`;
diff --git a/frontend/k8s/k8s-ingress.yaml b/frontend/k8s/k8s-ingress.yaml
index 891771b..537f71e 100644
--- a/frontend/k8s/k8s-ingress.yaml
+++ b/frontend/k8s/k8s-ingress.yaml
@@ -18,6 +18,8 @@ spec:
   hostnames:
   - "test.denhertog.ca"
   - "loadbalancer.frontierrnd.com"
+  - "web.codexeditor.app"
+  - "preview.codexeditor.app"
   rules:
   - matches:
     - path: