diff --git a/.claude/skills/open-pr/SKILL.md b/.claude/skills/open-pr/SKILL.md
new file mode 100644
index 00000000..d51e6b1a
--- /dev/null
+++ b/.claude/skills/open-pr/SKILL.md
@@ -0,0 +1,71 @@
+---
+name: open-pr
+description: Generate a PR title and description following the WCC repo template, infer change types from the diff, and print the GitHub URL to open the PR in the browser. Use when asked to open a PR or create a pull request.
+disable-model-invocation: true
+allowed-tools: Bash, Read, Glob
+---
+
+# Open PR Skill
+
+> **Canonical runbook**: `.ai/skills/open-pr.md`
+> This file is the Claude Code adapter. The workflow logic is defined in the canonical skill
+> so it can be shared with other agents (Codex, Copilot, Cursor). Any changes to the workflow
+> should be made in `.ai/skills/open-pr.md` first.
+
+## Workflow
+
+1. Gather context in parallel:
+   - `git log main..HEAD --oneline` — commits in this PR
+   - `git diff main...HEAD --stat` — files changed
+   - `git branch --show-current` — current branch name
+   - Read `.github/PULL_REQUEST_TEMPLATE.md`
+
+2. Determine change types by mapping conventional-commit prefixes and the nature of the diff:
+
+   | Conventional prefix      | PR Change Type |
+   | ------------------------ | -------------- |
+   | `feat`                   | New Feature    |
+   | `fix`                    | Bug Fix        |
+   | `refactor`               | Code Refactor  |
+   | `docs` / `doc`           | Documentation  |
+   | `test`                   | Test           |
+   | `chore` / `ci` / `build` | Other          |
+
+   Only keep the change types present in this PR — remove the rest from the template.
+
+3. Suggest a PR title using Conventional Commits format: `<type>: <short imperative description>` (50–72 chars). When multiple types apply, use the most significant: `feat` > `fix` > `refactor` > `test` > `docs` > `chore`.
+
+4. Generate the filled-in PR description. Pre-check only the applicable change type boxes; remove the inapplicable ones entirely. Write all prose sections (Description, Related Issue) as flowing paragraphs — do NOT wrap lines at any character limit. Each sentence or logical thought should continue on the same line so that GitHub renders the text correctly without unwanted line breaks.
+
+5. **Screenshots section** — decide based on changed files:
+   - Frontend changes (`admin-wcc-app/**`, `*.tsx`, `*.css`, components, pages): include the section and list the specific screenshots needed (before/after UI, error states, label/title changes, GIF for interactions). Emphasise that screenshots are required for the reviewer to assess visual changes.
+   - Backend API changes (new/changed controllers or endpoints): include the section asking for Swagger UI screenshots (`/swagger-ui/index.html`).
+   - Only `test`, `docs`, `chore`, `ci`, or `refactor` with no endpoint changes: **omit the Screenshots section entirely**.
+
+6. **Pull request checklist** — always include the contributor guide checkbox. Include "I have tested my changes locally" only for `feat`, `fix`, `refactor`, or frontend changes — omit it for pure `docs`, `chore`, or `ci` changes.
+
+7. Derive the contributor's GitHub username from the `origin` remote:
+
+   ```bash
+   git remote get-url origin
+   # https://github.com/<username>/wcc-backend.git  or  git@github.com:<username>/wcc-backend.git
+   ```
+
+   Extract `<username>` from the URL (path segment before `/wcc-backend`).
+
+   Print:
+   - **Suggested PR title** (plain text)
+   - **PR description** (markdown code block)
+   - **GitHub compare URL**: `https://github.com/Women-Coding-Community/wcc-backend/compare/main...<username>:<branch-name>`
+   - Remind the user to add screenshots before submitting if required
+
+## Rules
+
+- **Never hard-wrap prose** — description text must not have forced line breaks mid-sentence or mid-paragraph; let GitHub reflow the text naturally
+
+- Always target `main` on `Women-Coding-Community/wcc-backend` (upstream)
+- Never use `gh pr create` — fork permissions require the user to open the PR through the browser
+- If the issue number cannot be found in branch name or commits, use `#?` and ask the user
+- Never include change type checkboxes for types not present in the diff
+- Never include the Screenshots section for pure test/docs/chore/ci changes
+- Never include "I have tested my changes locally" for pure docs/chore/ci changes
diff --git a/src/__tests__/api/mentee-registration.test.ts b/src/__tests__/api/mentee-registration.test.ts
index 8ea3fc73..1a62c3a4 100644
--- a/src/__tests__/api/mentee-registration.test.ts
+++ b/src/__tests__/api/mentee-registration.test.ts
@@ -1,7 +1,14 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
+import * as api from '../../lib/api';
 import handler from '../../pages/api/mentee-registration';
 
