diff --git a/.dockerignore b/.dockerignore
index 255d1ab8..081ee586 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,6 +10,5 @@ docker/volumes/
docs/
node_modules/
playwright-report/
-public/build/
test-results/
test/
diff --git a/.gitignore b/.gitignore
index dabf6788..4ed7f793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@ docker/volumes/
node_modules/
playwright-report/
playwright/.cache/
-public/build/
test-results/
test/e2e/.auth
diff --git a/.oxlintrc.json b/.oxlintrc.json
index c5833c47..10e6d97b 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -10,7 +10,6 @@
"docs/**",
"node_modules/**",
"playwright-report/**",
- "public/build/**",
"test/e2e/**",
"test-results/**",
"playwright.config.ts"
diff --git a/Dockerfile b/Dockerfile
index ea5613b1..ae6e7cfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,8 +56,8 @@ USER node
COPY --chown=node:node --from=production-deps /app/.npmrc ./.npmrc
COPY --chown=node:node --from=production-deps /app/node_modules ./node_modules
COPY --chown=node:node --from=build /app/node_modules/.prisma ./node_modules/.prisma
-COPY --chown=node:node --from=build /app/build ./build
-COPY --chown=node:node --from=build /app/public ./public
+COPY --chown=node:node --from=build /app/build/server ./build/server
+COPY --chown=node:node --from=build /app/build/client ./build/client
COPY --chown=node:node --from=build /app/prisma ./prisma
# Include the SAML IDP metadata in the image. Specify the file to use in the build arg
@@ -67,7 +67,7 @@ ENV SAML_IDP_METADATA_PATH=/app/config/idp-metadata.xml
COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["/usr/bin/tini", "--", "docker-entrypoint.sh"]
-CMD ["node", "./build/server.js"]
+CMD ["node", "./build/server/index.js"]
HEALTHCHECK CMD curl --fail http://localhost:${PORT}/healthcheck || exit 1
EXPOSE ${PORT}
diff --git a/app/root.tsx b/app/root.tsx
index c0ebb204..fac42cd7 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -1,14 +1,6 @@
import { ChakraProvider } from '@chakra-ui/react';
import { json } from '@remix-run/node';
-import {
- Links,
- LiveReload,
- Meta,
- Outlet,
- Scripts,
- ScrollRestoration,
- useLoaderData,
-} from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
import { getUser, getEffectiveUser, stopImpersonation } from './session.server';
@@ -70,7 +62,6 @@ function Document({ children }: { children: React.ReactNode }) {
{children}
-