diff --git a/conf/front.env b/conf/front.env
index e869e1f..031a7f3 100644
--- a/conf/front.env
+++ b/conf/front.env
@@ -1,4 +1,5 @@
NEXT_PUBLIC_API_URL=https://__DOMAIN__/api/
+NEXT_PUBLIC_DOMAIN_FRONT=__DOMAIN__
+
NEXT_TELEMETRY_DISABLED=1
NODE_ENV=production
-NEXT_PUBLIC_DOMAIN_URL=__DOMAIN__
diff --git a/sources/patches/custom_url.patch b/sources/patches/main-custom_url.patch
similarity index 57%
rename from sources/patches/custom_url.patch
rename to sources/patches/main-custom_url.patch
index 63a20b7..63f68c4 100644
--- a/sources/patches/custom_url.patch
+++ b/sources/patches/main-custom_url.patch
@@ -1,73 +1,68 @@
diff --git a/frontend/.env.local b/frontend/.env.local
-index ee43468..f862dac 100644
+index ee43468..6876cfc 100644
--- a/frontend/.env.local
+++ b/frontend/.env.local
@@ -1,4 +1,5 @@
NEXT_PUBLIC_API_URL="http://127.0.0.1:3000"
-+NEXT_PUBLIC_DOMAIN_BASE="crab.fit"
++NEXT_PUBLIC_DOMAIN_FRONT="crab.fit"
# Google auth for calendar syncing, feature will be disabled if these aren't set
# NEXT_PUBLIC_GOOGLE_CLIENT_ID=""
diff --git a/frontend/src/app/[id]/page.tsx b/frontend/src/app/[id]/page.tsx
-index a3af022..b807f1c 100644
+index a3af022..c1350a6 100644
--- a/frontend/src/app/[id]/page.tsx
+++ b/frontend/src/app/[id]/page.tsx
-@@ -6,6 +6,7 @@ import { Temporal } from '@js-temporal/polyfill'
+@@ -13,6 +13,11 @@ import { makeClass, relativeTimeFormat } from '/src/utils'
+ import EventAvailabilities from './EventAvailabilities'
+ import styles from './page.module.scss'
- import Content from '/src/components/Content/Content'
- import Copyable from '/src/components/Copyable/Copyable'
-+import DOMAIN_URL from '/src/components/Copyable/Copyable'
- import { getEvent } from '/src/config/api'
- import { useTranslation } from '/src/i18n/server'
- import { makeClass, relativeTimeFormat } from '/src/utils'
-@@ -49,10 +50,10 @@ const Page = async ({ params }: PageProps) => {
++if (process.env.NEXT_PUBLIC_DOMAIN_FRONT === undefined) {
++ throw new Error('Expected front domain name environment variable')
++}
++const DOMAIN_FRONT = process.env.NEXT_PUBLIC_DOMAIN_FRONT
++
+ interface PageProps {
+ params: { id: string }
+ }
+@@ -49,10 +54,10 @@ const Page = async ({ params }: PageProps) => {
>{t('common:created', { date: relativeTimeFormat(Temporal.Instant.fromEpochSeconds(event.created_at), i18n.language) })}