diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 8b9dd2ad..6f878150 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -33,7 +33,11 @@ jobs:
       - name: Build dashboard
         run: yarn build:dashboard
         env:
-          VITE_SERVER_BASE_URL: http://localhost:8000
+          VITE_GOOGLE_CLIENT_ID: ${{ secrets.VITE_GOOGLE_CLIENT_ID }}
+          VITE_SERVER_BASE_URL: ${{ secrets.VITE_SERVER_BASE_URL }}
+          VITE_LINK_SURVEY_HOST: ${{ secrets.VITE_LINK_SURVEY_HOST }}
+          VITE_PUBLIC_POSTHOG_KEY: ${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}
+          VITE_PUBLIC_POSTHOG_HOST: ${{ secrets.VITE_PUBLIC_POSTHOG_HOST }}
 
       - name: Start Backend Server
         run: docker compose -f ./docker-compose-test.yml up -d
diff --git a/apps/frontend/src/layout/AuthLayout.tsx b/apps/frontend/src/layout/AuthLayout.tsx
index e7ebd192..f54e23aa 100644
--- a/apps/frontend/src/layout/AuthLayout.tsx
+++ b/apps/frontend/src/layout/AuthLayout.tsx
@@ -6,7 +6,7 @@ import Profile2 from "../assets/images/loginScreen/profile-2.png";
 import Profile3 from "../assets/images/loginScreen/profile-3.png";
 import Logo from "../assets/images/logo.png";
 
