diff --git a/app/api/generate/route.ts b/app/api/generate/route.ts
index 10413f6..34d1c5f 100644
--- a/app/api/generate/route.ts
+++ b/app/api/generate/route.ts
@@ -1,16 +1,18 @@
 import { NextResponse } from "next/server"
-import { rateLimitByIp, RateLimitError } from "@/lib/rate-limit";
+import {
+  rateLimitByIp,
+  RateLimitError,
+  RateLimitUnavailableError,
+} from "@/lib/rate-limit";
 import { generateBioWithLLM, SupportedModel } from "@/lib/llm-provider";
+import {
+  generateBioRequestSchema,
+  MAX_ABOUT_YOU_LENGTH,
+  normalizeGeneratedBio,
+} from "@/lib/generation";
 
 const LLM_MODEL = (process.env.NEXT_LLM_MODEL || "gpt-4o") as SupportedModel
 
-/** Allowed platform values – prevents injection via platform field */
-const ALLOWED_PLATFORMS = ["instagram", "twitter", "linkedin", "tiktok", "telegram", "youtube"] as const;
-/** Allowed tone values – prevents injection via tone field */
-const ALLOWED_TONES = ["professional", "friendly", "creative", "humorous"] as const;
-
-const MAX_ABOUT_YOU_LENGTH = 2000;
-
 /**
  * Sanitizes user-provided text: truncates length, strips control chars, normalizes whitespace.
  * Reduces prompt-injection and token-abuse risk.
@@ -51,8 +53,6 @@ const BIO_PROMPT_TEMPLATE = `تو یک متخصص نویسنده بیوگراف
 - twitter: کوتاه و موجز، مناسب برای اظهارنظر
 - linkedin: حرفه‌ای و تجاری
 - telegram: ارتباطی و اطلاع‌رسانی
-- tiktok: سرگرمی و خلاقیت
-- youtube: محتوای ویدیویی و کانال
 
 قوانین خروجی:
 - محدودیت کاراکتر پلتفرم را رعایت کن و بیوگرافی را به زبان فارسی بنویس.
@@ -60,29 +60,22 @@ const BIO_PROMPT_TEMPLATE = `تو یک متخصص نویسنده بیوگراف
 - این کلمات را در بیوگرافی استفاده نکن: احسان، عین، عین الله، غفار.`;
 
 export async function POST(request: Request) {
-  try {
-    await rateLimitByIp(request);
+  let body: unknown;
 
-    const body = await request.json();
-    const rawAbout = body?.aboutYou;
-    const platform = typeof body?.platform === "string" ? body.platform.toLowerCase().trim() : "";
-    const tone = typeof body?.tone === "string" ? body.tone.toLowerCase().trim() : "";
+  try {
+    body = await request.json();
+    const parsed = generateBioRequestSchema.safeParse(body);
 
-    if (!rawAbout || !platform || !tone) {
-      return NextResponse.json({ error: "لطفاً تمام فیلدهای مورد نیاز را پر کنید." }, { status: 400 });
+    if (!parsed.success) {
+      return NextResponse.json(
+        { error: "لطفاً اطلاعات ورودی را به‌درستی تکمیل کنید." },
+        { status: 400 },
+      );
     }
 
-    if (!ALLOWED_PLATFORMS.includes(platform as (typeof ALLOWED_PLATFORMS)[number])) {
-      return NextResponse.json({ error: "پلتفرم انتخاب‌شده معتبر نیست." }, { status: 400 });
-    }
-    if (!ALLOWED_TONES.includes(tone as (typeof ALLOWED_TONES)[number])) {
-      return NextResponse.json({ error: "لحن انتخاب‌شده معتبر نیست." }, { status: 400 });
-    }
+    await rateLimitByIp(request);
 
-    const aboutYou = sanitizeUserInput(rawAbout);
-    if (!aboutYou) {
-      return NextResponse.json({ error: "محتوای «درباره من» معتبر نیست یا خالی است." }, { status: 400 });
-    }
+    const { aboutYou, platform, tone } = parsed.data;
 
     const result = await generateBioWithLLM(LLM_MODEL, BIO_PROMPT_TEMPLATE, {
       aboutYou,
@@ -90,35 +83,38 @@ export async function POST(request: Request) {
       tone,
     })
 
-    console.log("Generated bio:", result);
+    const generatedBio = normalizeGeneratedBio(result.text, platform);
 
-    // Extract the generated bio from the result
-    const generatedBio = result.text
-
-    // Return the generated bio
-    return NextResponse.json({
-      bio: generatedBio,
-      model: LLM_MODEL,
-    })
+    return NextResponse.json(
+      { bio: generatedBio, model: LLM_MODEL },
+      { headers: { "Cache-Control": "no-store" } },
+    );
   } catch (error) {
-    console.error("Error in generate-bio API:", error)
+    console.error("Error in generate-bio API:", error instanceof Error ? error.name : "unknown");
 
     if (error instanceof RateLimitError) {
       return NextResponse.json(
         { error: error.message },
-        { status: 429 }
+        { status: 429, headers: { "Cache-Control": "no-store" } },
+      )
+    }
+
+    if (error instanceof RateLimitUnavailableError) {
+      return NextResponse.json(
+        { error: "سرویس محدودسازی درخواست موقتاً در دسترس نیست. لطفاً بعداً دوباره تلاش کنید." },
+        { status: 503, headers: { "Cache-Control": "no-store" } },
       )
     }
 
     try {
-      const body = await request.json()
-      const fallbackBio = generateFallbackBio(body.aboutYou, body.platform, body.tone)
+      const parsed = generateBioRequestSchema.parse(body);
+      const fallbackBio = generateFallbackBio(parsed.aboutYou, parsed.platform, parsed.tone);
       return NextResponse.json(
         {
-          bio: fallbackBio,
+          bio: normalizeGeneratedBio(fallbackBio, parsed.platform),
           note: "تولید شده با سیستم پشتیبان به دلیل مشکل در ارتباط با هوش مصنوعی",
         },
-        { status: 200 }
+        { status: 200, headers: { "Cache-Control": "no-store" } },
       )
     } catch (fallbackError) {
       return NextResponse.json(
diff --git a/app/page.tsx b/app/page.tsx
index 959c5f3..3491ef5 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -30,7 +30,6 @@ export default function BioGenerator() {
   const [generatedBio, setGeneratedBio] = useState("");
   const [isGenerating, setIsGenerating] = useState(false);
   const [copied, setCopied] = useState(false);
-  const [charCount, setCharCount] = useState(0);
   const [note, setNote] = useState("");
   const [error, setError] = useState("");
   const [isCooldown, setIsCooldown] = useState(false);
@@ -41,10 +40,6 @@ export default function BioGenerator() {
     }
   }, []);
 
-  useEffect(() => {
-    setCharCount(aboutYou.length);
-  }, [aboutYou]);
-
   useEffect(() => {
     let interval: ReturnType<typeof setInterval>;
     if (isCooldown && cooldownTimer > 0) {
@@ -57,6 +52,13 @@ export default function BioGenerator() {
     return () => clearInterval(interval);
   }, [isCooldown, cooldownTimer]);
 
+  useEffect(() => {
+    if (!copied) return;
+
+    const timeout = setTimeout(() => setCopied(false), 2000);
+    return () => clearTimeout(timeout);
+  }, [copied]);
+
   const getCurrentPlatform = () => {
     return (
       platforms.find((p) => p.value === platform) || {
@@ -67,14 +69,17 @@ export default function BioGenerator() {
 
   const getCharLimitPercent = () => {
     const currentLimit = getCurrentPlatform().limit;
-    return (charCount / currentLimit) * 100;
+    return (aboutYou.length / currentLimit) * 100;
   };
 
-  const copyToClipboard = () => {
-    navigator.clipboard.writeText(generatedBio);
-    setCopied(true);
-    setTimeout(() => setCopied(false), 2000);
-    sonnar("بایو کپی شد", { icon: "✂️" });
+  const copyToClipboard = async () => {
+    try {
+      await navigator.clipboard.writeText(generatedBio);
+      setCopied(true);
+      sonnar("بایو کپی شد", { icon: "✂️" });
+    } catch {
+      sonnar.error("کپی کردن بایو ممکن نشد.");
+    }
   };
 
   const generateBio = async () => {
@@ -202,6 +207,7 @@ export default function BioGenerator() {
                   </div>
                   {platform && (
                     <span
+                      aria-live="polite"
                       className={`text-xs font-medium px-2 py-0.5 rounded-full ${
                         getCharLimitPercent() > 90
                           ? "bg-destructive/10 text-destructive"
@@ -210,25 +216,30 @@ export default function BioGenerator() {
                           : "bg-emerald-500/10 text-emerald-600"
                       }`}
                     >
-                      {charCount} / {getCurrentPlatform().limit}
+                      {aboutYou.length} / {getCurrentPlatform().limit}
                     </span>
                   )}
                 </div>
+                <label htmlFor="about-you" className="sr-only">
+                  درباره خودت یا پیجت
+                </label>
                 <textarea
+                  id="about-you"
+                  aria-describedby="about-you-help"
                   placeholder="ویژگی یا هرچیزی در مورد خودت یا پیجت بگو..."
                   className="w-full min-h-[90px] sm:min-h-[120px] resize-none rounded-xl px-3 sm:px-4 py-2.5 sm:py-3 text-sm bg-card border border-border text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary/40 transition-all duration-200"
                   value={aboutYou}
                   onChange={(e) => setAboutYou(e.target.value)}
                   maxLength={platform ? getCurrentPlatform().limit : 150}
                 />
-                <p className="text-xs text-muted-foreground mt-2">
+                <p id="about-you-help" className="text-xs text-muted-foreground mt-2">
                   هرچه جزئیات بیشتری بنویسی، بایوی بهتری دریافت می‌کنی
                 </p>
               </section>
 
               {/* Error */}
               {error && (
-                <div className="flex items-start gap-2 p-3 rounded-xl bg-destructive/5 border border-destructive/15">
+                <div role="alert" className="flex items-start gap-2 p-3 rounded-xl bg-destructive/5 border border-destructive/15">
                   <AlertCircle className="h-4 w-4 text-destructive mt-0.5 shrink-0" />
                   <p className="text-destructive text-sm">{error}</p>
                 </div>
@@ -236,7 +247,7 @@ export default function BioGenerator() {
 
               {/* Note */}
               {note && (
-                <div className="flex items-start gap-2 p-3 rounded-xl bg-amber-500/5 border border-amber-500/15">
+                <div role="status" className="flex items-start gap-2 p-3 rounded-xl bg-amber-500/5 border border-amber-500/15">
                   <Info className="h-4 w-4 text-amber-600 mt-0.5 shrink-0" />
                   <p className="text-amber-700 text-sm">{note}</p>
                 </div>
@@ -268,7 +279,7 @@ export default function BioGenerator() {
           </div>
 
           {/* Right panel: Output */}
-          <div ref={outputRef} className="glass-surface rounded-2xl p-4 sm:p-6 lg:p-8">
+          <div ref={outputRef} aria-live="polite" aria-busy={isGenerating} className="glass-surface rounded-2xl p-4 sm:p-6 lg:p-8">
             <OutputPanel
               generatedBio={generatedBio}
               platform={platform}
diff --git a/app/sitemap.ts b/app/sitemap.ts
index 9a70dac..b2006e3 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -4,7 +4,6 @@ export default function sitemap(): MetadataRoute.Sitemap {
   return [
     {
       url: "https://bio.eindev.ir",
-      lastModified: new Date(),
       changeFrequency: "monthly",
       priority: 1,
     },
diff --git a/components/OutputPanel.tsx b/components/OutputPanel.tsx
index fedb8db..1a1e6d2 100644
--- a/components/OutputPanel.tsx
+++ b/components/OutputPanel.tsx
@@ -72,6 +72,7 @@ export default function OutputPanel({
               {error}
             </p>
             <button
+              type="button"
               onClick={onRegenerate}
               className="inline-flex items-center gap-2 px-4 py-2 rounded-xl text-xs font-medium bg-primary text-primary-foreground hover:opacity-90 transition-all duration-200"
             >
@@ -146,6 +147,7 @@ export default function OutputPanel({
         {generatedBio && !isGenerating && !error && (
           <div className="flex gap-3 pt-2 animate-in fade-in slide-in-from-bottom-1 duration-300 delay-200">
             <button
+              type="button"
               onClick={onCopy}
               className={cn(
                 "flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-sm font-medium",
@@ -168,6 +170,7 @@ export default function OutputPanel({
               )}
             </button>
             <button
+              type="button"
               onClick={onRegenerate}
               className="flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-sm font-medium border border-border bg-card text-foreground hover:bg-accent transition-all duration-200"
             >
diff --git a/components/PlatformSelector.tsx b/components/PlatformSelector.tsx
index b1314cf..8bde62f 100644
--- a/components/PlatformSelector.tsx
+++ b/components/PlatformSelector.tsx
@@ -2,6 +2,7 @@
 
 import { Instagram, Linkedin, MessageCircle, Twitter } from "lucide-react";
 import { cn } from "@/lib/utils";
+import { PLATFORM_LIMITS, PLATFORMS } from "@/lib/generation";
 
 export interface Platform {
   value: string;
@@ -10,32 +11,26 @@ export interface Platform {
   limit: number;
 }
 
-export const platforms: Platform[] = [
-  {
-    value: "instagram",
-    label: "اینستاگرام",
-    icon: <Instagram className="h-4 w-4" />,
-    limit: 150,
-  },
-  {
-    value: "twitter",
-    label: "توییتر/ایکس",
-    icon: <Twitter className="h-4 w-4" />,
-    limit: 160,
-  },
-  {
-    value: "linkedin",
-    label: "لینکدین",
-    icon: <Linkedin className="h-4 w-4" />,
-    limit: 220,
-  },
-  {
-    value: "telegram",
-    label: "تلگرام",
-    icon: <MessageCircle className="h-4 w-4" />,
-    limit: 70,
-  },
-];
+const platformLabels: Record<(typeof PLATFORMS)[number], string> = {
+  instagram: "اینستاگرام",
+  twitter: "توییتر/ایکس",
+  linkedin: "لینکدین",
+  telegram: "تلگرام",
+};
+
+const platformIcons: Record<(typeof PLATFORMS)[number], React.ReactNode> = {
+  instagram: <Instagram className="h-4 w-4" />,
+  twitter: <Twitter className="h-4 w-4" />,
+  linkedin: <Linkedin className="h-4 w-4" />,
+  telegram: <MessageCircle className="h-4 w-4" />,
+};
+
+export const platforms: Platform[] = PLATFORMS.map((value) => ({
+  value,
+  label: platformLabels[value],
+  icon: platformIcons[value],
+  limit: PLATFORM_LIMITS[value],
+}));
 
 interface PlatformSelectorProps {
   selected: string;
@@ -47,13 +42,16 @@ export default function PlatformSelector({
   onSelect,
 }: PlatformSelectorProps) {
   return (
-    <div className="grid grid-cols-2 sm:flex sm:flex-wrap gap-2">
+    <div className="grid grid-cols-2 sm:flex sm:flex-wrap gap-2" role="radiogroup" aria-label="شبکه اجتماعی">
       {platforms.map((plat) => {
         const isActive = selected === plat.value;
         return (
           <button
+            type="button"
             key={plat.value}
             onClick={() => onSelect(plat.value)}
+            role="radio"
+            aria-checked={isActive}
             className={cn(
               "relative flex items-center justify-center sm:justify-start gap-1.5 sm:gap-2 px-3 sm:px-4 py-2 sm:py-2.5 rounded-xl text-xs sm:text-sm font-medium",
               "transition-all duration-200 ease-out cursor-pointer",
diff --git a/components/ToneSelector.tsx b/components/ToneSelector.tsx
index 17a1fef..525ad95 100644
--- a/components/ToneSelector.tsx
+++ b/components/ToneSelector.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { cn } from "@/lib/utils";
+import { TONES } from "@/lib/generation";
 
 export interface Tone {
   value: string;
@@ -8,12 +9,17 @@ export interface Tone {
   emoji: string;
 }
 
-export const tones: Tone[] = [
-  { value: "professional", label: "حرفه‌ای", emoji: "💼" },
-  { value: "friendly", label: "دوستانه", emoji: "😊" },
-  { value: "creative", label: "خلاقانه", emoji: "🎨" },
-  { value: "humorous", label: "طنز", emoji: "😂" },
-];
+const toneMetadata: Record<(typeof TONES)[number], Omit<Tone, "value">> = {
+  professional: { label: "حرفه‌ای", emoji: "💼" },
+  friendly: { label: "دوستانه", emoji: "😊" },
+  creative: { label: "خلاقانه", emoji: "🎨" },
+  humorous: { label: "طنز", emoji: "😂" },
+};
+
+export const tones: Tone[] = TONES.map((value) => ({
+  value,
+  ...toneMetadata[value],
+}));
 
 interface ToneSelectorProps {
   selected: string;
@@ -25,13 +31,16 @@ export default function ToneSelector({
   onSelect,
 }: ToneSelectorProps) {
   return (
-    <div className="grid grid-cols-2 sm:flex sm:flex-wrap gap-2">
+    <div className="grid grid-cols-2 sm:flex sm:flex-wrap gap-2" role="radiogroup" aria-label="نوع بایو">
       {tones.map((t) => {
         const isActive = selected === t.value;
         return (
           <button
+            type="button"
             key={t.value}
             onClick={() => onSelect(t.value)}
+            role="radio"
+            aria-checked={isActive}
             className={cn(
               "flex items-center justify-center sm:justify-start gap-1.5 sm:gap-2 px-3 sm:px-4 py-2 sm:py-2.5 rounded-xl text-xs sm:text-sm font-medium",
               "transition-all duration-200 ease-out cursor-pointer",
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 7d2d95e..56be9df 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,22 +1,17 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
-RUN mkdir -p /app
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
 
-WORKDIR /app
-
-COPY package.json /app
+RUN corepack enable
 
-RUN npm install -g next
+WORKDIR /app
 
-RUN npm install
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --frozen-lockfile
 
 COPY . /app
 
-RUN mkdir -p /app/.next/cache/images
-VOLUME /app/.next/cache/images
-
-RUN npm run build
-
 EXPOSE 3000
 
-CMD npm run start
\ No newline at end of file
+CMD ["pnpm", "dev"]
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 9d0238f..36e4518 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -3,10 +3,17 @@ services:
   biogpt:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: dev.Dockerfile
     restart: always
     volumes:
       - /app/node_modules
       - /app/.next
     ports:
-      - "3000:3000"
\ No newline at end of file
+      - "3000:3000"
+    environment:
+      NODE_ENV: development
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3000/"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index af2e002..5b0bd97 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,14 +6,24 @@ services:
     build:
       context: .
       dockerfile: prod.Dockerfile
-      args:
-        ENV_VARIABLE: ${ENV_VARIABLE}
-        NEXT_PUBLIC_ENV_VARIABLE: ${NEXT_PUBLIC_ENV_VARIABLE}
     restart: always
     ports:
       - 3000:3000
+    environment:
+      NODE_ENV: production
+      NEXT_OPENAI_API_KEY: ${NEXT_OPENAI_API_KEY}
+      NEXT_LLM_MODEL: ${NEXT_LLM_MODEL:-gpt-4o}
+      REDIS_URL: ${REDIS_URL}
+      REDIS_TOKEN: ${REDIS_TOKEN}
+      RATE_LIMIT_WINDOW: ${RATE_LIMIT_WINDOW:-60000}
+      RATE_LIMIT_MAX: ${RATE_LIMIT_MAX:-10}
     networks:
       - biogpt_network
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3000/"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
 
   # Add more containers below (nginx, postgres, etc.)
 
@@ -21,4 +31,4 @@ services:
 # with each other, by using their container name as a hostname
 networks:
   biogpt_network:
-    external: true
\ No newline at end of file
+    driver: bridge
\ No newline at end of file
diff --git a/lib/generation.ts b/lib/generation.ts
new file mode 100644
index 0000000..45fd96a
--- /dev/null
+++ b/lib/generation.ts
@@ -0,0 +1,41 @@
+import { z } from "zod";
+
+export const PLATFORMS = [
+  "instagram",
+  "twitter",
+  "linkedin",
+  "telegram",
+] as const;
+
+export const TONES = [
+  "professional",
+  "friendly",
+  "creative",
+  "humorous",
+] as const;
+
+export const PLATFORM_LIMITS: Record<(typeof PLATFORMS)[number], number> = {
+  instagram: 150,
+  twitter: 160,
+  linkedin: 220,
+  telegram: 70,
+};
+
+export const MAX_ABOUT_YOU_LENGTH = 2000;
+
+export const generateBioRequestSchema = z.object({
+  aboutYou: z.string().trim().min(1).max(MAX_ABOUT_YOU_LENGTH),
+  platform: z.enum(PLATFORMS),
+  tone: z.enum(TONES),
+  language: z.string().optional(),
+});
+
+export type GenerateBioRequest = z.infer<typeof generateBioRequestSchema>;
+
+export function normalizeGeneratedBio(text: string, platform: GenerateBioRequest["platform"]): string {
+  return text
+    .replace(/\s+/g, " ")
+    .trim()
+    .slice(0, PLATFORM_LIMITS[platform])
+    .trim();
+}
diff --git a/lib/rate-limit.ts b/lib/rate-limit.ts
index d7f57ca..36c975a 100644
--- a/lib/rate-limit.ts
+++ b/lib/rate-limit.ts
@@ -3,8 +3,14 @@ import { getUserIp } from "./get-ip";
 
 const REDIS_URL = process.env.REDIS_URL;
 const REDIS_TOKEN = process.env.REDIS_TOKEN;
-const RATE_LIMIT_WINDOW = parseInt(process.env.RATE_LIMIT_WINDOW || "60000", 10);
-const RATE_LIMIT_MAX = parseInt(process.env.RATE_LIMIT_MAX || "10", 10);
+const configuredWindow = Number(process.env.RATE_LIMIT_WINDOW || 60000);
+const configuredMax = Number(process.env.RATE_LIMIT_MAX || 10);
+const RATE_LIMIT_WINDOW = Number.isFinite(configuredWindow) && configuredWindow > 0
+  ? configuredWindow
+  : 60000;
+const RATE_LIMIT_MAX = Number.isFinite(configuredMax) && configuredMax > 0
+  ? Math.floor(configuredMax)
+  : 10;
 
 let redis: Redis | null = null;
 let useRedis = false;
@@ -51,6 +57,13 @@ export class RateLimitError extends Error {
   }
 }
 
+export class RateLimitUnavailableError extends Error {
+  constructor() {
+    super("Rate limiting service unavailable");
+    this.name = "RateLimitUnavailableError";
+  }
+}
+
 export async function checkRateLimit(key: string): Promise<boolean> {
   if (useRedis && redis) {
     return checkRedisRateLimit(key);
@@ -59,27 +72,21 @@ export async function checkRateLimit(key: string): Promise<boolean> {
 }
 
 async function checkRedisRateLimit(key: string): Promise<boolean> {
-  if (!redis) return false;
+  if (!redis) throw new RateLimitUnavailableError();
 
   const redisKey = `ratelimit:${key}`;
 
   try {
-    const current = await redis.get<number>(redisKey);
+    const current = await redis.incr(redisKey);
 
-    if (!current) {
-      await redis.setex(redisKey, Math.ceil(RATE_LIMIT_WINDOW / 1000), 1);
-      return true;
+    if (current === 1) {
+      await redis.expire(redisKey, Math.ceil(RATE_LIMIT_WINDOW / 1000));
     }
 
-    if (current >= RATE_LIMIT_MAX) {
-      return false;
-    }
-
-    await redis.incr(redisKey);
-    return true;
+    return current <= RATE_LIMIT_MAX;
   } catch (error) {
     console.error("Redis rate limit error:", error);
-    return checkMemoryRateLimit(key);
+    throw new RateLimitUnavailableError();
   }
 }
 
diff --git a/next.config.js b/next.config.js
index 66e36a3..a861415 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
-  // output: 'export',
+  output: "standalone",
   reactStrictMode: true,
   async headers() {
     return [
diff --git a/package.json b/package.json
index b4172fe..738249e 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,14 @@
   "version": "1.0.0",
   "description": "bio generator to social media",
   "private": true,
+  "packageManager": "pnpm@10.27.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit",
+    "test:watch": "vitest",
     "yarn run clean": "rm -rf node_modules **/node_modules && rm -rf yarn.lock **/yarn.lock && yarn cache clean && yarn install"
   },
   "dependencies": {
diff --git a/prod.Dockerfile b/prod.Dockerfile
index 72e91ba..eb800d7 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -1,4 +1,9 @@
-FROM node:18-alpine AS base
+FROM node:20-alpine AS base
+
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+RUN corepack enable
 
 # Step 1. Rebuild the source code only when needed
 FROM base AS builder
@@ -6,20 +11,10 @@ FROM base AS builder
 WORKDIR /app
 
 # Install dependencies based on the preferred package manager
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
-# Omit --production flag for TypeScript devDependencies
-RUN \
-  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i; \
-  # Allow install without lockfile, so example works even without Node.js installed locally
-  else echo "Warning: Lockfile not found. It is recommended to commit lockfiles to version control." && yarn install; \
-  fi
-
-COPY src ./src
-COPY public ./public
-COPY next.config.js .
-COPY tsconfig.json .
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install --frozen-lockfile
+
+COPY . .
 
 # Environment variables must be present at build time
 # https://github.com/vercel/next.js/discussions/14030
@@ -33,12 +28,7 @@ ENV NEXT_PUBLIC_ENV_VARIABLE=${NEXT_PUBLIC_ENV_VARIABLE}
 # ENV NEXT_TELEMETRY_DISABLED 1
 
 # Build Next.js based on the preferred package manager
-RUN \
-  if [ -f yarn.lock ]; then yarn build; \
-  elif [ -f package-lock.json ]; then npm run build; \
-  elif [ -f pnpm-lock.yaml ]; then pnpm build; \
-  else yarn build; \
-  fi
+RUN pnpm build
 
 # Note: It is not necessary to add an intermediate step that does a full copy of `node_modules` here
 
@@ -52,6 +42,10 @@ RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 USER nextjs
 
+ENV NODE_ENV=production
+ENV PORT=3000
+ENV HOSTNAME=0.0.0.0
+
 COPY --from=builder /app/public ./public
 
 # Automatically leverage output traces to reduce image size
@@ -68,6 +62,9 @@ ENV NEXT_PUBLIC_ENV_VARIABLE=${NEXT_PUBLIC_ENV_VARIABLE}
 # Uncomment the following line to disable telemetry at run time
 # ENV NEXT_TELEMETRY_DISABLED 1
 
-# Note: Don't expose ports here, Compose will handle that for us
+EXPOSE 3000
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/ || exit 1
 
 CMD ["node", "server.js"]
\ No newline at end of file
diff --git a/tests/generation.test.ts b/tests/generation.test.ts
new file mode 100644
index 0000000..04a540b
--- /dev/null
+++ b/tests/generation.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import {
+  generateBioRequestSchema,
+  normalizeGeneratedBio,
+  PLATFORM_LIMITS,
+} from "@/lib/generation";
+
+describe("generation validation", () => {
+  it("accepts the supported request shape", () => {
+    const result = generateBioRequestSchema.safeParse({
+      aboutYou: "طراح محصول و علاقه‌مند به فناوری",
+      platform: "instagram",
+      tone: "creative",
+      language: "persian",
+    });
+
+    expect(result.success).toBe(true);
+  });
+
+  it("rejects unsupported platforms and empty descriptions", () => {
+    expect(
+      generateBioRequestSchema.safeParse({
+        aboutYou: "",
+        platform: "tiktok",
+        tone: "friendly",
+      }).success,
+    ).toBe(false);
+  });
+
+  it("normalizes whitespace and respects platform limits", () => {
+    const longBio = `  ${"بایو ".repeat(100)}  `;
+    const normalized = normalizeGeneratedBio(longBio, "telegram");
+
+    expect(normalized.length).toBeLessThanOrEqual(PLATFORM_LIMITS.telegram);
+    expect(normalized).not.toMatch(/\s{2,}/);
+    expect(normalized).not.toMatch(/^\s|\s$/);
+  });
+});