diff --git a/.env.infoalloggi b/.env.infoalloggi
index 9a88b79..6c2c0ee 100644
--- a/.env.infoalloggi
+++ b/.env.infoalloggi
@@ -1,4 +1,4 @@
-BASE_URL="https://www.infoalloggi.it"
+#BASE_URL="https://www.infoalloggi.it"
 NEXT_PUBLIC_BASE_URL = "https://info.marcopedone.it"
 INTERNAL_BASE_URL = "http://web:3000"
 #Api key for the mail service
diff --git a/.env.marcopedone b/.env.marcopedone
index 66301a0..914d9d2 100644
--- a/.env.marcopedone
+++ b/.env.marcopedone
@@ -1,4 +1,4 @@
-BASE_URL="https://info.marcopedone.it"
+#BASE_URL="https://info.marcopedone.it"
 NEXT_PUBLIC_BASE_URL = "https://info.marcopedone.it"
 INTERNAL_BASE_URL = "http://web:3000"
 #Api key for the mail service
diff --git a/apps/infoalloggi/Dockerfile b/apps/infoalloggi/Dockerfile
index 2afbd31..9294b21 100644
--- a/apps/infoalloggi/Dockerfile
+++ b/apps/infoalloggi/Dockerfile
@@ -25,8 +25,8 @@ ENV NEXT_TELEMETRY_DISABLED=1
 ENV SKIP_REDIS="true"
 
 # Only essential build-time variables
-ARG BASE_URL
-ENV NEXT_PUBLIC_BASE_URL=$BASE_URL
+ARG NEXT_PUBLIC_BASE_URL
+ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 
 ARG NEXT_PUBLIC_STRIPE_PUBLIC_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLIC_KEY=$NEXT_PUBLIC_STRIPE_PUBLIC_KEY
@@ -81,8 +81,8 @@ ENV NEXT_TELEMETRY_DISABLED=1
 ENV SKIP_REDIS="false"
 
 # Essential runtime variables
-ARG BASE_URL
-ENV NEXT_PUBLIC_BASE_URL=$BASE_URL
+ARG NEXT_PUBLIC_BASE_URL
+ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ARG INTERNAL_BASE_URL
 ENV INTERNAL_BASE_URL=$INTERNAL_BASE_URL
 ARG POSTGRES_USER
diff --git a/apps/infoalloggi/emails/VerificaEmail.tsx b/apps/infoalloggi/emails/VerificaEmail.tsx
index 409c79f..419eba4 100644
--- a/apps/infoalloggi/emails/VerificaEmail.tsx
+++ b/apps/infoalloggi/emails/VerificaEmail.tsx
@@ -6,12 +6,18 @@ export type VerificaEmail_NewMail = {
 };
 
 type VerificaEmailProps = {
+	baseUrl: string;
 	token: string;
 	userId: string;
 	redirect?: string;
 };
 