-const clientId = import.meta.env.VITE_GOOGLE_CLIENT_ID;
+const clientId = import.meta.env.VITE_GOOGLE_CLIENT_ID ?? "";
 
 export function AuthLayout() {
     return (
diff --git a/apps/frontend/src/layout/partials/Navbar.tsx b/apps/frontend/src/layout/partials/Navbar.tsx
index e68e8b29..a92084b7 100644
--- a/apps/frontend/src/layout/partials/Navbar.tsx
+++ b/apps/frontend/src/layout/partials/Navbar.tsx
@@ -248,6 +248,7 @@ export const Navbar = () => {
                             onClick={() => {
                                 setOpenOrganizationInviteModal(true);
                             }}
+                            data-testid="invite-team-btn"
                         >
                             <span>
                                 <CirclePlusIcon />
diff --git a/apps/frontend/src/layout/partials/UserProfile.tsx b/apps/frontend/src/layout/partials/UserProfile.tsx
index 01a3fd0d..e7691016 100644
--- a/apps/frontend/src/layout/partials/UserProfile.tsx
+++ b/apps/frontend/src/layout/partials/UserProfile.tsx
@@ -147,6 +147,7 @@ export const UserProfile = () => {
                     </DropdownMenuSubContent>
                 </DropdownMenuSub>
                 <DropdownMenuItem
+                    data-testid="workspace-settings-btn"
                     className="flex items-center gap-2 px-3 py-2"
                     onClick={() =>
                         navigate(
diff --git a/apps/frontend/src/modules/auth/AuthProvider.tsx b/apps/frontend/src/modules/auth/AuthProvider.tsx
index 320da3fc..82ff5adf 100644
--- a/apps/frontend/src/modules/auth/AuthProvider.tsx
+++ b/apps/frontend/src/modules/auth/AuthProvider.tsx
@@ -291,7 +291,7 @@ export const AuthProvider = ({ children, apollo, purgePersistedCache }: AuthProv
     const workspace = useMemo(() => {
         const slug = orgSlug ?? user?.organization?.slug;
 
-        return organizations.find((organization) => organization?.slug === slug) ?? null;
+        return organizations.find((organization) => organization?.slug?.toLowerCase() === slug?.toLowerCase()) ?? null;
     }, [orgSlug, user?.organization?.slug, organizations]);
 
     const projects = useMemo(() => {
@@ -313,7 +313,7 @@ export const AuthProvider = ({ children, apollo, purgePersistedCache }: AuthProv
 
         const slug = projectSlug ?? user?.project?.slug;
 
-        return projects?.find((project) => project?.slug === slug) ?? null;
+        return projects?.find((project) => project?.slug?.toLowerCase() === slug?.toLowerCase()) ?? null;
     }, [user, orgSlug, projectSlug, projects, workspace]);
 
     const handleUserUpdate = useCallback(
@@ -354,7 +354,10 @@ export const AuthProvider = ({ children, apollo, purgePersistedCache }: AuthProv
                 switchProject(project.id);
             }
 
-            if (orgSlug !== organization?.slug || projectSlug !== project.slug) {
+            if (
+                orgSlug?.toLowerCase() !== organization?.slug.toLowerCase() ||
+                projectSlug?.toLowerCase() !== project.slug.toLowerCase()
+            ) {
                 redirect({
                     ...(user ?? {}),
                     ...updatedUser,
diff --git a/apps/frontend/src/modules/workspace/components/invite/WorkspaceInvite.tsx b/apps/frontend/src/modules/workspace/components/invite/WorkspaceInvite.tsx
index 4a3a15ca..efcb69e7 100644
--- a/apps/frontend/src/modules/workspace/components/invite/WorkspaceInvite.tsx
+++ b/apps/frontend/src/modules/workspace/components/invite/WorkspaceInvite.tsx
@@ -1,5 +1,5 @@
 import { Link, LucideMail, RefreshCcwIcon } from "lucide-react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import { OrganizationErrorCode, OrganizationInvite, OrganizationInviteCreate, User } from "@/generated/graphql";
 import { useAuth } from "@/modules/auth/hooks/useAuth";
@@ -36,6 +36,10 @@ export const WorkspaceInvite = ({ open, onOpenChange }: Props) => {
         }
     };
 
+    useEffect(() => {
+        handleLinkInvite();
+    }, [onOpenChange]);
+
     const handleEmailInvite = async (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault();
         if (!inviteEmail) {
@@ -169,7 +173,7 @@ export const WorkspaceInvite = ({ open, onOpenChange }: Props) => {
                         </div>
                     </form>
                 ) : (
-                    <div onSubmit={handleLinkInvite} className="mt-3">
+                    <div className="mt-3">
                         <p className="mb-4 text-sm text-intg-text">
                             Invite link will provide a unique URL that allows anyone to join your organization.
                         </p>
@@ -185,6 +189,7 @@ export const WorkspaceInvite = ({ open, onOpenChange }: Props) => {
                                             size="sm"
                                             disabled={loading}
                                             onClick={handleInviteLinkRefresh}
+                                            data-testid="refresh-invite-link"
                                             icon={
                                                 <RefreshCcwIcon
                                                     size={16}
@@ -193,6 +198,7 @@ export const WorkspaceInvite = ({ open, onOpenChange }: Props) => {
                                             }
                                         />
                                     }
+                                    data-testid="invite-link"
                                 />
                             </div>
                             <Button
@@ -219,8 +225,8 @@ export const WorkspaceInvite = ({ open, onOpenChange }: Props) => {
                         size="md"
                         onClick={() => {
                             setToggleInviteType(!toggleInviteType);
-                            !toggleInviteType && handleInviteLinkRefresh();
                         }}
+                        data-testid="toggle-invite-type"
                     />
                 </div>
             </DialogContent>
diff --git a/apps/frontend/src/modules/workspace/components/settings/Workspace/General.tsx b/apps/frontend/src/modules/workspace/components/settings/Workspace/General.tsx
index 494495b4..954bfff3 100644
--- a/apps/frontend/src/modules/workspace/components/settings/Workspace/General.tsx
+++ b/apps/frontend/src/modules/workspace/components/settings/Workspace/General.tsx
@@ -1,7 +1,10 @@
+import { useProject } from "@/modules/projects/hooks/useProject";
 import { useWorkspace } from "@/modules/workspace/hooks/useWorkspace";
-import { Button, TextInput } from "@/ui";
+import { ROUTES } from "@/routes";
+import { Button, GlobalSpinner, TextInput } from "@/ui";
 import { toast } from "@/utils/toast";
 import { useForm } from "react-hook-form";
+import { useNavigate } from "react-router-dom";
 
 type WorkspaceData = {
     workspaceName: string | undefined;
@@ -9,7 +12,9 @@ type WorkspaceData = {
 };
 
 export const General = () => {
-    const { workspace, updateWorkspace } = useWorkspace();
+    const { project } = useProject();
+    const { workspace, updateWorkspace, loading } = useWorkspace();
+    const navigate = useNavigate();
 
     const {
         register,
@@ -28,15 +33,26 @@ export const General = () => {
             return;
         }
 
-        await updateWorkspace(
+        const response = await updateWorkspace(
             {
                 name: formInfo.workspaceName,
                 slug: formInfo.workspaceUrl,
             },
             false,
         );
+        if (response?.data?.organizationUpdate) {
+            navigate(
+                `${ROUTES.WORKSPACE_SETTINGS}`
+                    .replace(":orgSlug", response?.data?.organizationUpdate?.organization?.slug!)
+                    .replace(":projectSlug", project?.slug!),
+            );
+        }
         toast.success(`Your organization name has been updated`);
     };
+
+    if (loading) {
+        return <GlobalSpinner />;
+    }
     return (
         <form className="w-[593px] pt-10" onSubmit={handleSubmit(onSubmit)}>
             <div className="space-y-4">
@@ -60,6 +76,7 @@ export const General = () => {
                     defaultValue={workspace?.name}
                     error={!!errors.workspaceName?.message}
                     errorMessage={errors.workspaceName?.message}
+                    data-testid="workspace-name"
                 />
                 <TextInput
                     prefix="integraflow.app/"
@@ -86,6 +103,7 @@ export const General = () => {
                     })}
                     error={!!errors.workspaceUrl?.message}
                     errorMessage={errors.workspaceUrl?.message}
+                    data-testid="workspace-url"
                 />
                 <div className="w-[114px]">
                     <Button text="Update" type="submit" className="w-[114px]" size="md" />
diff --git a/apps/frontend/src/modules/workspace/hooks/useWorkspace.tsx b/apps/frontend/src/modules/workspace/hooks/useWorkspace.tsx
index fcc1beae..f9c09ef3 100644
--- a/apps/frontend/src/modules/workspace/hooks/useWorkspace.tsx
+++ b/apps/frontend/src/modules/workspace/hooks/useWorkspace.tsx
@@ -88,6 +88,7 @@ export const useWorkspace = () => {
                 if (response.data?.organizationUpdate?.organization) {
                     updateUserCache(response.data?.organizationUpdate?.organization);
                 }
+                return response;
             } catch (error) {
                 console.error(error);
             }
diff --git a/apps/frontend/tests/auth.setup.ts b/apps/frontend/tests/auth.setup.ts
index 1592c11b..495d3df0 100644
--- a/apps/frontend/tests/auth.setup.ts
+++ b/apps/frontend/tests/auth.setup.ts
@@ -41,13 +41,16 @@ setup("authenticate as onboarded user", async ({ page }) => {
         await page.getByRole("button", { name: /Create Workspace/i }).click();
 
         await page.waitForURL(ROUTES.PATTERNS.ONBOARDING_URL);
+        const url = new URL(page.url());
         await handleOnboardingSteps(page);
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
+        await saveUserDetails(page, ONBOARDED_USER_FILE, url);
     } else if (ROUTES.PATTERNS.ONBOARDING_URL.test(currentUrl)) {
+        const url = new URL(page.url());
         await handleOnboardingSteps(page);
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
+        await saveUserDetails(page, ONBOARDED_USER_FILE, url);
     } else if (ROUTES.PATTERNS.SURVEY_LIST_URL.test(currentUrl)) {
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
+        const url = new URL(page.url());
+        await saveUserDetails(page, ONBOARDED_USER_FILE, url);
     } else {
         throw new Error(`Unexpected URL: ${currentUrl}`);
     }
@@ -71,9 +74,12 @@ setup("authenticate as non onboarded user", async ({ page }) => {
         await page.getByRole("button", { name: /Create Workspace/i }).click();
 
         await page.waitForURL(ROUTES.PATTERNS.ONBOARDING_URL);
-        await saveUserDetails(page, NON_ONBOARDED_USER_FILE);
+        const url = new URL(page.url());
+
+        await saveUserDetails(page, NON_ONBOARDED_USER_FILE, url);
     } else if (ROUTES.PATTERNS.ONBOARDING_URL.test(currentUrl)) {
-        await saveUserDetails(page, NON_ONBOARDED_USER_FILE);
+        const url = new URL(page.url());
+        await saveUserDetails(page, NON_ONBOARDED_USER_FILE, url);
     } else {
         throw new Error(`Unexpected URL: ${currentUrl}`);
     }
diff --git a/apps/frontend/tests/auth/auth.setup.ts b/apps/frontend/tests/auth/auth.setup.ts
deleted file mode 100644
index d8f8cbf9..00000000
--- a/apps/frontend/tests/auth/auth.setup.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { faker } from "@faker-js/faker";
-import { expect, Page, test as setup } from "@playwright/test";
-import {
-    NEW_USER_FILE,
-    NON_ONBOARDED_USER_FILE,
-    ONBOARDED_USER_FILE,
-    ROUTES,
-    userCredentials,
-} from "../utils/constants";
-import { authenticateUser, saveUserDetails } from "../utils/helper";
-
-setup("authenticate as new user", async ({ page }) => {
-    await authenticateUser(page, userCredentials.NEW_USER_EMAIL);
-
-    await page.waitForURL("/create-workspace");
-    await expect(page).toHaveURL("/create-workspace");
-    await expect(page.locator("h3")).toContainText("Create a new workspace");
-
-    await page.context().storageState({ path: NEW_USER_FILE });
-});
-
-setup("authenticate as onboarded user", async ({ page }) => {
-    await authenticateUser(page, userCredentials.ONBOARDED_USER_EMAIL);
-
-    await page.waitForURL((url) => {
-        return (
-            ROUTES.PATTERNS.ONBOARDING_URL.test(url.pathname) ||
-            url.pathname === ROUTES.WORKSPACE.CREATE ||
-            ROUTES.PATTERNS.SURVEY_LIST_URL.test(url.pathname)
-        );
-    });
-
-    const currentUrl = page.url();
-
-    if (currentUrl.includes(ROUTES.WORKSPACE.CREATE)) {
-        await expect(page).toHaveURL(ROUTES.WORKSPACE.CREATE);
-        await expect(page.locator("h3")).toContainText("Create a new workspace");
-
-        await page.locator('[name="workspaceName"]').fill("onboarded");
-        await page.locator('[name="workspaceUrl"]').fill("onboarded");
-        await page.getByRole("button", { name: /Create Workspace/i }).click();
-
-        await page.waitForURL(ROUTES.PATTERNS.ONBOARDING_URL);
-        await handleOnboardingSteps(page);
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
-    } else if (ROUTES.PATTERNS.ONBOARDING_URL.test(currentUrl)) {
-        await handleOnboardingSteps(page);
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
-    } else if (ROUTES.PATTERNS.SURVEY_LIST_URL.test(currentUrl)) {
-        await saveUserDetails(page, ONBOARDED_USER_FILE);
-    } else {
-        throw new Error(`Unexpected URL: ${currentUrl}`);
-    }
-});
-
-setup("authenticate as non onboarded user", async ({ page }) => {
-    await authenticateUser(page, userCredentials.NON_ONBOARDED_USER_EMAIL);
-
-    await page.waitForURL((url) => {
-        return ROUTES.PATTERNS.ONBOARDING_URL.test(url.pathname) || url.pathname === ROUTES.WORKSPACE.CREATE;
-    });
-
-    const currentUrl = page.url();
-
-    if (currentUrl.includes(ROUTES.WORKSPACE.CREATE)) {
-        await expect(page).toHaveURL(ROUTES.WORKSPACE.CREATE);
-        await expect(page.locator("h3")).toContainText("Create a new workspace");
-
-        await page.locator('[name="workspaceName"]').fill(faker.word.words(2));
-        await page.locator('[name="workspaceUrl"]').fill(`${faker.word.words(1)}-${faker.word.words(1)}`);
-        await page.getByRole("button", { name: /Create Workspace/i }).click();
-
-        await page.waitForURL(ROUTES.PATTERNS.ONBOARDING_URL);
-        await saveUserDetails(page, NON_ONBOARDED_USER_FILE);
-    } else if (ROUTES.PATTERNS.ONBOARDING_URL.test(currentUrl)) {
-        await saveUserDetails(page, NON_ONBOARDED_USER_FILE);
-    } else {
-        throw new Error(`Unexpected URL: ${currentUrl}`);
-    }
-});
-
-async function handleOnboardingSteps(page: Page) {
-    const activeButton = page.locator('button[data-state="active"]');
-
-    const steps = [
-        /integrate sdk/i,
-        /identify your users/i,
-        /track your events/i,
-        /publish your first survey/i,
-        /connect your first integration/i,
-    ];
-
-    for (const step of steps) {
-        await expect(activeButton).toContainText(step);
-        await page.getByRole("button", { name: /skip/i }).click();
-    }
-
-    await page.waitForURL((url) => ROUTES.PATTERNS.SURVEY_LIST_URL.test(url.pathname));
-}
diff --git a/apps/frontend/tests/utils/constants.ts b/apps/frontend/tests/utils/constants.ts
index 40e99c6d..09261ab7 100644
--- a/apps/frontend/tests/utils/constants.ts
+++ b/apps/frontend/tests/utils/constants.ts
@@ -18,6 +18,13 @@ export const ROUTES = {
             `/${workspaceSlug}/projects/${projectSlug}/get-started`,
     },
 
+    SETTINGS: {
+        PROJECT: (workspaceSlug: string, projectSlug: string) =>
+            `/${workspaceSlug}/projects/${projectSlug}/settings/project`,
+        WORKSPACE: (workspaceSlug: string, projectSlug: string) =>
+            `/${workspaceSlug}/projects/${projectSlug}/settings/workspace`,
+    },
+
     SURVEY: {
         LIST: (workspaceSlug: string, projectSlug: string) => `/${workspaceSlug}/projects/${projectSlug}/surveys`,
         SINGLE: (workspaceSlug: string, projectSlug: string, surveySlug: string) =>
@@ -28,5 +35,7 @@ export const ROUTES = {
         ONBOARDING_URL: /\/[\w-]+\/projects\/[\w-]+\/get-started/,
         SURVEY_LIST_URL: /\/[\w-]+\/projects\/[\w-]+\/surveys/,
         SINGLE_SURVEY: /\/[\w-]+\/projects\/[\w-]+\/survey\/[\w-]+/,
+        WORKSPACE_SETTINGS: /\/[\w-]+\/projects\/[\w-]+\/settings\/workspace/,
+        PROJECT_SETTINGS: /\/[\w-]+\/projects\/[\w-]+\/settings\/project/,
     },
 };
diff --git a/apps/frontend/tests/utils/helper.ts b/apps/frontend/tests/utils/helper.ts
index d6e0ceac..ef631052 100644
--- a/apps/frontend/tests/utils/helper.ts
+++ b/apps/frontend/tests/utils/helper.ts
@@ -55,8 +55,8 @@ export function extractWorkspaceAndProjectSlugs(url: string) {
     return { workspaceSlug, projectSlug };
 }
 
-export async function saveUserDetails(page: Page, storageFile: string) {
-    const { workspaceSlug, projectSlug } = extractWorkspaceAndProjectSlugs(page.url());
+export async function saveUserDetails(page: Page, storageFile: string, url) {
+    const { workspaceSlug, projectSlug } = extractWorkspaceAndProjectSlugs(url);
     const details = { workspaceSlug, projectSlug };
     fs.writeFileSync(userDetailsFile, JSON.stringify(details), "utf-8");
     await page.context().storageState({ path: storageFile });
diff --git a/apps/frontend/tests/workspace/create-workspace.spec.ts b/apps/frontend/tests/workspace/create-workspace.spec.ts
index 0a70ffb2..63b050ad 100644
--- a/apps/frontend/tests/workspace/create-workspace.spec.ts
+++ b/apps/frontend/tests/workspace/create-workspace.spec.ts
@@ -1,10 +1,66 @@
-import { test } from "@playwright/test";
-import { ONBOARDED_USER_FILE } from "../utils/constants";
+import { faker } from "@faker-js/faker";
+import fs from "fs";
+
+import { expect, test } from "@playwright/test";
+import { ROUTES, userDetailsFile } from "../utils/constants";
+
+const word1 = faker.word.words(1);
+const word2 = faker.word.words(1);
+const workspaceUrl = `${word1}-${word2}`;
 
 test.describe("Create workspace", () => {
-    test.use({ storageState: ONBOARDED_USER_FILE });
+    test.beforeEach(async ({ page }) => {
+        await page.goto(ROUTES.WORKSPACE.CREATE);
+        await page.waitForSelector("h3");
+        await expect(page.locator("h3")).toContainText("Create a new workspace");
+    });
+
+    test("should allow user to create a new workspace", async ({ page }) => {
+        await page.locator('[name="workspaceName"]').fill(faker.word.words(2));
+        await page.getByRole("button", { name: /Create Workspace/i }).click();
+
+        await page.waitForURL((url) => {
+            return ROUTES.PATTERNS.SURVEY_LIST_URL.test(url.pathname);
+        });
+
+        const url = new URL(page.url());
+
+        const workspaceSlug = url.pathname.split("/")[1];
+        const projectSlug = url.pathname.split("/")[3];
+        const details = { workspaceSlug, projectSlug };
+
+        fs.writeFileSync(userDetailsFile, JSON.stringify(details), "utf-8");
+
+        await expect(page.locator("h1").nth(0)).toContainText(/Create your first survey/i);
+    });
+
+    test("should not allow repeating workspace URL", async ({ page }) => {
+        await page.locator('[name="workspaceName"]').fill(faker.word.words(2));
+        await page.locator('[name="workspaceUrl"]').fill(workspaceUrl);
+
+        await page.getByRole("button", { name: /Create Workspace/i }).click();
+
+        await page.waitForURL((url) => {
+            return ROUTES.PATTERNS.SURVEY_LIST_URL.test(url.pathname);
+        });
+
+        const url = new URL(page.url());
+
+        const workspaceSlug = url.pathname.split("/")[1];
+        const projectSlug = url.pathname.split("/")[3];
+        const details = { workspaceSlug, projectSlug };
+
+        fs.writeFileSync(userDetailsFile, JSON.stringify(details), "utf-8");
+
+        await expect(page.locator("h1").nth(0)).toContainText(/Create your first survey/i);
+
+        await page.goto(ROUTES.WORKSPACE.CREATE);
+        await page.waitForSelector("h3");
+        await page.locator('[name="workspaceName"]').fill(faker.word.words(2));
+        await page.locator('[name="workspaceUrl"]').fill(workspaceUrl);
+        await page.getByRole("button", { name: /Create Workspace/i }).click();
 
-    test("should allow new user to create a new workspace", async ({ page }) => {
-        await page.goto("/create-workspace");
+        await page.locator(".tremor-TextInput-errorMessage").waitFor({ state: "attached" });
+        await expect(page.locator(".tremor-TextInput-errorMessage")).toBeVisible();
     });
 });
diff --git a/apps/frontend/tests/workspace/manage-workspace.spec.ts b/apps/frontend/tests/workspace/manage-workspace.spec.ts
index e69de29b..3ba03938 100644
--- a/apps/frontend/tests/workspace/manage-workspace.spec.ts
+++ b/apps/frontend/tests/workspace/manage-workspace.spec.ts
@@ -0,0 +1,32 @@
+import test from "@playwright/test";
+import fs from "fs";
+import { ROUTES, userDetailsFile } from "../utils/constants";
+import { waitForResponse } from "../utils/helper";
+
+test.describe("Manage workspace", () => {
+    let workspaceSlug;
+    let projectSlug;
+
+    test.beforeEach(async () => {
+        const details = JSON.parse(fs.readFileSync(userDetailsFile, "utf-8"));
+        workspaceSlug = details.workspaceSlug;
+        projectSlug = details.projectSlug;
+    });
+    test("should redirect user to new workspace invitation", async ({ page }) => {
+        await page.goto(ROUTES.SURVEY.LIST(workspaceSlug, projectSlug));
+
+        await page.getByTestId("invite-team-btn").waitFor();
+        await page.getByTestId("invite-team-btn").click();
+
+        await page.getByTestId("toggle-invite-type").click();
+
+        await page.getByTestId("invite-link").waitFor();
+        const url = await page.getByTestId("invite-link").inputValue();
+
+        await waitForResponse(page, "organizationInviteDetails", async () => {
+            await page.goto(url);
+        });
+
+        await page.getByRole("button", { name: "Accept" }).waitFor();
+    });
+});
diff --git a/apps/frontend/tests/workspace/update-workspace.spec.ts b/apps/frontend/tests/workspace/update-workspace.spec.ts
new file mode 100644
index 00000000..3151d073
--- /dev/null
+++ b/apps/frontend/tests/workspace/update-workspace.spec.ts
@@ -0,0 +1,67 @@
+import { faker } from "@faker-js/faker";
+import test, { expect } from "@playwright/test";
+import fs from "fs";
+import slugify from "slugify";
+import { ONBOARDED_USER_FILE, ROUTES, userDetailsFile } from "../utils/constants";
+import { saveUserDetails, waitForResponse } from "./../utils/helper";
+
+test.describe("Update workspace", () => {
+    let projectSlug;
+    let workspaceSlug;
+    test.beforeEach(async () => {
+        const details = JSON.parse(fs.readFileSync(userDetailsFile, "utf-8"));
+        workspaceSlug = details.workspaceSlug;
+        projectSlug = details.projectSlug;
+    });
+
+    test("should allow user to update Workspace fields", async ({ page }) => {
+        await page.goto(ROUTES.SURVEY.LIST(workspaceSlug, projectSlug));
+
+        await page.getByTestId("profile-btn").waitFor();
+        await page.getByTestId("profile-btn").click();
+
+        await page.getByTestId("workspace-settings-btn").click();
+
+        await page.waitForURL((url) => ROUTES.PATTERNS.WORKSPACE_SETTINGS.test(url.pathname));
+
+        const prevName = await page.getByTestId("workspace-name").inputValue();
+        const prevUrl = await page.getByTestId("workspace-url").inputValue();
+
+        await page.getByTestId("workspace-name").fill(faker.company.buzzAdjective());
+        await page.getByTestId("workspace-url").fill(slugify(faker.food.dish()).toLocaleLowerCase());
+
+        await waitForResponse(page, "organizationUpdate", async () => {
+            await page.getByRole("button", { name: "Update" }).click();
+        });
+
+        await page.reload();
+
+        const url = new URL(page.url());
+
+        await saveUserDetails(page, ONBOARDED_USER_FILE, url);
+        await page.getByTestId("workspace-name").waitFor();
+
+        const newName = await page.getByTestId("workspace-name").inputValue();
+        const newUrl = await page.getByTestId("workspace-url").inputValue();
+        expect(prevName).not.toBe(newName);
+        expect(prevUrl).not.toBe(newUrl);
+    });
+    test("should allow user to refresh workspace invite link", async ({ page }) => {
+        await page.goto(ROUTES.SURVEY.LIST(workspaceSlug, projectSlug));
+
+        await page.getByTestId("invite-team-btn").waitFor();
+        await page.getByTestId("invite-team-btn").click();
+
+        await page.getByTestId("toggle-invite-type").click();
+
+        await page.getByTestId("invite-link").waitFor();
+        const prevLink = await page.getByTestId("invite-link").inputValue();
+
+        await waitForResponse(page, "organizationInviteLinkReset", async () => {
+            await page.getByTestId("refresh-invite-link").click();
+        });
+
+        const newLink = await page.getByTestId("invite-link").inputValue();
+        expect(prevLink).not.toBe(newLink);
+    });
+});