+jest.mock('../../lib/api', () => ({
+  __esModule: true,
+  ...jest.requireActual('../../lib/api'),
+  proxyRequest: jest.fn(),
+}));
+
 const makeReq = (overrides: Partial<NextApiRequest> = {}): NextApiRequest =>
   ({
     method: 'POST',
@@ -20,18 +27,7 @@ const makeRes = (): NextApiResponse => {
 };
 
 describe('mentee-registration API handler', () => {
-  const originalEnv = process.env;
-
-  beforeEach(() => {
-    process.env = {
-      ...originalEnv,
-      API_BASE_URL: 'http://localhost:8080/api/cms/v1',
-      API_KEY: 'test-key',
-    };
-  });
-
   afterEach(() => {
-    process.env = originalEnv;
     jest.resetAllMocks();
   });
 
@@ -46,66 +42,35 @@ describe('mentee-registration API handler', () => {
     expect(res.json).toHaveBeenCalledWith({ error: 'Method GET Not Allowed' });
   });
 
-  it('returns 500 when API_BASE_URL is missing', async () => {
-    delete process.env.API_BASE_URL;
-    const req = makeReq();
-    const res = makeRes();
-
-    await handler(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(500);
-    expect(res.json).toHaveBeenCalledWith({
-      error: 'Server configuration error',
-    });
-  });
-
-  it('returns 500 when API_KEY is missing', async () => {
-    delete process.env.API_KEY;
-    const req = makeReq();
-    const res = makeRes();
-
-    await handler(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(500);
-    expect(res.json).toHaveBeenCalledWith({
-      error: 'Server configuration error',
-    });
-  });
-
   it('proxies POST to the platform endpoint and returns 201 on success', async () => {
     const responseBody = { id: 42 };
-    globalThis.fetch = jest.fn().mockResolvedValue({
-      ok: true,
-      status: 201,
-      json: jest.fn().mockResolvedValue(responseBody),
-    });
+    (api.proxyRequest as jest.Mock).mockResolvedValue(responseBody);
 
     const req = makeReq();
     const res = makeRes();
 
     await handler(req, res);
 
-    expect(globalThis.fetch).toHaveBeenCalledWith(
-      'http://localhost:8080/api/platform/v1/mentees',
+    expect(api.proxyRequest).toHaveBeenCalledWith(
+      'mentees',
       expect.objectContaining({
         method: 'POST',
-        headers: expect.objectContaining({
-          'X-API-KEY': 'test-key',
-          'Content-Type': 'application/json',
-        }),
+        data: req.body,
       }),
+      true,
     );
     expect(res.status).toHaveBeenCalledWith(201);
     expect(res.json).toHaveBeenCalledWith(responseBody);
   });
 
   it('forwards backend error status and message on failure', async () => {
-    const errorBody = { message: 'Email already registered' };
-    globalThis.fetch = jest.fn().mockResolvedValue({
-      ok: false,
-      status: 409,
-      json: jest.fn().mockResolvedValue(errorBody),
-    });
+    const errorResponse = {
+      response: {
+        status: 409,
+        data: { message: 'Email already registered' },
+      },
+    };
+    (api.proxyRequest as jest.Mock).mockRejectedValue(errorResponse);
 
     const req = makeReq();
     const res = makeRes();
@@ -113,15 +78,13 @@ describe('mentee-registration API handler', () => {
     await handler(req, res);
 
     expect(res.status).toHaveBeenCalledWith(409);
-    expect(res.json).toHaveBeenCalledWith(errorBody);
+    expect(res.json).toHaveBeenCalledWith(errorResponse.response.data);
   });
 
-  it('falls back to generic error when backend returns no body', async () => {
-    globalThis.fetch = jest.fn().mockResolvedValue({
-      ok: false,
-      status: 500,
-      json: jest.fn().mockRejectedValue(new Error('no body')),
-    });
+  it('returns 500 on unexpected error', async () => {
+    (api.proxyRequest as jest.Mock).mockRejectedValue(
+      new Error('Network failure'),
+    );
 
     const req = makeReq();
     const res = makeRes();
@@ -129,15 +92,13 @@ describe('mentee-registration API handler', () => {
     await handler(req, res);
 
     expect(res.status).toHaveBeenCalledWith(500);
-    expect(res.json).toHaveBeenCalledWith({
-      error: 'Registration failed. Please try again.',
-    });
+    expect(res.json).toHaveBeenCalledWith({ error: 'Internal server error' });
   });
 
-  it('returns 500 on network error', async () => {
-    globalThis.fetch = jest
-      .fn()
-      .mockRejectedValue(new Error('Network failure'));
+  it('returns 500 when server configuration error occurs', async () => {
+    (api.proxyRequest as jest.Mock).mockRejectedValue(
+      new Error('Server configuration error'),
+    );
 
     const req = makeReq();
     const res = makeRes();
@@ -145,6 +106,8 @@ describe('mentee-registration API handler', () => {
     await handler(req, res);
 
     expect(res.status).toHaveBeenCalledWith(500);
-    expect(res.json).toHaveBeenCalledWith({ error: 'Internal server error' });
+    expect(res.json).toHaveBeenCalledWith({
+      error: 'Server configuration error',
+    });
   });
 });
diff --git a/src/__tests__/api/mentor-registration.test.ts b/src/__tests__/api/mentor-registration.test.ts
new file mode 100644
index 00000000..e672eb8a
--- /dev/null
+++ b/src/__tests__/api/mentor-registration.test.ts
@@ -0,0 +1,171 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+
+import * as api from '../../lib/api';
+import handler from '../../pages/api/mentor-registration';
+
+jest.mock('../../lib/api', () => ({
+  __esModule: true,
+  ...jest.requireActual('../../lib/api'),
+  proxyRequest: jest.fn(),
+}));
+
+const makeReq = (overrides: Partial<NextApiRequest> = {}): NextApiRequest =>
+  ({
+    method: 'POST',
+    body: {
+      fullName: 'Jane Doe',
+      email: 'jane@example.com',
+      slackDisplayName: 'janedoe',
+      country: 'United Kingdom',
+      city: 'London',
+      position: 'Software Engineer',
+      companyName: 'Tech Co',
+      isLongTermMentor: true,
+      maxMentees: '2',
+      calendlyLink: 'https://calendly.com/janedoe',
+      menteeExpectations: 'Eager to learn and proactive.',
+      openToNonWomen: true,
+      languages: ['English'],
+      yearsExperience: 5,
+      bio: 'A passionate developer with 5 years of experience.',
+      technicalAreas: [
+        { technicalArea: 'Fullstack', proficiencyLevel: 'Advanced' },
+      ],
+      codeLanguages: [{ language: 'C++', proficiencyLevel: 'Advanced' }],
+      mentorshipFocusAreas: ['Career advice'],
+      linkedin: 'https://linkedin.com/in/janedoe',
+      identity: 'Yes',
+      pronouns: 'she/her',
+      socialHighlight: 'Yes',
+      termsAgreed: true,
+    },
+    ...overrides,
+  }) as NextApiRequest;
+
+const makeRes = (): NextApiResponse => {
+  const res = {
+    status: jest.fn(),
+    json: jest.fn(),
+    setHeader: jest.fn(),
+  } as unknown as NextApiResponse;
+  (res.status as jest.Mock).mockReturnValue(res);
+  return res;
+};
+
+describe('mentor-registration API handler', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('returns 405 for non-POST methods', async () => {
+    const req = makeReq({ method: 'GET' });
+    const res = makeRes();
+
+    await handler(req, res);
+
+    expect(res.setHeader).toHaveBeenCalledWith('Allow', ['POST']);
+    expect(res.status).toHaveBeenCalledWith(405);
+  });
+
+  it('proxies POST to the platform endpoint and correctly maps data', async () => {
+    const responseBody = { id: 123 };
+    (api.proxyRequest as jest.Mock).mockResolvedValue(responseBody);
+
+    const req = makeReq();
+    const res = makeRes();
+
+    await handler(req, res);
+
+    expect(api.proxyRequest).toHaveBeenCalledWith(
+      'mentors',
+      expect.objectContaining({
+        method: 'POST',
+        data: expect.objectContaining({
+          fullName: 'Jane Doe',
+          pronounCategory: 'FEMININE',
+          country: {
+            countryCode: 'GB',
+            countryName: 'United Kingdom',
+          },
+          skills: expect.objectContaining({
+            yearsExperience: 5,
+            areas: [
+              { technicalArea: 'FULLSTACK', proficiencyLevel: 'ADVANCED' },
+            ],
+            languages: [
+              { language: 'C_PLUS_PLUS', proficiencyLevel: 'ADVANCED' },
+            ],
+          }),
+          menteeSection: expect.objectContaining({
+            longTerm: expect.objectContaining({
+              numMentee: 2,
+            }),
+          }),
+          network: expect.arrayContaining([
+            {
+              type: 'LINKEDIN',
+              link: 'https://linkedin.com/in/janedoe',
+            },
+          ]),
+        }),
+      }),
+      true,
+    );
+
+    expect(res.status).toHaveBeenCalledWith(201);
+    expect(res.json).toHaveBeenCalledWith(responseBody);
+  });
+
+  it('handles backend errors', async () => {
+    const errorResponse = {
+      response: {
+        status: 400,
+        data: { message: 'Invalid data' },
+      },
+    };
+    (api.proxyRequest as jest.Mock).mockRejectedValue(errorResponse);
+
+    const req = makeReq();
+    const res = makeRes();
+
+    await handler(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.json).toHaveBeenCalledWith(errorResponse.response.data);
+  });
+
+  it('correctly maps adHocAvailability and handles empty values', async () => {
+    (api.proxyRequest as jest.Mock).mockResolvedValue({ id: 123 });
+
+    const req = makeReq({
+      body: {
+        ...makeReq().body,
+        isAdHocMentor: true,
+        adHocAvailability: {
+          January: '2',
+          February: '',
+          March: undefined,
+          April: '3',
+        },
+      },
+    });
+    const res = makeRes();
+
+    await handler(req, res);
+
+    expect(api.proxyRequest).toHaveBeenCalledWith(
+      'mentors',
+      expect.objectContaining({
+        data: expect.objectContaining({
+          menteeSection: expect.objectContaining({
+            adHoc: [
+              { month: 1, hours: 2 },
+              { month: 4, hours: 3 },
+            ],
+          }),
+        }),
+      }),
+      true,
+    );
+  });
+});
diff --git a/src/components/MentorBecomeCard.tsx b/src/components/MentorBecomeCard.tsx
index fe3789d6..6e3fb2ef 100644
--- a/src/components/MentorBecomeCard.tsx
+++ b/src/components/MentorBecomeCard.tsx
@@ -59,7 +59,6 @@ export const MentorBecomeCard = ({
         ))}
       </ol>
       <Button
-        target="_blank"
         variant="contained"
         sx={{
           backgroundColor: '#226488',
diff --git a/src/components/mentorship/Step1BasicInfo.tsx b/src/components/mentorship/Step1BasicInfo.tsx
index f0beb860..57ead8ea 100644
--- a/src/components/mentorship/Step1BasicInfo.tsx
+++ b/src/components/mentorship/Step1BasicInfo.tsx
@@ -440,7 +440,7 @@ const Step1BasicInfo = () => {
                       ? String(field.value)
                       : ''
                   }
-                  onChange={(e) => field.onChange(e.target.value)}
+                  onChange={(e) => field.onChange(e.target.value === 'true')}
                 >
                   <FormControlLabel
                     value="true"
diff --git a/src/components/mentorship/Step2Skills.tsx b/src/components/mentorship/Step2Skills.tsx
index 5352b448..2cf348b4 100644
--- a/src/components/mentorship/Step2Skills.tsx
+++ b/src/components/mentorship/Step2Skills.tsx
@@ -12,10 +12,7 @@ import {
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 
-import {
-  MENTOR_EXPERIENCE_LEVELS,
-  SPOKEN_LANGUAGES,
-} from '@utils/mentorshipConstants';
+import { SPOKEN_LANGUAGES } from '@utils/mentorshipConstants';
 
 import StepSection from './StepSection';
 
@@ -47,7 +44,6 @@ const helperTextStyle = {
 };
 
 const LANGUAGES = SPOKEN_LANGUAGES.map((lang) => lang.label);
-const EXPERIENCE = MENTOR_EXPERIENCE_LEVELS;
 
 const Step2Skills = () => {
   const {
@@ -109,20 +105,14 @@ const Step2Skills = () => {
             How many years of experience do you have in tech? *
           </Typography>
           <TextField
-            select
             fullWidth
-            defaultValue=""
+            type="number"
             {...register('yearsExperience')}
             error={!!errors.yearsExperience}
             helperText={errors.yearsExperience?.message as string}
             sx={inputStyle}
-          >
-            {EXPERIENCE.map((exp) => (
-              <MenuItem key={exp} value={exp}>
-                {exp}
-              </MenuItem>
-            ))}
-          </TextField>
+            inputProps={{ min: 2, max: 50, step: 1 }}
+          />
         </Grid>
 
         <Grid item xs={12}>
@@ -186,28 +176,7 @@ const Step2Skills = () => {
             sx={inputStyle}
           />
           <Typography sx={helperTextStyle}>
-            This information will be displayed in your mentor profile on the
-            programme website.
-          </Typography>
-        </Grid>
-
-        <Grid item xs={12}>
-          <Typography variant="subtitle2" sx={boldLabelStyle}>
-            Which photo should we use to show your profile as a mentor on our
-            website? *
-          </Typography>
-
-          <TextField
-            fullWidth
-            placeholder="https://linkedin.com/in/yourname (or any public profile image URL)"
-            {...register('imageUrl')}
-            error={!!errors.imageUrl}
-            helperText={errors.imageUrl?.message as string}
-            sx={{ ...inputStyle, mt: 1 }}
-          />
-          <Typography sx={helperTextStyle}>
-            Please share a link to your profile photo from LinkedIn or any
-            public profile.
+            This information will be displayed in your mentor profile.
           </Typography>
         </Grid>
       </Grid>
diff --git a/src/lib/__tests__/api.test.ts b/src/lib/__tests__/api.test.ts
new file mode 100644
index 00000000..2c227e94
--- /dev/null
+++ b/src/lib/__tests__/api.test.ts
@@ -0,0 +1,92 @@
+import type * as ApiModule from '../api';
+
+jest.mock('axios', () => {
+  const mockAxios = jest.fn();
+  (mockAxios as any).create = jest.fn(() => mockAxios);
+  (mockAxios as any).get = jest.fn();
+  (mockAxios as any).post = jest.fn();
+  return {
+    __esModule: true,
+    default: mockAxios,
+  };
+});
+
+describe('API Fetch Functions', () => {
+  let fetchFooter: (typeof ApiModule)['fetchFooter'];
+  let fetchData: (typeof ApiModule)['fetchData'];
+  let mockedAxios: jest.Mock;
+  const originalEnv = process.env;
+
+  beforeEach(async () => {
+    jest.resetModules();
+    process.env = {
+      ...originalEnv,
+      API_BASE_URL: 'http://localhost:8080/api/cms/v1',
+      API_KEY: 'test-key',
+    };
+    // Re-import after setting env so module-level constants pick them up
+    const api = await import('../api');
+    fetchFooter = api.fetchFooter;
+    fetchData = api.fetchData;
+    mockedAxios = (await import('axios')).default as unknown as jest.Mock;
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+    jest.clearAllMocks();
+  });
+
+  describe('fetchFooter', () => {
+    it('should return footer data when API call is successful', async () => {
+      const mockFooterData = { footer: 'Footer content' };
+      mockedAxios.mockResolvedValue({
+        status: 200,
+        data: mockFooterData,
+      });
+
+      const result = await fetchFooter();
+      expect(result).toEqual(mockFooterData);
+      expect(mockedAxios).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: expect.stringContaining('/footer'),
+        }),
+      );
+    });
+
+    it('should return fallback data when API call fails', async () => {
+      mockedAxios.mockRejectedValue(new Error('API Error'));
+
+      const result = await fetchFooter();
+      expect(result).toEqual(expect.objectContaining({ title: 'Follow Us' }));
+    });
+  });
+
+  describe('fetchData', () => {
+    it('should return data and footer when API calls are successful', async () => {
+      const mockData = { key: 'value' };
+      const mockFooterData = { footer: 'Footer content' };
+
+      mockedAxios
+        .mockResolvedValueOnce({ status: 200, data: mockData })
+        .mockResolvedValueOnce({ status: 200, data: mockFooterData });
+
+      const result = await fetchData('test-path');
+
+      expect(result).toEqual({ data: mockData, footer: mockFooterData });
+      expect(mockedAxios).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: expect.stringContaining('/test-path'),
+        }),
+      );
+    });
+
+    it('should return fallback data when fetchData API call fails', async () => {
+      mockedAxios.mockRejectedValue(new Error('API Error'));
+
+      const result = await fetchData('landingPage');
+      expect(result.data).toEqual(
+        expect.objectContaining({ id: 'page:LANDING_PAGE' }),
+      );
+    });
+  });
+});
diff --git a/src/lib/api.test.ts b/src/lib/api.test.ts
deleted file mode 100644
index 352b5d24..00000000
--- a/src/lib/api.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import axios from 'axios';
-
-import { fetchData, fetchFooter } from './api';
-
-jest.mock('axios');
-
-// @TODO the checks for failing API calls are skipped due to temporary fix whenever database is down
-
-describe('API Fetch Functions', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('fetchFooter', () => {
-    it('should return footer data when API call is successful', async () => {
-      const mockFooterData = { footer: 'Footer content' };
-      (axios.get as jest.MockedFunction<typeof axios.get>).mockResolvedValue({
-        status: 200,
-        data: mockFooterData,
-      });
-
-      const result = await fetchFooter();
-      expect(result).toEqual(mockFooterData);
-      expect(axios.get).toHaveBeenCalledWith(
-        `${process.env.API_BASE_URL}/footer`,
-        {
-          headers: { 'X-API-KEY': process.env.API_KEY },
-        },
-      );
-    });
-
-    it.skip('should throw an error when API call fails', async () => {
-      (axios.get as jest.MockedFunction<typeof axios.get>).mockRejectedValue(
-        new Error('API Error'),
-      );
-
-      await expect(fetchFooter()).rejects.toThrow('Failed to fetch footer');
-    });
-  });
-
-  describe('fetchData', () => {
-    it('should return data and footer when API calls are successful', async () => {
-      const mockData = { key: 'value' };
-      const mockFooterData = { footer: 'Footer content' };
-
-      (axios.get as jest.MockedFunction<typeof axios.get>)
-        .mockResolvedValueOnce({ status: 200, data: mockData })
-        .mockResolvedValueOnce({ status: 200, data: mockFooterData });
-
-      const result = await fetchData('test-path');
-
-      expect(result).toEqual({ data: mockData, footer: mockFooterData });
-      expect(axios.get).toHaveBeenCalledWith(
-        `${process.env.API_BASE_URL}/test-path`,
-        {
-          headers: { 'X-API-KEY': process.env.API_KEY },
-        },
-      );
-      expect(axios.get).toHaveBeenCalledWith(
-        `${process.env.API_BASE_URL}/footer`,
-        {
-          headers: { 'X-API-KEY': process.env.API_KEY },
-        },
-      );
-    });
-
-    it.skip('should throw an error when fetchData API call fails', async () => {
-      (
-        axios.get as jest.MockedFunction<typeof axios.get>
-      ).mockRejectedValueOnce(new Error('API Error'));
-
-      await expect(fetchData('test-path')).rejects.toThrow(
-        'Failed to fetch data',
-      );
-    });
-  });
-});
diff --git a/src/lib/api.ts b/src/lib/api.ts
index eb6cbd3f..50317f86 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -1,5 +1,6 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 import { logger } from 'bs-logger';
+import { NextApiResponse } from 'next';
 
 import aboutUsPage from './responses/aboutUs.json';
 import aboutUsTeam from './responses/aboutUsTeam.json';
@@ -21,6 +22,41 @@ const client = axios.create({
   timeout: 5000,
 });
 
+/**
+ * Shared request handler for API routes to avoid duplication.
+ */
+export const proxyRequest = async (
+  path: string,
+  options: AxiosRequestConfig = {},
+  usePlatformApi = false,
+) => {
+  if (!apiBaseUrl || !API_KEY) {
+    logger.error(
+      'Server configuration error: API_BASE_URL or API_KEY is missing',
+    );
+    throw new Error('Server configuration error');
+  }
+
+  let url = `${apiBaseUrl}/${path}`;
+
+  if (usePlatformApi) {
+    // Derive platform API host from CMS API URL (e.g., http://host/api/cms/v1 -> http://host/api/platform/v1)
+    const host = apiBaseUrl.split('/api/')[0];
+    url = `${host}/api/platform/v1/${path}`;
+  }
+
+  try {
+    const response = await client({
+      url,
+      ...options,
+    });
+    return response.data;
+  } catch (error: any) {
+    logger.error(`API request failed for ${url}: ${error.message}`);
+    throw error;
+  }
+};
+
 const pageData = {
   landingPage: landingPageData,
   'mentorship/overview': mentorShipPage,
@@ -36,46 +72,37 @@ const pageData = {
 
 export const fetchData = async (path: string) => {
   try {
-    logger.info(
-      `Attempting to fetchData for ${apiBaseUrl}/${path} with ${API_KEY}`,
-    );
-    const response = await client.get(`${apiBaseUrl}/${path}`, {
-      headers: {
-        'X-API-KEY': API_KEY,
-      },
-    });
-
-    const footerData = await fetchFooter();
-    return {
-      data: response.data,
-      footer: footerData,
-    };
+    const data = await proxyRequest(path);
+    const footer = await fetchFooter();
+    return { data, footer };
   } catch (error) {
-    logger.error(
-      `Failed to fetchData for ${path} with ${API_KEY}. Error: ${error}`,
-    );
-    const footerData = await fetchFooter();
-
+    const footer = await fetchFooter();
     return {
       //@ts-ignore
       data: pageData[path],
-      footer: footerData,
+      footer,
     };
   }
 };
 
+export const handleApiError = (error: unknown, res: NextApiResponse) => {
+  const err = error as {
+    response?: { status: number; data: unknown };
+    message?: string;
+  };
+  if (err.response) {
+    return res.status(err.response.status).json(err.response.data);
+  }
+  if (err.message === 'Server configuration error') {
+    return res.status(500).json({ error: err.message });
+  }
+  return res.status(500).json({ error: 'Internal server error' });
+};
+
 export const fetchFooter = async () => {
   try {
-    logger.debug(`Attempting to fetchFooter`);
-    const response = await client.get(`${apiBaseUrl}/footer`, {
-      headers: { 'X-API-KEY': API_KEY },
-    });
-
-    return response.data;
+    return await proxyRequest('footer');
   } catch (error) {
-    logger.error(
-      `Failed to fetchFooter, generating fallback footer. Error: ${error}`,
-    );
     return footerData;
   }
 };
diff --git a/src/lib/responses/landingPage.json b/src/lib/responses/landingPage.json
index 15c2a789..d6e18b53 100644
--- a/src/lib/responses/landingPage.json
+++ b/src/lib/responses/landingPage.json
@@ -184,28 +184,28 @@
     "title": "What do our community members and supporters say about the WCC?",
     "feedbacks": [
       {
-        "name": "Lucy Mentor",
-        "feedback": "It is great to be able to share my experience as a newbie in Tech with someone that has more years and experience in the industry. It has definitely made me feel more comfortable with been a completely beginner again and confident that, if a put the hours in, one day it will be pay off.",
-        "memberType": "Mentor",
-        "year": 2024
+        "name": "Busra",
+        "feedback": "My session with my mentor exceeded my expectations. She's calm, caring, and incredibly knowledgeable. She offered valuable guidance not only on my career but also on life in general. My mentor truly embodies a growth mindset. I highly recommend her to any mentee seeking direction delivered with both compassion and wisdom.",
+        "memberType": "Mentee",
+        "year": 2025
       },
       {
-        "name": "Ana Mentee",
-        "feedback": "I am exciting with this mentorship program. This is really help me to pursue my goals. I got encouragement, insights, knowledge from my mentor that makes me back on the track and focus to what I have now, upgrade it, then reach out my goals.",
+        "name": "Zayna",
+        "feedback": "My mentor really took the time to comprehend my mental barriers and gave personalised structure advice to move past them. I appreciated the mentors vulnerability in explaining similar scenarios they had been in to give me a sense of guidance and belonging. Their kindness and warmth during the session has really helped me to progress in my career due to feeling safe to open up to them.",
         "memberType": "Mentee",
-        "year": 2024
+        "year": 2025
       },
       {
-        "name": "Jane from SurrealDB",
-        "feedback": "Add text ...",
-        "memberType": "Partner",
+        "name": "Anonymous",
+        "feedback": "Just the simple act of presenting my profile and explaining my difficulties to a professional helped me structure the ideas and information in my head, and that alone was a big help. My mentor was caring, involved, and encouraging.",
+        "memberType": "Mentee",
         "year": 2025
       },
       {
-        "name": "JetBrains",
-        "feedback": "Add text ...",
-        "memberType": "Partner",
-        "year": 2025
+        "name": "Hanna",
+        "feedback": "I am delighted to have had the opportunity to work with my mentor. Her explanations are always clear and thorough, and her enthusiasm and passion for our profession are truly contagious.\n        Working with her has not only been educational but also incredibly motivating. Her guidance and support have given me a significant boost in my professional development. I am sincerely grateful to her for the valuable insights and encouragement she has provided.\nThank you!",
+        "memberType": "Mentee",
+        "year": 2024
       }
     ]
   },
diff --git a/src/lib/responses/mentorship.json b/src/lib/responses/mentorship.json
index cc49cc49..67c93e97 100644
--- a/src/lib/responses/mentorship.json
+++ b/src/lib/responses/mentorship.json
@@ -9,64 +9,58 @@
   "mentorSection": {
     "title": "Become a Mentor",
     "description": "You should apply to be a mentor if you:",
+    "link": {
+      "label": "Join as a mentor",
+      "uri": "/mentorship/mentor-registration"
+    },
     "items": [
       "Want to extend your professional network",
       "Want to contribute to the community",
       "You are ready to share expertise",
       "You want to get a new perspective and learn from your mentees"
-    ],
-    "link": {
-      "label": "Join as a mentor",
-      "uri": "/mentorship/mentor-registration"
-    }
+    ]
   },
   "menteeSection": {
     "title": "Become a Mentee",
     "description": "You should apply to be a mentee if you:",
+    "link": {
+      "label": "Check our mentors",
+      "uri": "/mentorship/mentors"
+    },
     "items": [
       "Want to start career in software engineering",
       "Want to find a better job",
       "Want to be promoted at work",
       "Want to apply for a leadership position",
       "Need support in advancing your career"
-    ],
-    "link": {
-      "label": "Check our mentors",
-      "uri": "/mentorship/mentors"
-    }
+    ]
   },
   "feedbackSection": {
     "title": "What do participants think about our Mentorship Programme?",
     "feedbacks": [
       {
-        "name": "Lucy",
-        "feedback": "It is great to be able to share my experience as a newbie in Tech with someone that has more years and experience in the industry. It has definitely made me feel more comfortable with been a completely beginner again and confident that, if a put the hours in, one day it will be pay off.",
+        "name": "Busra",
+        "feedback": "My session with my mentor exceeded my expectations. She's calm, caring, and incredibly knowledgeable. She offered valuable guidance not only on my career but also on life in general. My mentor truly embodies a growth mindset. I highly recommend her to any mentee seeking direction delivered with both compassion and wisdom.",
         "memberType": "Mentee",
-        "year": "2024"
+        "year": 2025
       },
       {
-        "name": "Ana Smith",
-        "feedback": "I am exciting with this mentorship program. This is really help me to pursue my goals. I got encouragement, insights, knowledge from my mentor that makes me back on the track and focus to what I have now, upgrade it, then reach out my goals.",
+        "name": "Zayna",
+        "feedback": "My mentor really took the time to comprehend my mental barriers and gave personalised structure advice to move past them. I appreciated the mentors vulnerability in explaining similar scenarios they had been in to give me a sense of guidance and belonging. Their kindness and warmth during the session has really helped me to progress in my career due to feeling safe to open up to them.",
         "memberType": "Mentee",
-        "year": "2024"
-      },
-      {
-        "name": "Jane",
-        "feedback": "My mentor has done an excellent job accommodating me and guiding me this year. This was my first experience as a mentee and it has taken time getting my footing. I entered this program because I felt isolated since I seemed to not have any clarity of my career and had a sense of general \"directionless\". Mentor has made me feel validated in my feeling and has helped me understand that my anxiety stems from not having a good understanding of the industry I hope to be a part of. Through our sessions and an exercise she gave me, I was gained a better perceptive on how exactly to direct my focus.",
-        "memberType": "Mentee",
-        "year": "2024"
+        "year": 2025
       },
       {
         "name": "Anonymous",
-        "feedback": "It is an extremely helpful program and the mentor is quite open with matching my needs. She also actively encourages me with when and how to make job applications. She has helped with reviewing my CV and Linkedin profile. We have started work on my own personal project and collaboratively code on it, with the mentor asking questions to reinforce learning.",
+        "feedback": "Just the simple act of presenting my profile and explaining my difficulties to a professional helped me structure the ideas and information in my head, and that alone was a big help. My mentor was caring, involved, and encouraging.",
         "memberType": "Mentee",
-        "year": "2024"
+        "year": 2025
       },
       {
-        "name": "Write-a-lot",
-        "feedback": "It has been such a rewarding experience being a mentor in this program. I really enjoy seeing my mentees grow and becoming more confident in their skills. Every session is different and I learn something new too, which keeps me motivated and helps me stay up to date with new technologies. The mentees bring fresh ideas and different perspectives that sometimes make me think about problems in ways I haven't considered before. I have improved my communication skills a lot through mentoring, and it feels amazing when I see a mentee getting a new job or finishing a difficult project. The program gives good support to mentors with resources and guidance. I would definitely encourage other experienced professionals to try mentoring, it is very fulfilling!",
-        "memberType": "Mentor",
-        "year": "2024"
+        "name": "Hanna",
+        "feedback": "I am delighted to have had the opportunity to work with my mentor. Her explanations are always clear and thorough, and her enthusiasm and passion for our profession are truly contagious.\n        Working with her has not only been educational but also incredibly motivating. Her guidance and support have given me a significant boost in my professional development. I am sincerely grateful to her for the valuable insights and encouragement she has provided.\nThank you!",
+        "memberType": "Mentee",
+        "year": 2024
       }
     ]
   }
diff --git a/src/pages/api/mentee-registration.ts b/src/pages/api/mentee-registration.ts
index 57667b4d..67184a48 100644
--- a/src/pages/api/mentee-registration.ts
+++ b/src/pages/api/mentee-registration.ts
@@ -1,6 +1,7 @@
-import { logger } from 'bs-logger';
 import { NextApiRequest, NextApiResponse } from 'next';
 
+import { handleApiError, proxyRequest } from '../../lib/api';
+
 export default async function handler(
   req: NextApiRequest,
   res: NextApiResponse,
@@ -10,38 +11,18 @@ export default async function handler(
     return res.status(405).json({ error: `Method ${req.method} Not Allowed` });
   }
 
-  const apiBaseUrl = process.env.API_BASE_URL;
-  const apiKey = process.env.API_KEY;
-
-  if (!apiBaseUrl || !apiKey) {
-    return res.status(500).json({ error: 'Server configuration error' });
-  }
-
-  // TODO new env variable for platform apis or create api for cms only
-  const host = apiBaseUrl.split('/api/')[0];
-  const url = `${host}/api/platform/v1/mentees`;
-
   try {
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'X-API-KEY': apiKey,
-        'Content-Type': 'application/json',
+    const data = await proxyRequest(
+      'mentees',
+      {
+        method: 'POST',
+        data: req.body,
       },
-      body: JSON.stringify(req.body),
-    });
-
-    const data = await response.json().catch(() => null);
-
-    if (!response.ok) {
-      return res
-        .status(response.status)
-        .json(data ?? { error: 'Registration failed. Please try again.' });
-    }
+      true,
+    );
 
-    return res.status(response.status).json(data ?? {});
-  } catch (error) {
-    logger.error('Mentee registration API error:', error);
-    return res.status(500).json({ error: 'Internal server error' });
+    return res.status(201).json(data ?? {});
+  } catch (error: unknown) {
+    return handleApiError(error, res);
   }
 }
diff --git a/src/pages/api/mentor-registration.ts b/src/pages/api/mentor-registration.ts
new file mode 100644
index 00000000..f7ed5b0d
--- /dev/null
+++ b/src/pages/api/mentor-registration.ts
@@ -0,0 +1,147 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+
+import { COUNTRIES } from '@utils/mentorshipConstants';
+import { MentorRegistrationData } from 'schemas/mentorSchema';
+
+import { handleApiError, proxyRequest } from '../../lib/api';
+
+// Minimum hours per mentee for long-term mentorship to calculate total hours based on number of mentees.
+const HOURS_PER_MENTEE = 2;
+
+/**
+ * Mapping from frontend MentorRegistrationData to backend MentorDto structure.
+ */
+function mapToBackendMentorDto(data: MentorRegistrationData) {
+  // Map social networks
+  const network = [];
+  if (data.linkedin) network.push({ type: 'LINKEDIN', link: data.linkedin });
+  if (data.github) network.push({ type: 'GITHUB', link: data.github });
+  if (data.instagram) network.push({ type: 'INSTAGRAM', link: data.instagram });
+  if (data.medium) network.push({ type: 'MEDIUM', link: data.medium });
+  if (data.website) network.push({ type: 'WEBSITE', link: data.website });
+  if (data.otherSocial) network.push({ type: 'OTHER', link: data.otherSocial });
+
+  // Map PronounCategory
+  const pronounCategory = data.identity === 'Yes' ? 'FEMININE' : 'UNSPECIFIED';
+
+  // Map MenteeSection
+  const numMentee = parseInt(data.maxMentees || '0', 10);
+  const longTerm = data.isLongTermMentor
+    ? {
+        numMentee,
+        hours: numMentee * HOURS_PER_MENTEE,
+      }
+    : null;
+
+  const adHoc =
+    data.isAdHocMentor && data.adHocAvailability
+      ? Object.entries(data.adHocAvailability)
+          .filter(
+            ([, availability]) =>
+              availability !== undefined &&
+              availability !== null &&
+              availability !== '',
+          )
+          .map(([month, availability]) => {
+            const monthNames = [
+              'JANUARY',
+              'FEBRUARY',
+              'MARCH',
+              'APRIL',
+              'MAY',
+              'JUNE',
+              'JULY',
+              'AUGUST',
+              'SEPTEMBER',
+              'OCTOBER',
+              'NOVEMBER',
+              'DECEMBER',
+            ];
+            const monthIndex = monthNames.indexOf(month.toUpperCase());
+            return {
+              month: monthIndex !== -1 ? monthIndex + 1 : 0,
+              hours: parseInt(availability as string, 10) || 0,
+            };
+          })
+      : [];
+
+  // Find country code from name
+  const countryObj = COUNTRIES.find((c) => c.name === data.country);
+  const countryCode = countryObj ? countryObj.code : data.country;
+
+  return {
+    fullName: data.fullName,
+    position: data.position,
+    email: data.email,
+    slackDisplayName: data.slackDisplayName,
+    country: {
+      countryCode,
+      countryName: data.country,
+    },
+    city: data.city,
+    companyName: data.companyName,
+    spokenLanguages: data.languages,
+    bio: data.bio,
+    pronouns: data.pronouns,
+    pronounCategory,
+    isWomen: data.identity === 'Yes',
+    calendlyLink: data.calendlyLink,
+    acceptMale: data.openToNonWomen,
+    acceptPromotion: data.socialHighlight === 'Yes',
+    skills: {
+      yearsExperience: data.yearsExperience || 0,
+      areas: data.technicalAreas.map((area) => ({
+        technicalArea: area.technicalArea
+          .toUpperCase()
+          .replace(/\s+/g, '_')
+          .replace('C++', 'C_PLUS_PLUS')
+          .replace('C#', 'C_SHARP'),
+        proficiencyLevel: area.proficiencyLevel.toUpperCase(),
+      })),
+      languages: data.codeLanguages.map((lang) => ({
+        language: lang.language
+          .toUpperCase()
+          .replace(/\s+/g, '_')
+          .replace('C++', 'C_PLUS_PLUS')
+          .replace('C#', 'C_SHARP'),
+        proficiencyLevel: lang.proficiencyLevel.toUpperCase(),
+      })),
+      mentorshipFocus: data.mentorshipFocusAreas.map((focus) =>
+        focus.toUpperCase(),
+      ),
+    },
+    menteeSection: {
+      idealMentee: data.menteeExpectations,
+      additional: data.mentorshipFocus || '',
+      longTerm,
+      adHoc,
+    },
+    network,
+  };
+}
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+) {
+  if (req.method !== 'POST') {
+    res.setHeader('Allow', ['POST']);
+    return res.status(405).json({ error: `Method ${req.method} Not Allowed` });
+  }
+
+  try {
+    const backendPayload = mapToBackendMentorDto(req.body);
+    const data = await proxyRequest(
+      'mentors',
+      {
+        method: 'POST',
+        data: backendPayload,
+      },
+      true,
+    );
+
+    return res.status(201).json(data ?? {});
+  } catch (error: unknown) {
+    return handleApiError(error, res);
+  }
+}
diff --git a/src/pages/api/mentors.ts b/src/pages/api/mentors.ts
index 368f4103..ab1eba17 100644
--- a/src/pages/api/mentors.ts
+++ b/src/pages/api/mentors.ts
@@ -1,6 +1,7 @@
-import { logger } from 'bs-logger';
 import { NextApiRequest, NextApiResponse } from 'next';
 
+import { handleApiError, proxyRequest } from '../../lib/api';
+
 export default async function handler(
   req: NextApiRequest,
   res: NextApiResponse,
@@ -11,14 +12,7 @@ export default async function handler(
   }
   try {
     const { keyword, yearsExperience, areas, language, focus } = req.query;
-    const baseUrl = process.env.API_BASE_URL;
-    const apiKey = process.env.API_KEY;
-
-    if (!baseUrl || !apiKey) {
-      return res.status(500).json({ error: 'Server configuration error' });
-    }
 
-    // Build query string from all available params
     const params = new URLSearchParams();
     if (keyword)
       params.append('keyword', Array.isArray(keyword) ? keyword[0] : keyword);
@@ -35,25 +29,14 @@ export default async function handler(
       );
     if (focus) params.append('focus', Array.isArray(focus) ? focus[0] : focus);
 
-    let url = `${baseUrl}/mentorship/mentors`;
-    if (params.toString()) {
-      url += `?${params.toString()}`;
-    }
-
-    const response = await fetch(url, {
+    const data = await proxyRequest('mentorship/mentors', {
       method: 'GET',
-      headers: {
-        'X-API-KEY': apiKey,
-        'Content-Type': 'application/json',
-        'Cache-Control': 'no-cache, no-store, must-revalidate',
-      },
-      cache: 'no-store',
+      params,
     });
 
-    const data = await response.json();
+    res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
     return res.status(200).json(data);
-  } catch (error) {
-    logger.error('Mentors API error:', error);
-    return res.status(500).json({ error: 'Internal server error' });
+  } catch (error: unknown) {
+    return handleApiError(error, res);
   }
 }
diff --git a/src/pages/mentorship/mentor-registration.tsx b/src/pages/mentorship/mentor-registration.tsx
index 2262b5ac..6b758ee6 100644
--- a/src/pages/mentorship/mentor-registration.tsx
+++ b/src/pages/mentorship/mentor-registration.tsx
@@ -6,11 +6,14 @@ import {
   Typography,
   Button,
   Stack,
+  Alert,
+  CircularProgress,
   useMediaQuery,
   useTheme,
 } from '@mui/material';
+import Link from 'next/link';
 import React, { useState } from 'react';
-import { useForm, FormProvider } from 'react-hook-form';
+import { useForm, FormProvider, type Resolver } from 'react-hook-form';
 
 import Step1BasicInfo from 'components/mentorship/Step1BasicInfo';
 import Step2Skills from 'components/mentorship/Step2Skills';
@@ -20,6 +23,7 @@ import Step5Review from 'components/mentorship/Step5Review';
 import {
   mentorRegistrationSchema,
   MentorRegistrationData,
+  mentorRegistrationDefaultValues,
 } from 'schemas/mentorSchema';
 
 const validateStep1 = async (formMethods: any) => {
@@ -86,6 +90,14 @@ const validateStep2 = async (formMethods: any) => {
   ]);
 };
 
+const validateStep3 = async (formMethods: any) => {
+  return await formMethods.trigger(['technicalAreas']);
+};
+
+const validateStep4 = async (formMethods: any) => {
+  return await formMethods.trigger(['codeLanguages', 'mentorshipFocusAreas']);
+};
+
 const validateStep5 = async (formMethods: any) => {
   return await formMethods.trigger([
     'linkedin',
@@ -100,12 +112,21 @@ const MentorRegistrationPage = () => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down('md'));
 
-  const formMethods = useForm({
-    resolver: zodResolver(mentorRegistrationSchema),
+  const formMethods = useForm<MentorRegistrationData>({
+    // Cast needed: z.coerce fields in Zod v4 produce `unknown` input types,
+    // causing a Resolver mismatch; the runtime output is MentorRegistrationData.
+    resolver: zodResolver(
+      mentorRegistrationSchema,
+    ) as Resolver<MentorRegistrationData>,
+    defaultValues: mentorRegistrationDefaultValues,
     mode: 'onChange',
   });
 
   const [activeStep, setActiveStep] = useState(1);
+  const [submissionStatus, setSubmissionStatus] = useState<
+    'idle' | 'loading' | 'success' | 'error'
+  >('idle');
+  const [errorMessage, setErrorMessage] = useState('');
   const totalSteps = 5;
 
   const handleNext = async () => {
@@ -119,8 +140,10 @@ const MentorRegistrationPage = () => {
         isStepValid = await validateStep2(formMethods);
         break;
       case 3:
+        isStepValid = await validateStep3(formMethods);
+        break;
       case 4:
-        isStepValid = true;
+        isStepValid = await validateStep4(formMethods);
         break;
       case 5:
         isStepValid = await validateStep5(formMethods);
@@ -139,10 +162,75 @@ const MentorRegistrationPage = () => {
     if (activeStep > 1) setActiveStep((prev) => prev - 1);
   };
 
-  const onSubmit = (data: MentorRegistrationData) => {
-    console.log('Form Data Submitted:', data);
+  const onSubmit = async (data: MentorRegistrationData) => {
+    setSubmissionStatus('loading');
+    setErrorMessage('');
+
+    try {
+      const response = await fetch('/api/mentor-registration', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(data),
+      });
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.error || 'Failed to submit application');
+      }
+
+      setSubmissionStatus('success');
+      window.scrollTo(0, 0);
+    } catch (error: any) {
+      setSubmissionStatus('error');
+      setErrorMessage(
+        error.message || 'Something went wrong. Please try again.',
+      );
+      window.scrollTo(0, 0);
+    }
   };
 
+  const onInvalid = () => {};
+
+  if (submissionStatus === 'success') {
+    return (
+      <Box
+        sx={{
+          minHeight: '100vh',
+          bgcolor: 'custom.lightBlue',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          px: 2,
+        }}
+      >
+        <Paper
+          elevation={3}
+          sx={{
+            p: { xs: 4, sm: 6 },
+            borderRadius: 2,
+            maxWidth: '540px',
+            textAlign: 'center',
+          }}
+        >
+          <Typography variant="h4" gutterBottom color="success.main">
+            Application Submitted!
+          </Typography>
+          <Typography variant="body1" sx={{ mb: 4 }}>
+            Thank you for applying to be a mentor. Your application has been
+            received and is now being reviewed. We will get back to you soon.
+          </Typography>
+          <Link href="/mentorship" passHref>
+            <Button variant="contained" color="primary">
+              Go to Mentorship Page
+            </Button>
+          </Link>
+        </Paper>
+      </Box>
+    );
+  }
+
   return (
     <FormProvider {...formMethods}>
       <Box
@@ -202,6 +290,12 @@ const MentorRegistrationPage = () => {
               Step {activeStep} of {totalSteps}
             </Typography>
 
+            {submissionStatus === 'error' && (
+              <Alert severity="error" sx={{ mb: 3 }}>
+                {errorMessage}
+              </Alert>
+            )}
+
             <Box
               sx={{
                 width: '100%',
@@ -234,12 +328,13 @@ const MentorRegistrationPage = () => {
             <Stack
               direction="row"
               justifyContent="space-between"
+              alignItems="center"
               mt={5}
               spacing={2}
             >
               <Button
                 variant="outlined"
-                disabled={activeStep === 1}
+                disabled={activeStep === 1 || submissionStatus === 'loading'}
                 onClick={handleBack}
                 sx={{
                   px: { xs: 2.5, md: 3.5 },
@@ -249,17 +344,81 @@ const MentorRegistrationPage = () => {
                 Back
               </Button>
 
+              <Box sx={{ flexGrow: 1, textAlign: 'center' }}>
+                {Object.keys(formMethods.formState.errors).length > 0 && (
+                  <Box sx={{ mb: 2 }}>
+                    <Typography color="error" variant="subtitle2" gutterBottom>
+                      Please fix the following validation errors:
+                    </Typography>
+                    <ul
+                      style={{
+                        textAlign: 'left',
+                        color: theme.palette.error.main,
+                        margin: '0 auto',
+                        display: 'inline-block',
+                      }}
+                    >
+                      {Object.entries(formMethods.formState.errors).map(
+                        ([key, error]: [string, any]) => {
+                          const label =
+                            {
+                              fullName: 'Full Name',
+                              email: 'Email',
+                              slackDisplayName: 'Slack Name',
+                              country: 'Country',
+                              city: 'City',
+                              position: 'Position',
+                              companyName: 'Company Name',
+                              calendlyLink: 'Calendly Link',
+                              menteeExpectations: 'Mentee Expectations',
+                              openToNonWomen: 'Open to non-women',
+                              isLongTermMentor: 'Mentorship Format',
+                              maxMentees: 'Max Mentees',
+                              adHocAvailability: 'Ad-hoc Availability',
+                              languages: 'Languages',
+                              yearsExperience: 'Years of Experience',
+                              bio: 'Bio',
+                              technicalAreas: 'Technical Areas',
+                              codeLanguages: 'Programming Languages',
+                              mentorshipFocusAreas: 'Mentorship Focus Areas',
+                              linkedin: 'LinkedIn',
+                              identity: 'Identity',
+                              pronouns: 'Pronouns',
+                              socialHighlight: 'Social Highlight',
+                              termsAgreed: 'Terms Agreement',
+                            }[key] || key;
+                          return (
+                            <li key={key}>
+                              <Typography variant="caption">
+                                <strong>{label}:</strong>{' '}
+                                {error?.message || 'Invalid value'}
+                              </Typography>
+                            </li>
+                          );
+                        },
+                      )}
+                    </ul>
+                  </Box>
+                )}
+              </Box>
+
               {activeStep === totalSteps ? (
                 <Button
                   variant="contained"
                   color="success"
-                  onClick={formMethods.handleSubmit(onSubmit)}
+                  disabled={submissionStatus === 'loading'}
+                  onClick={formMethods.handleSubmit(onSubmit, onInvalid)}
                   sx={{
                     px: { xs: 2.5, md: 3.5 },
                     py: 1,
+                    minWidth: '120px',
                   }}
                 >
-                  Submit Application
+                  {submissionStatus === 'loading' ? (
+                    <CircularProgress size={24} color="inherit" />
+                  ) : (
+                    'Submit Application'
+                  )}
                 </Button>
               ) : (
                 <Button
diff --git a/src/schemas/__tests__/mentorSchema.test.ts b/src/schemas/__tests__/mentorSchema.test.ts
new file mode 100644
index 00000000..9d680dc5
--- /dev/null
+++ b/src/schemas/__tests__/mentorSchema.test.ts
@@ -0,0 +1,90 @@
+import { mentorRegistrationSchema } from '../mentorSchema';
+
+describe('mentorRegistrationSchema validation', () => {
+  const validBaseData = {
+    fullName: 'Jane Doe',
+    email: 'jane@example.com',
+    slackDisplayName: 'janedoe',
+    country: 'United Kingdom',
+    city: 'London',
+    position: 'Software Engineer',
+    companyName: 'Tech Co',
+    isLongTermMentor: true,
+    maxMentees: '2',
+    calendlyLink: 'https://calendly.com/janedoe',
+    menteeExpectations: 'Eager to learn and proactive.',
+    openToNonWomen: true,
+    languages: ['English'],
+    yearsExperience: '5',
+    bio: 'A passionate developer with 5 years of experience.',
+    technicalAreas: [
+      { technicalArea: 'FRONTEND', proficiencyLevel: 'ADVANCED' },
+    ],
+    codeLanguages: [{ language: 'TYPESCRIPT', proficiencyLevel: 'ADVANCED' }],
+    mentorshipFocusAreas: ['GROW_MID_TO_SENIOR'],
+    linkedin: 'https://linkedin.com/in/janedoe',
+    identity: 'Woman',
+    pronouns: 'she/her',
+    socialHighlight: 'Yes',
+    termsAgreed: true,
+  };
+
+  it('validates correctly when adHocAvailability has some empty values', () => {
+    const data = {
+      ...validBaseData,
+      isAdHocMentor: true,
+      adHocAvailability: {
+        January: '2',
+        February: '',
+        March: '',
+      },
+    };
+
+    const result = mentorRegistrationSchema.safeParse(data);
+    expect(result.success).toBe(true);
+  });
+  it('reproducibility: passes if months are missing or empty in some way that previously triggered Invalid value', () => {
+    const data = {
+      ...validBaseData,
+      isAdHocMentor: true,
+      adHocAvailability: {
+        January: '1',
+        February: '',
+        March: null,
+        April: undefined,
+      },
+    };
+    const result = mentorRegistrationSchema.safeParse(data);
+    expect(result.success).toBe(true);
+  });
+
+  it('fails when isAdHocMentor is true but no months are selected', () => {
+    const data = {
+      ...validBaseData,
+      isAdHocMentor: true,
+      adHocAvailability: {
+        January: '',
+        February: '',
+      },
+    };
+
+    const result = mentorRegistrationSchema.safeParse(data);
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      expect(result.error.issues[0].message).toBe(
+        'Please select availability for at least one month',
+      );
+    }
+  });
+
+  it('fails when isAdHocMentor is true but adHocAvailability is empty record', () => {
+    const data = {
+      ...validBaseData,
+      isAdHocMentor: true,
+      adHocAvailability: {},
+    };
+
+    const result = mentorRegistrationSchema.safeParse(data);
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/src/schemas/mentorSchema.ts b/src/schemas/mentorSchema.ts
index dee17312..e4657aa9 100644
--- a/src/schemas/mentorSchema.ts
+++ b/src/schemas/mentorSchema.ts
@@ -18,7 +18,9 @@ export const basicInfoObj = z.object({
   isLongTermMentor: z.boolean().optional(),
   isAdHocMentor: z.boolean().optional(),
   maxMentees: z.string().optional(),
-  adHocAvailability: z.record(z.string(), z.string()).optional(),
+  adHocAvailability: z
+    .record(z.string(), z.string().or(z.null()).or(z.undefined()))
+    .optional(),
 
   calendlyLink: z
     .string()
@@ -33,11 +35,9 @@ export const basicInfoObj = z.object({
       10,
       'Please provide at least 10 characters describing your ideal mentee',
     ),
-  openToNonWomen: z
-    .enum(['true', 'false'], {
-      message: 'Please select an option',
-    })
-    .transform((val) => val === 'true'),
+  openToNonWomen: z.boolean({
+    message: 'Please select an option',
+  }),
 });
 
 const validateBasicInfo = (
@@ -63,7 +63,10 @@ const validateBasicInfo = (
   }
   if (data.isAdHocMentor) {
     const hasAvailability =
-      data.adHocAvailability && Object.keys(data.adHocAvailability).length > 0;
+      data.adHocAvailability &&
+      Object.values(data.adHocAvailability).some(
+        (val) => val !== undefined && val !== '',
+      );
     if (!hasAvailability) {
       ctx.addIssue({
         code: 'custom',
@@ -79,7 +82,11 @@ export type BasicInfoData = z.infer<typeof basicInfoSchema>;
 
 export const profileSchema = z.object({
   languages: z.array(z.string()).min(1, 'Please select at least one language'),
-  yearsExperience: z.string().min(1, 'Please select your years of experience'),
+  yearsExperience: z.coerce
+    .number()
+    .int('Years of experience must be a whole number')
+    .min(2, 'Minimum 2 years of experience required')
+    .max(50, 'Maximum 50 years of experience'),
   bio: z
     .string()
     .min(10, 'Please provide at least 10 characters for your bio')
@@ -99,14 +106,27 @@ export { languageProficiencySchema };
 
 export const skillsSchema = z.object({
   technicalAreas: z
-    .array(technicalAreaProficiencySchema)
+    .array(
+      z.object({
+        technicalArea: z.string(),
+        proficiencyLevel: z.string(),
+      }),
+    )
     .optional()
     .default([]),
 });
 export type SkillsData = z.infer<typeof skillsSchema>;
 
 export const programmingSchema = z.object({
-  codeLanguages: z.array(languageProficiencySchema).optional().default([]),
+  codeLanguages: z
+    .array(
+      z.object({
+        language: z.string(),
+        proficiencyLevel: z.string(),
+      }),
+    )
+    .optional()
+    .default([]),
   mentorshipFocusAreas: z
     .array(mentorshipFocusAreaSchema)
     .optional()
@@ -141,3 +161,38 @@ export const mentorRegistrationSchema = z
   .superRefine(validateBasicInfo);
 
 export type MentorRegistrationData = z.infer<typeof mentorRegistrationSchema>;
+
+export const mentorRegistrationDefaultValues: Partial<MentorRegistrationData> =
+  {
+    fullName: '',
+    email: '',
+    slackDisplayName: '',
+    country: '',
+    city: '',
+    position: '',
+    companyName: '',
+    isLongTermMentor: false,
+    isAdHocMentor: false,
+    maxMentees: '',
+    adHocAvailability: {},
+    calendlyLink: '',
+    menteeExpectations: '',
+    languages: [],
+    yearsExperience: 0,
+    bio: '',
+    mentorshipFocus: '',
+    imageUrl: '',
+    technicalAreas: [],
+    codeLanguages: [],
+    mentorshipFocusAreas: [],
+    linkedin: '',
+    github: '',
+    instagram: '',
+    medium: '',
+    website: '',
+    otherSocial: '',
+    identity: '',
+    pronouns: '',
+    socialHighlight: '',
+    termsAgreed: false,
+  };