-const VerificaEmail = ({ token, userId, redirect }: VerificaEmailProps) => {
+const VerificaEmail = ({
+	baseUrl,
+	token,
+	userId,
+	redirect,
+}: VerificaEmailProps) => {
 	return (
 		<Base noreply preview="Verifica la tua email">
 			<>
@@ -27,7 +33,7 @@ const VerificaEmail = ({ token, userId, redirect }: VerificaEmailProps) => {
 
 					<Button
 						className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-						href={`${process.env.NEXT_PUBLIC_BASE_URL}/auth/verifica-email-action?t=${token}&u=${userId}${redirect ? `&r=${redirect}` : ""}`}
+						href={`${baseUrl}/auth/verifica-email-action?t=${token}&u=${userId}${redirect ? `&r=${redirect}` : ""}`}
 					>
 						Clicca qui per verificare
 					</Button>
diff --git a/apps/infoalloggi/emails/contatto_annuncio.tsx b/apps/infoalloggi/emails/contatto_annuncio.tsx
index 863432d..965b9e7 100644
--- a/apps/infoalloggi/emails/contatto_annuncio.tsx
+++ b/apps/infoalloggi/emails/contatto_annuncio.tsx
@@ -12,6 +12,7 @@ type ContattoAnnuncioEmailProps = {
 	email: string;
 	telefono: string;
 	messaggio: string;
+	baseUrl: string;
 };
 const ContattoAnnuncioEmail = ({
 	nome,
@@ -19,6 +20,7 @@ const ContattoAnnuncioEmail = ({
 	email,
 	telefono,
 	messaggio,
+	baseUrl,
 }: ContattoAnnuncioEmailProps) => {
 	return (
 		<Base preview="Contatto Email">
@@ -40,7 +42,7 @@ const ContattoAnnuncioEmail = ({
 				<Section className="mb-5">
 					<Button
 						className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-						href={`${process.env.NEXT_PUBLIC_BASE_URL}/annuncio/${codice}`}
+						href={`${baseUrl}/annuncio/${codice}`}
 					>
 						Vai all&apos;annuncio
 					</Button>
diff --git a/apps/infoalloggi/emails/onboarding-servizio.tsx b/apps/infoalloggi/emails/onboarding-servizio.tsx
index f16b26f..1aa8ae8 100644
--- a/apps/infoalloggi/emails/onboarding-servizio.tsx
+++ b/apps/infoalloggi/emails/onboarding-servizio.tsx
@@ -22,12 +22,14 @@ type OnboardingServizioProps = {
 		codice: string;
 		prezzo: number;
 	}[];
+	baseUrl: string;
 };
 
 const OnboardingServizio = ({
 	token,
 	nome,
 	annunci,
+	baseUrl,
 }: OnboardingServizioProps) => {
 	return (
 		<Base preview="Procedi ora su Infoalloggi.it">
@@ -47,7 +49,7 @@ const OnboardingServizio = ({
 					<Section className="mb-5">
 						<Button
 							className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-							href={`${process.env.NEXT_PUBLIC_BASE_URL}/servizio/pre-onboard/${token}`}
+							href={`${baseUrl}/servizio/pre-onboard/${token}`}
 						>
 							Vai al servizio
 						</Button>
@@ -64,7 +66,7 @@ const OnboardingServizio = ({
 											alt={`Annuncio image - ${annuncio.codice}`}
 											className="block w-[240px] rounded-[4px] object-cover object-center"
 											height="140px"
-											src={`${process.env.NEXT_PUBLIC_BASE_URL}/go-api/images/get/${annuncio.immagine}`}
+											src={`${baseUrl}/go-api/images/get/${annuncio.immagine}`}
 											width="100%"
 										/>
 									</Row>
@@ -84,7 +86,7 @@ const OnboardingServizio = ({
 										</Text>
 										<Link
 											className="block font-semibold text-[14px] text-indigo-600 no-underline"
-											href={`${process.env.NEXT_PUBLIC_BASE_URL}/annuncio/${annuncio.codice}`}
+											href={`${baseUrl}/annuncio/${annuncio.codice}`}
 										>
 											Scheda dell&apos;annuncio →
 										</Link>
diff --git a/apps/infoalloggi/emails/pagamento-errore.tsx b/apps/infoalloggi/emails/pagamento-errore.tsx
index dc4ee17..da4771f 100644
--- a/apps/infoalloggi/emails/pagamento-errore.tsx
+++ b/apps/infoalloggi/emails/pagamento-errore.tsx
@@ -2,9 +2,13 @@ import { Button, Heading, Row, Section, Text } from "@react-email/components";
 import Base from "./base";
 export type PagamentoErrore_NewMail = {
 	mailType: "pagamentoErrore";
+	props: PagamentoErroreProps;
 };
 
-const PagamentoErrore = () => {
+type PagamentoErroreProps = {
+	baseUrl: string;
+};
+const PagamentoErrore = ({ baseUrl }: PagamentoErroreProps) => {
 	return (
 		<Base preview="Errore Pagamento">
 			<>
@@ -22,7 +26,7 @@ const PagamentoErrore = () => {
 					<Section className="mb-5">
 						<Button
 							className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-							href={`${process.env.NEXT_PUBLIC_BASE_URL}/area-riservata/dashboard`}
+							href={`${baseUrl}/area-riservata/dashboard`}
 						>
 							Vai al tuo account
 						</Button>
diff --git a/apps/infoalloggi/emails/pagamento-ricezione.tsx b/apps/infoalloggi/emails/pagamento-ricezione.tsx
index 2b1fa8d..0976989 100644
--- a/apps/infoalloggi/emails/pagamento-ricezione.tsx
+++ b/apps/infoalloggi/emails/pagamento-ricezione.tsx
@@ -2,9 +2,13 @@ import { Button, Heading, Row, Section, Text } from "@react-email/components";
 import Base from "./base";
 export type PagamentoRicezione_NewMail = {
 	mailType: "pagamentoRicezione";
+	props: PagamentoRicezioneProps;
 };
 
-const PagamentoRicezione = () => {
+type PagamentoRicezioneProps = {
+	baseUrl: string;
+};
+const PagamentoRicezione = ({ baseUrl }: PagamentoRicezioneProps) => {
 	return (
 		<Base preview="Ricezione Pagamento">
 			<>
@@ -22,7 +26,7 @@ const PagamentoRicezione = () => {
 					<Section className="mb-5">
 						<Button
 							className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-							href={`${process.env.NEXT_PUBLIC_BASE_URL}/area-riservata/dashboard`}
+							href={`${baseUrl}/area-riservata/dashboard`}
 						>
 							Vai al tuo account
 						</Button>
diff --git a/apps/infoalloggi/emails/registrazione-avvenuta.tsx b/apps/infoalloggi/emails/registrazione-avvenuta.tsx
index 760d168..27f561a 100644
--- a/apps/infoalloggi/emails/registrazione-avvenuta.tsx
+++ b/apps/infoalloggi/emails/registrazione-avvenuta.tsx
@@ -2,9 +2,13 @@ import { Button, Heading, Row, Section, Text } from "@react-email/components";
 import Base from "./base";
 export type RegistrazioneAvvenuta_NewMail = {
 	mailType: "registrazioneAvvenuta";
+	props: RegistrazioneAvvenutaProps;
+};
+type RegistrazioneAvvenutaProps = {
+	baseUrl: string;
 };
 
-const RegistrazioneAvvenuta = () => {
+const RegistrazioneAvvenuta = ({ baseUrl }: RegistrazioneAvvenutaProps) => {
 	return (
 		<Base preview="Registrazione Avvenuta">
 			<>
@@ -21,7 +25,7 @@ const RegistrazioneAvvenuta = () => {
 					<Section className="mb-5">
 						<Button
 							className="mx-auto box-border inline-flex h-10 items-center justify-center whitespace-nowrap rounded-md bg-neutral-100 px-4 py-2 text-center align-middle font-semibold text-neutral-900"
-							href={`${process.env.NEXT_PUBLIC_BASE_URL}/area-riservata/dashboard`}
+							href={`${baseUrl}/area-riservata/dashboard`}
 						>
 							Vai al tuo account
 						</Button>
diff --git a/apps/infoalloggi/src/components/tables/servizio-table.tsx b/apps/infoalloggi/src/components/tables/servizio-table.tsx
index ba87040..d28ee92 100644
--- a/apps/infoalloggi/src/components/tables/servizio-table.tsx
+++ b/apps/infoalloggi/src/components/tables/servizio-table.tsx
@@ -168,7 +168,7 @@ export const TabServizio = ({
 												<Button
 													aria-label="Invia Email Servizio"
 													className="flex w-full justify-start gap-3 px-2 font-normal"
-													disabled={onboardDone}
+													//disabled={onboardDone}
 													size="sm"
 													variant="ghost"
 												>
diff --git a/apps/infoalloggi/src/server/controllers/servizio.controller.ts b/apps/infoalloggi/src/server/controllers/servizio.controller.ts
index 514ce3c..1f6f4a1 100644
--- a/apps/infoalloggi/src/server/controllers/servizio.controller.ts
+++ b/apps/infoalloggi/src/server/controllers/servizio.controller.ts
@@ -1169,6 +1169,7 @@ export const sendServizioEmail = async ({
 				})),
 				nome,
 				token: servizioId,
+				baseUrl: env.NEXT_PUBLIC_BASE_URL,
 			},
 			subject: "Procedi ora su Infoalloggi.it",
 			to: email,
@@ -1447,6 +1448,7 @@ export const SendContactEmail = async ({
 				messaggio,
 				nome,
 				telefono,
+				baseUrl: env.NEXT_PUBLIC_BASE_URL,
 			},
 			subject: "Contatto per annuncio",
 			to: "web@infoalloggi.it",
diff --git a/apps/infoalloggi/src/server/controllers/stripe.controller.ts b/apps/infoalloggi/src/server/controllers/stripe.controller.ts
index b2c1911..b56c7d0 100644
--- a/apps/infoalloggi/src/server/controllers/stripe.controller.ts
+++ b/apps/infoalloggi/src/server/controllers/stripe.controller.ts
@@ -250,6 +250,9 @@ export const whIntentFailedHandler = async ({
 			subject: "Pagamento Fallito",
 			to: utente.email,
 			userId: utente.id,
+			props: {
+				baseUrl: env.NEXT_PUBLIC_BASE_URL,
+			},
 		});
 	}
 	return true;
diff --git a/apps/infoalloggi/src/server/services/mailer.ts b/apps/infoalloggi/src/server/services/mailer.ts
index 2faa3e3..f4547b6 100644
--- a/apps/infoalloggi/src/server/services/mailer.ts
+++ b/apps/infoalloggi/src/server/services/mailer.ts
@@ -137,12 +137,14 @@ export const genMail = async ({ ...mail }: MailsTemplates) => {
 			break;
 
 		case "pagamentoErrore":
-			mailComponent = PagamentoErrore();
+			mailComponent = PagamentoErrore({
+				...mail.props,
+			});
 			title = "Errore pagamento";
 			break;
 
 		case "pagamentoRicezione":
-			mailComponent = PagamentoRicezione();
+			mailComponent = PagamentoRicezione({ ...mail.props });
 			title = "Ricezione pagamento";
 			break;
 
@@ -159,7 +161,9 @@ export const genMail = async ({ ...mail }: MailsTemplates) => {
 			break;
 
 		case "registrazioneAvvenuta":
-			mailComponent = RegistrazioneAvvenuta();
+			mailComponent = RegistrazioneAvvenuta({
+				...mail.props,
+			});
 			title = "Registrazione avvenuta";
 			break;
 
diff --git a/ref-docker-compose.yml b/ref-docker-compose.yml
index f20e911..6d425e9 100644
--- a/ref-docker-compose.yml
+++ b/ref-docker-compose.yml
@@ -129,7 +129,7 @@ services:
       BACKENDSERVER_URL: http://backend:1323
       KEYDB_URL: keydb:6379
       TILES_URL: tiles:6379
-      BASE_URL: ${BASE_URL}
+      #BASE_URL: ${BASE_URL}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
       STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
       NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}