diff --git a/.env.example b/.env.example
index 916c5d7..94cb515 100644
--- a/.env.example
+++ b/.env.example
@@ -5,8 +5,8 @@ REDIS_URL="redis://localhost:6379"
 
 NEXTAUTH_URL="http://localhost:3000"
 
-NEXT_PUBLIC_SMTP_HOST=smtp.mailtrap.io  # Example SMTP host
-NEXT_PUBLIC_SMTP_USER=test_userdadad@example.com  # Example SMTP user
+SMTP_HOST=smtp.mailtrap.io  # Example SMTP host
+SMTP_USER=test_userdadad@example.com  # Example SMTP user
 
 
 AWS_DEFAULT_REGION="us-east-1"
diff --git a/.env.selfhost.example b/.env.selfhost.example
index 101b313..bcb56ec 100644
--- a/.env.selfhost.example
+++ b/.env.selfhost.example
@@ -13,8 +13,8 @@ NEXTAUTH_URL="http://localhost:3000"
 NEXTAUTH_SECRET=
 
 #SMTP
-NEXT_PUBLIC_SMTP_HOST=smtp.mailtrap.io  # Example SMTP host
-NEXT_PUBLIC_SMTP_USER= "unsend" # Example SMTP user
+SMTP_HOST=smtp.mailtrap.io  # Example SMTP host
+SMTP_USER= "unsend" # Example SMTP user
 
 ## Auth providers any one is required
 # Github login - required
diff --git a/apps/web/src/app/(dashboard)/dev-settings/smtp/page.tsx b/apps/web/src/app/(dashboard)/dev-settings/smtp/page.tsx
index 4542855..59b61e0 100644
--- a/apps/web/src/app/(dashboard)/dev-settings/smtp/page.tsx
+++ b/apps/web/src/app/(dashboard)/dev-settings/smtp/page.tsx
@@ -1,4 +1,3 @@
-"use client";
 import * as React from "react";
 import {
   Card,
@@ -8,14 +7,12 @@ import {
   CardTitle,
 } from "@unsend/ui/src/card";
 import { TextWithCopyButton } from "@unsend/ui/src/text-with-copy";
-import {env} from "~/env";
-
-
-const host = env.NEXT_PUBLIC_SMTP_HOST;
-const user = env.NEXT_PUBLIC_SMTP_USER;
-
+import { env } from "~/env";
 
 export default function ExampleCard() {
+  const host = env.SMTP_HOST;
+  const user = env.SMTP_USER;
+
   return (
     <Card className="mt-9 max-w-xl">
       <CardHeader>
diff --git a/apps/web/src/env.js b/apps/web/src/env.js
index b93924e..babe1fd 100644
--- a/apps/web/src/env.js
+++ b/apps/web/src/env.js
@@ -54,6 +54,8 @@ export const env = createEnv({
     STRIPE_SECRET_KEY: z.string().optional(),
     STRIPE_BASIC_PRICE_ID: z.string().optional(),
     STRIPE_WEBHOOK_SECRET: z.string().optional(),
+    SMTP_HOST: z.string().default("smtp.unsend.dev"),
+    SMTP_USER: z.string().default("unsend"),
   },
 
   /**
@@ -67,8 +69,6 @@ export const env = createEnv({
       .string()
       .default("false")
       .transform((str) => str === "true"),
-    NEXT_PUBLIC_SMTP_HOST: z.string().default("smtp.unsend.dev"),
-    NEXT_PUBLIC_SMTP_USER: z.string().default("unsend"),
   },
 
   /**
@@ -103,8 +103,8 @@ export const env = createEnv({
     STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
     STRIPE_BASIC_PRICE_ID: process.env.STRIPE_BASIC_PRICE_ID,
     STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
-    NEXT_PUBLIC_SMTP_HOST: process.env.NEXT_PUBLIC_SMTP_HOST,
-    NEXT_PUBLIC_SMTP_USER: process.env.NEXT_PUBLIC_SMTP_USER,
+    SMTP_HOST: process.env.SMTP_HOST,
+    SMTP_USER: process.env.SMTP_USER,
   },
   /**
    * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially
diff --git a/docker/prod/compose.yml b/docker/prod/compose.yml
index 02950f2..3e92525 100644
--- a/docker/prod/compose.yml
+++ b/docker/prod/compose.yml
@@ -62,8 +62,8 @@ services:
       - REDIS_URL=${REDIS_URL:?err}
       - NEXT_PUBLIC_IS_CLOUD=${NEXT_PUBLIC_IS_CLOUD:-false}
       - API_RATE_LIMIT=${API_RATE_LIMIT:-1}
-      - NEXT_PUBLIC_SMTP_HOST=${NEXT_PUBLIC_SMTP_HOST:-smtp.unsend.dev}
-      - NEXT_PUBLIC_SMTP_USER=${NEXT_PUBLIC_SMTP_USER:-unsend}
+      - SMTP_HOST=${SMTP_HOST:-smtp.unsend.dev}
+      - SMTP_USER=${SMTP_USER:-unsend}
     depends_on:
       postgres:
         condition: service_healthy